diff --git a/src/Config.cpp b/src/Config.cpp
index ad4a0291b..13983cf12 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -324,7 +324,7 @@ std::string Config::_defaults =
   "# Dateformat:    due date format in reports\n"
   "\n"
   "# task long\n"
-  "report.long.description=Lists all task, all data, matching the specified criteria\n"
+  "report.long.description=Lists all tasks, matching the specified criteria\n"
   "report.long.columns=id,project,priority,entry,start,due,recur,due.countdown,entry.age,depends,tags,description\n"
   "report.long.labels=ID,Project,Pri,Added,Started,Due,Recur,Countdown,Age,Deps,Tags,Description\n"
   "report.long.sort=due+,priority-,project+,description+\n"
diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index a666e5c99..215eacb31 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -25,6 +25,8 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+#define L10N                                           // Localization complete.
+
 #include <sstream>
 #include <iomanip>
 #include <stdlib.h>
diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp
index a7641ed6b..08229046b 100644
--- a/src/commands/CmdEdit.cpp
+++ b/src/commands/CmdEdit.cpp
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <Duration.h>
 #include <Context.h>
+#include <i18n.h>
 #include <text.h>
 #include <util.h>
 #include <main.h>
@@ -42,8 +43,7 @@ CmdEdit::CmdEdit ()
 {
   _keyword     = "edit";
   _usage       = "task <filter> edit";
-  _description = "Launches an editor to let you modify all aspects of a task "
-                 "directly, therefore it is to be used carefully.";
+  _description = STRING_CMD_EDIT_USAGE;
   _read_only   = false;
   _displays_id = true;
 }
@@ -144,7 +144,7 @@ std::string CmdEdit::formatTask (Task task)
   if (verbose)
     before << "# The 'task edit <id>' 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"
+           << "# 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"
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index cc8514bd3..53115ae77 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -43,9 +43,7 @@ CmdModify::CmdModify ()
 {
   _keyword     = "modify";
   _usage       = "task <filter> modify <mods>";
-  _description = std::string (STRING_CMD_MODIFY_USAGE1) +
-                 "\n" +
-                 STRING_CMD_MODIFY_USAGE2;
+  _description = STRING_CMD_MODIFY_USAGE1;
   _read_only   = false;
   _displays_id = false;
 }
diff --git a/src/en-US.h b/src/en-US.h
index 7f42153f3..ea4736e19 100644
--- a/src/en-US.h
+++ b/src/en-US.h
@@ -371,7 +371,6 @@
 #define STRING_CMD_ZSHCOMMANDS_USAGE "Generates a list of all commands, for zsh autocompletion purposes"
 #define STRING_CMD_INSTALL_USAGE     "Installs extensions and external scripts"
 #define STRING_CMD_MODIFY_USAGE1     "Modifies the existing task with provided arguments."
-#define STRING_CMD_MODIFY_USAGE2     "The 'modify' keyword is optional."
 #define STRING_CMD_MODIFY_NO_DUE     "You cannot specify a recurring task without a due date."
 #define STRING_CMD_MODIFY_UNTIL      "You cannot specify an until date for a non-recurring task."
 #define STRING_CMD_MODIFY_REM_DUE    "You cannot remove the due date from a recurring task."
@@ -440,6 +439,7 @@
 #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 let you modify all aspects of a task directly"
 
 // Config
 #define STRING_CONFIG_OVERNEST       "Configuration file nested to more than 10 levels deep - this has to be a mistake."