gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Code Cleanup

Browse Source 
- Removed deprecated 'push', 'pull' and 'merge' commands.
This commit is contained in:
Paul Beckingham
2014-01-18 19:12:48 -05:00
parent 341c2fb474
commit 8b736934d7
47 changed files with 22 additions and 3941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/en-US.h
View File

@@ -428,7 +428,6 @@
#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_NOMERGE "Task push/pull/merge is configured, deprecated, and does not work with 'sync'."
#define STRING_CMD_SYNC_TRUST_CA "You should either provide a CA certificate or override verification, but not both."
#define STRING_CMD_DIAG_USAGE "Platform, build and environment details"
#define STRING_CMD_DIAG_PLATFORM "Platform"
@@ -444,23 +443,11 @@
#define STRING_CMD_DIAG_ENABLED "Enabled"
#define STRING_CMD_DIAG_DISABLED "Disabled"
#define STRING_CMD_DIAG_CONFIG "Configuration"
#define STRING_CMD_DIAG_EXTERNAL "External Utilities"
#define STRING_CMD_DIAG_TESTS "Tests"
#define STRING_CMD_DIAG_UUID_SCAN "Scanned {1} tasks for duplicate UUIDs:"
#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_PUSH_USAGE "Pushes the local files to the URL"
#define STRING_CMD_PUSH_SAME "Cannot push files when the source and destination are the same."
#define STRING_CMD_PUSH_NONLOCAL "The uri '{1}' is not a local directory."
#define STRING_CMD_PUSH_TRANSFERRED "Local tasks transferred to {1}"
#define STRING_CMD_PUSH_NO_URI "No uri was specified for the push. Either specify the uri of a remote .task directory, or create a 'push.default.uri' entry in your .taskrc file."
#define STRING_CMD_PULL_USAGE "Pulls remote files from the URL"
#define STRING_CMD_PULL_SAME "Cannot pull files when the source and destination are the same."
#define STRING_CMD_PULL_TRANSFERRED "Local tasks transferred from {1}"
#define STRING_CMD_PULL_NO_URI "No uri was specified for the pull. Either specify the uri of a remote .task directory, or create a 'pull.default.uri' entry in your .taskrc file."
#define STRING_CMD_PULL_MISSING "At least one of the database files in '{1}' is not present."
#define STRING_CMD_PULL_NOT_DIR "The uri '{1}' is not a directory. Did you forget a trailing '/'?"
#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_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes"
@@ -512,10 +499,6 @@
#define STRING_CMD_TIMESHEET_USAGE "Weekly 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_MERGE_USAGE "Merges the remote files with the local files"
#define STRING_CMD_MERGE_COMPLETE "Merge complete."
#define STRING_CMD_MERGE_CONFIRM "Would you like to push the merged changes to '{1}'?"
#define STRING_CMD_MERGE_NO_URI "No uri was specified for the merge. Either specify the uri of a remote .task directory, or create a 'merge.default.uri' entry in your .taskrc file."
#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"
@@ -804,24 +787,10 @@
#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all tasks. Are you sure?"
#define STRING_TASK_SAFETY_FAIL "Command prevented from running."
// Taskmod
#define STRING_TASKMOD_BAD_INIT "Taskmod::getUuid(): Task object not initialized."
#define STRING_TASKMOD_TIME "time "
#define STRING_TASKMOD_OLD "old "
#define STRING_TASKMOD_NEW "new "
// 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_UNDO_TIMESTAMP "There was a problem reading the timestamp from the undo.data file."
#define STRING_TDB2_UNREADABLE "Could not read '{1}'."
#define STRING_TDB2_UNWRITABLE "Could not write '{1}'."
#define STRING_TDB2_NO_CHANGES "There are no changes to merge."
#define STRING_TDB2_REMOTE_CHANGE "Found remote change to {1} \"{2}\""
#define STRING_TDB2_LOCAL_CHANGE "Retaining local changes to {1} \"{2}\""
#define STRING_TDB2_MISSING "Missing {1} \"{2}\""
#define STRING_TDB2_MERGING "Merging new remote task {1} \"{2}\""
#define STRING_TDB2_UP_TO_DATE "Database is up-to-date, no merge required."
#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"
@@ -841,24 +810,6 @@
// A comma-separated list of commands is appended.
#define STRING_TEXT_AMBIGUOUS "Ambiguous {1} '{2}' - could be either of "
// Transport
#define STRING_TRANSPORT_NORUN "Could not run '{1}'. Is it installed, and available in $PATH?"
#define STRING_TRANSPORT_NOFORK "Could not run '{1}': {2}. Are you out of system resources?"
#define STRING_TRANSPORT_URI_NODIR "The uri '{1}' does not appear to be a directory."
#define STRING_TRANSPORT_CURL_URI "When using the 'curl' protocol, the uri must contain a hostname."
#define STRING_TRANSPORT_CURL_WILDCD "When using the 'curl' protocol, wildcards are not supported."
#define STRING_TRANSPORT_CURL_FAIL "Curl failed, see output above."
#define STRING_TRANSPORT_RSYNC_URI "When using the 'rsync' protocol, the uri must contain a hostname."
#define STRING_TRANSPORT_RSYNC_FAIL "rsync failed, see output above."
#define STRING_TRANSPORT_SSH_URI "When using the 'ssh' protocol, the uri must contain a hostname."
#define STRING_TRANSPORT_SSH_FAIL "ssh failed, see output above."
#define STRING_TRANSPORT_SHELL_NOPATH "When using the 'sh+cp' protocol to copy multiple files, a path must be specified."
#define STRING_TRANSPORT_SHELL_FAIL "shell command failed, see output above."
// Uri
#define STRING_URI_QUOTES "Could not parse uri '{1}', wrong usage of single quotes."
#define STRING_URI_BAD_FORMAT "The uri '{1}' is not in the expected format."
// utf8
#define STRING_UTF8_INVALID_CP_REP "Invalid codepoint representation."
#define STRING_UTF8_INVALID_CP "Invalid Unicode codepoint."