From 023a17e6be36fe50fea56b44e75eb443e9625db5 Mon Sep 17 00:00:00 2001 From: Wilhelm Schuermann Date: Sat, 2 May 2015 18:08:51 +0200 Subject: [PATCH] (t|T)ask(w|W)arrior ---> Taskwarrior - Standardize spelling of "Taskwarrior" across most files. - Fix other minor typos in help text and docs. --- AUTHORS | 2 +- COPYING | 2 +- INSTALL | 12 ++++++------ LICENSE | 2 +- NEWS | 8 ++++---- README.md | 2 +- doc/man/task-color.5.in | 18 +++++++++--------- doc/man/task.1.in | 24 ++++++++++++------------ doc/man/taskrc.5.in | 32 ++++++++++++++++---------------- src/l10n/eng-USA.h | 24 ++++++++++++------------ 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/AUTHORS b/AUTHORS index f30f955ef..2b1fb2e9d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -The development of taskwarrior was made possible by the significant +The development of Taskwarrior was made possible by the significant contributions of the following people: Paul Beckingham (Principal Author) diff --git a/COPYING b/COPYING index 503960441..745edb3b0 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -taskwarrior - a command line task list manager. +Taskwarrior - a command line task list manager. Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez. diff --git a/INSTALL b/INSTALL index cf0a4eb8d..473ca3ddb 100644 --- a/INSTALL +++ b/INSTALL @@ -8,7 +8,7 @@ source. Pre-requisites -------------- -You will need the CMake build system installed in order to build taskwarrior +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 You will also need: @@ -48,7 +48,7 @@ These commands are explained below: 3. Invokes CMake to scan for dependencies and machine-specific details, then generate the makefiles. This may take a minute. - 4. Builds taskwarrior. This may take a minute. + 4. Builds Taskwarrior. This may take a minute. 5. Installs the program, documentation and other data files. @@ -113,7 +113,7 @@ Currently the defined languages are: Uninstallation -------------- -There is no uninstall option in CMake makefiles. This ia a manual process. +There is no uninstall option in CMake makefiles. This is a manual process. To uninstall Taskwarrior, remove the files listed in the install_manifest.txt file that was generated when you built Taskwarrior. @@ -122,11 +122,11 @@ file that was generated when you built Taskwarrior. Taskwarrior Build Notes ----------------------- -Taskwarrior has dependencies that are detected by cmake in almost all cases, but +Taskwarrior has dependencies that are detected by CMake in almost all cases, but there are situations and operating systems that mean you will need to offer a little help. -If taskwarrior will not build on your system, first take a look at the Operating +If Taskwarrior will not build on your system, first take a look at the Operating System notes below. If this doesn't help, then go to the Troubleshooting section, which includes instructions on how to contact us for help. @@ -182,7 +182,7 @@ 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. -If CMake runs but taskwarrior does not build, please send the contents of the +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 file and must be captured from the terminal. diff --git a/LICENSE b/LICENSE index 503960441..745edb3b0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -taskwarrior - a command line task list manager. +Taskwarrior - a command line task list manager. Copyright 2006 - 2015, Paul Beckingham, Federico Hernandez. diff --git a/NEWS b/NEWS index 5a677dc40..e40c69186 100644 --- a/NEWS +++ b/NEWS @@ -1,20 +1,20 @@ -New Features in taskwarrior 2.4.4 +New Features in Taskwarrior 2.4.4 - Taskwarrior now requires GCC 4.7+ / Clang 3.3+, for full C++11 support. - Taskwarrior now builds properly on 32-bit platforms. - The beginnings of a Japaneѕe translation. -New commands in taskwarrior 2.4.4 +New commands in Taskwarrior 2.4.4 - -New configuration options in taskwarrior 2.4.4 +New configuration options in Taskwarrior 2.4.4 - The 'obfuscate' setting, if set to '1' will replace all text with 'xxx'. This is useful when sharing data for bug reporting purposes. -Newly deprecated features in taskwarrior 2.4.4 +Newly deprecated features in Taskwarrior 2.4.4 - diff --git a/README.md b/README.md index 31c222b64..1bf742bb5 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,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. +the future of Taskwarrior. --- diff --git a/doc/man/task-color.5.in b/doc/man/task-color.5.in index 0be925eb8..2bcd4e39b 100644 --- a/doc/man/task-color.5.in +++ b/doc/man/task-color.5.in @@ -1,7 +1,7 @@ .TH task-color 5 2015-04-19 "${PACKAGE_STRING}" "User Manuals" .SH NAME -task-color \- A color tutorial for the taskwarrior command line todo manager. +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 @@ -18,8 +18,8 @@ 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. +Now tell Taskwarrior that you want to use color. This is the default for +Taskwarrior, so the following step may be unnecessary. $ task config color on @@ -28,11 +28,11 @@ like: color=on -Now taskwarrior is ready. +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 +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 a terminal, color is desirable, but consider the following command: $ task list > file.txt @@ -268,7 +268,7 @@ from the example): include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-256.theme .RE -You can use any of the standard taskwarrior themes: +You can use any of the standard Taskwarrior themes: .RS dark-16.theme @@ -323,7 +323,7 @@ http://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, the following may be referenced: .TP The official site at @@ -339,5 +339,5 @@ 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 +Bugs in Taskwarrior may be reported to the issue-tracker at diff --git a/doc/man/task.1.in b/doc/man/task.1.in index 112e5e60f..aa492a68f 100644 --- a/doc/man/task.1.in +++ b/doc/man/task.1.in @@ -14,7 +14,7 @@ that you want to do, allowing you to add/remove, and otherwise manipulate them. Taskwarrior has a rich set of subcommands that allow you to do various things with it. -At the core, taskwarrior is a list processing program. You add text and +At the core, Taskwarrior is a list processing program. You add text and additional related parameters and redisplay the information in a nice way. It turns into a todo list program when you add due dates and recurrence. It turns into an organized todo list program when you add priorities, tags (one word @@ -98,7 +98,7 @@ generated, as with verbose=nothing). .SH READ SUBCOMMANDS Reports are read subcommands. There are several reports currently predefined in -taskwarrior. The output and sort behavior of these reports can be configured in +Taskwarrior. The output and sort behavior of these reports can be configured in the configuration file. See also the man page taskrc(5). There are also other read subcommands that are not reports. @@ -381,7 +381,7 @@ non-standard arguments. .TP .B task calc -Evaluates an algebraic expression. Can be used to test how TaskWarrior +Evaluates an algebraic expression. Can be used to test how Taskwarrior parses and evaluates the expression given on the command line. Examples: @@ -397,7 +397,7 @@ Examples: .TP .B task config [name [value | '']] -Add, modify and remove settings directly in the taskwarrior configuration. +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': @@ -414,7 +414,7 @@ Finally, this command removes any 'name=...' entry from the .taskrc file: .TP .B task context -Sets the currectly active context. See the CONTEXT section. +Sets the currently active context. See the CONTEXT section. Example: @@ -510,7 +510,7 @@ Reverts the most recent action. Obeys the confirmation setting. .TP .B task version -Shows the taskwarrior version number. +Shows the Taskwarrior version number. .SH HELPER SUBCOMMANDS @@ -566,7 +566,7 @@ Displays the urgency measure of a task. .TP .B task _version -Shows only the taskwarrior version number. +Shows only the Taskwarrior version number. .TP .B task _zshcommands @@ -870,7 +870,7 @@ The original example therefore must be entered as: task '( project:Home or project:Garden )' list This includes quotes to escape the parentheses, so that the shell doesn't -interpret them and hide them from taskwarrior. +interpret them and hide them from Taskwarrior. There is redundancy between operators, attribute modifiers and other syntactic sugar. For example, the following are all equivalent: @@ -1083,7 +1083,7 @@ Contexts are permanent, and the currently set context name is stored in the "context." configuration variable. .SH COMMAND ABBREVIATION -All taskwarrior commands may be abbreviated as long as a unique prefix is used, +All Taskwarrior commands may be abbreviated as long as a unique prefix is used, for example: .RS @@ -1122,7 +1122,7 @@ $ task add "quoted ' quote" $ task add escaped \\' quote .RE -The argument \-\- (a double dash) tells taskwarrior to treat all other args +The argument \-\- (a double dash) tells Taskwarrior to treat all other args as description: .RS @@ -1219,7 +1219,7 @@ http://www.opensource.org/licenses/mit-license.php for more information. .BR task-color(5), .BR task-sync(5) -For more information regarding taskwarrior, see the following: +For more information regarding Taskwarrior, see the following: .TP The official site at @@ -1235,6 +1235,6 @@ You can contact the project by emailing .SH REPORTING BUGS .TP -Bugs in taskwarrior may be reported to the issue-tracker at +Bugs in Taskwarrior may be reported to the issue-tracker at diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in index 6396b78a5..a0671b737 100644 --- a/doc/man/taskrc.5.in +++ b/doc/man/taskrc.5.in @@ -49,7 +49,7 @@ $ task rc.= ... .RE If -.B taskwarrior +.B Taskwarrior is run without an existing configuration file it will ask if it should create a default, sample .I .taskrc @@ -67,7 +67,7 @@ Whitespace is not permitted in comma-separated lists. 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 +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". @@ -149,7 +149,7 @@ include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/dark-16.theme .RE -This includes two standard files that are distributed with taskwarrior, which +This includes two standard files that are distributed with Taskwarrior, which define a set of US holidays, and set up a 16-color theme to use, to color the reports and calendar. @@ -158,7 +158,7 @@ These environment variables override defaults and command line arguments. .TP .B TASKDATA=~/.task -This overrides the default path for the taskwarrior data files. +This overrides the default path for the Taskwarrior data files. .TP .B TASKRC=~/.taskrc @@ -171,7 +171,7 @@ Valid variable names and their default values are: .TP .B data.location=$HOME/.task -This is a path to the directory containing all the taskwarrior files. By +This is a path to the directory containing all the Taskwarrior files. By default, it is set up to be ~/.task, for example: /home/paul/.task Note that you can use the @@ -294,7 +294,7 @@ 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 +May be "yes" or "no", 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. @@ -388,7 +388,7 @@ Defaults to infix. .TP .B dom=on -Enables or disables access to taskwarrior internals and task metadata on the +Enables or disables access to Taskwarrior internals and task metadata on the command line. Defaults to on. .TP @@ -454,7 +454,7 @@ and one for a week from tomorrow. .TP .B undo.style=side -When the 'undo' command is run, taskwarrior presents a before and after +When the 'undo' command is run, Taskwarrior presents a before and after comparison of the data. This can be in either the 'side' style, which compares values side-by-side in a table, or 'diff' style, which uses a format similar to the 'diff' command. @@ -531,7 +531,7 @@ the 'history' report, for example, or 'export'. .B dateformat.annotation= .TP .B report.X.dateformat=Y-M-D -This is a string of characters that defines how taskwarrior formats date values. +This is a string of characters that defines how Taskwarrior formats date values. The precedence order for the configuration variable is report.X.dateformat then dateformat.report then dateformat for formating the due dates in reports. If both report.X.dateformat and dateformat.report are not set then dateformat @@ -761,7 +761,7 @@ holiday.eastersunday.date=easter .RE .RE -Note that the taskwarrior distribution contains example holiday files that can +Note that the Taskwarrior distribution contains example holiday files that can be included like this: .RS @@ -775,7 +775,7 @@ include ${CMAKE_INSTALL_PREFIX}/${TASK_RCDIR}/holidays.en-US.rc .B monthsperline=3 Determines how many months the "task calendar" command renders across the screen. Defaults to however many will fit. If more months than will fit are -specified, taskwarrior will only show as many that will fit. +specified, Taskwarrior will only show as many that will fit. .SS DEPENDENCIES @@ -791,7 +791,7 @@ Determines whether dependency chain repair requires confirmation. .TP .B color=on -May be "on" or "off". Determines whether taskwarrior uses color. When "off", +May be "on" or "off". Determines whether Taskwarrior uses color. When "off", will use dashes (-----) to underline column headings. .TP @@ -1154,7 +1154,7 @@ command, if you don't specify values. The default is blank. .TP .B default.command=next -Provides a default command that is run every time taskwarrior is invoked with no +Provides a default command that is run every time Taskwarrior is invoked with no arguments. For example, if set to: .RS @@ -1164,7 +1164,7 @@ default.command=project:foo list .RE .RS -then taskwarrior will run the "project:foo list" command if no command is +then Taskwarrior will run the "project:foo list" command if no command is specified. This means that by merely typing .RE @@ -1463,7 +1463,7 @@ http://www.opensource.org/licenses/mit-license.php for more information. .BR task-color(5), .BR task-sync(5) -For more information regarding taskwarrior, see the following: +For more information regarding Taskwarrior, see the following: .TP The official site at @@ -1479,6 +1479,6 @@ You can contact the project by emailing .SH REPORTING BUGS .TP -Bugs in taskwarrior may be reported to the issue-tracker at +Bugs in Taskwarrior may be reported to the issue-tracker at diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index bc25ac69b..3f9ec9784 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -254,10 +254,10 @@ // 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_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_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 - 2015 P. Beckingham, F. Hernandez." @@ -557,7 +557,7 @@ #define STRING_CMD_CONTEXT_DEF_SUCC "Context '{1}' defined." #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_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_DEL_SUCC "Context '{1}' deleted." @@ -615,7 +615,7 @@ #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?" +#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}" @@ -730,12 +730,12 @@ #define STRING_EDIT_HEADER_1 "The 'task 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_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_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_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," @@ -852,7 +852,7 @@ #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." +#define STRING_TASK_PARSE_UNREC_FF "Unrecognized Taskwarrior file format." #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." @@ -985,7 +985,7 @@ " task add \"quoted ' quote\"\n" \ " task add escaped \\' quote\n" \ "\n" \ - "The argument -- tells taskwarrior to treat all other args as description, even " \ + "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" \ @@ -994,7 +994,7 @@ "\n" /* - To be included later, before the 'precendence' line. + To be included later, before the 'precedence' line. " + - Addition, subtraction\n" \ " ! Inversion\n" \