diff --git a/CliClient/app/app-gui.js b/CliClient/app/app-gui.js index f9c55fd3b2..84197e0beb 100644 --- a/CliClient/app/app-gui.js +++ b/CliClient/app/app-gui.js @@ -340,7 +340,7 @@ class AppGui { shortcuts[' '] = { friendlyName: 'SPACE', - description: _('Set a todo as completed / not completed'), + description: _('Set a to-do as completed / not completed'), action: 'todo toggle $n', } diff --git a/CliClient/app/build-doc.js b/CliClient/app/build-doc.js index d75f8bd4f4..67eedc22c2 100644 --- a/CliClient/app/build-doc.js +++ b/CliClient/app/build-doc.js @@ -80,7 +80,7 @@ function getHeader() { output.push('NAME'); output.push(''); - output.push(wrap('joplin - a note taking and todo app with synchronisation capabilities'), INDENT); + output.push(wrap('joplin - a note taking and to-do app with synchronisation capabilities'), INDENT); output.push(''); @@ -88,7 +88,7 @@ function getHeader() { output.push(''); let description = []; - description.push('Joplin is a note taking and todo application, which can handle a large number of notes organised into notebooks.'); + description.push('Joplin is a note taking and to-do application, which can handle a large number of notes organised into notebooks.'); description.push('The notes are searchable, can be copied, tagged and modified with your own text editor.'); description.push("\n\n"); description.push('The notes can be synchronised with various target including the file system (for example with a network directory) or with Microsoft OneDrive.'); diff --git a/CliClient/app/build-website.js b/CliClient/app/build-website.js index 96b81546d6..a85112b07b 100644 --- a/CliClient/app/build-website.js +++ b/CliClient/app/build-website.js @@ -10,7 +10,7 @@ const headerHtml = ` - Joplin - a free, open source, note taking and todo application with synchronisation capabilities + Joplin - a free, open source, note taking and to-do application with synchronisation capabilities @@ -95,7 +95,7 @@ const headerHtml = `

oplin

-

A free, open source, note taking and todo application with synchronisation capabilities.

+

A free, open source, note taking and to-do application with synchronisation capabilities.

diff --git a/CliClient/app/command-done.js b/CliClient/app/command-done.js index 41943a7cea..85ca23bfd9 100644 --- a/CliClient/app/command-done.js +++ b/CliClient/app/command-done.js @@ -13,13 +13,13 @@ class Command extends BaseCommand { } description() { - return _('Marks a todo as done.'); + return _('Marks a to-do as done.'); } static async handleAction(args, isCompleted) { const note = await app().loadItem(BaseModel.TYPE_NOTE, args.note); if (!note) throw new Error(_('Cannot find "%s".', args.note)); - if (!note.is_todo) throw new Error(_('Note is not a todo: "%s"', args.note)); + if (!note.is_todo) throw new Error(_('Note is not a to-do: "%s"', args.note)); const todoCompleted = !!note.todo_completed; diff --git a/CliClient/app/command-ls.js b/CliClient/app/command-ls.js index 77f79344c6..62a7cd2455 100644 --- a/CliClient/app/command-ls.js +++ b/CliClient/app/command-ls.js @@ -28,9 +28,9 @@ class Command extends BaseCommand { ['-n, --limit ', _('Displays only the first top notes.')], ['-s, --sort ', _('Sorts the item by (eg. title, updated_time, created_time).')], ['-r, --reverse', _('Reverses the sorting order.')], - ['-t, --type ', _('Displays only the items of the specific type(s). Can be `n` for notes, `t` for todos, or `nt` for notes and todos (eg. `-tt` would display only the todos, while `-ttd` would display notes and todos.')], + ['-t, --type ', _('Displays only the items of the specific type(s). Can be `n` for notes, `t` for to-dos, or `nt` for notes and to-dos (eg. `-tt` would display only the to-dos, while `-ttd` would display notes and to-dos.')], ['-f, --format ', _('Either "text" or "json"')], - ['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for todos), TITLE')], + ['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for to-dos), TITLE')], ]; } diff --git a/CliClient/app/command-mktodo.js b/CliClient/app/command-mktodo.js index fd66125d8b..7d9c46d0ef 100644 --- a/CliClient/app/command-mktodo.js +++ b/CliClient/app/command-mktodo.js @@ -10,7 +10,7 @@ class Command extends BaseCommand { } description() { - return _('Creates a new todo.'); + return _('Creates a new to-do.'); } async action(args) { diff --git a/CliClient/app/command-todo.js b/CliClient/app/command-todo.js index 06385a02f2..c9ef9484b8 100644 --- a/CliClient/app/command-todo.js +++ b/CliClient/app/command-todo.js @@ -13,7 +13,7 @@ class Command extends BaseCommand { } description() { - return _(' can either be "toggle" or "clear". Use "toggle" to toggle the given todo between completed and uncompleted state (If the target is a regular note it will be converted to a todo). Use "clear" to convert the todo back to a regular note.'); + return _(' can either be "toggle" or "clear". Use "toggle" to toggle the given to-do between completed and uncompleted state (If the target is a regular note it will be converted to a to-do). Use "clear" to convert the to-do back to a regular note.'); } async action(args) { diff --git a/CliClient/app/command-undone.js b/CliClient/app/command-undone.js index 6a6d77420e..4e9faee6c0 100644 --- a/CliClient/app/command-undone.js +++ b/CliClient/app/command-undone.js @@ -15,7 +15,7 @@ class Command extends BaseCommand { } description() { - return _('Marks a todo as non-completed.'); + return _('Marks a to-do as non-completed.'); } async action(args) { diff --git a/README.md b/README.md index 69ba17059d..cb11ca352c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Joplin -Joplin is a free, open source note taking and todo application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified with your own text editor. +Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified with your own text editor. Notes exported from Evernote via .enex files [can be imported](#importing-notes-from-evernote) into Joplin, including the formatted content (which is converted to markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). @@ -18,7 +18,7 @@ To start it, type `joplin`. # Demo -The demo application shows various Wikipedia articles converted to Markdown and organised into notebooks, as well as an example todo list, in order to test and demonstrate the application. The demo application and its settings will be installed in a separate directory so as not to interfere with any existing Joplin application. +The demo application shows various Wikipedia articles converted to Markdown and organised into notebooks, as well as an example to-do list, in order to test and demonstrate the application. The demo application and its settings will be installed in a separate directory so as not to interfere with any existing Joplin application. npm install -g demo-joplin @@ -27,7 +27,7 @@ To start it, type `demo-joplin`. # Features - Mobile and command line applications. -- Support notes, todos, tags and notebooks. +- Support notes, to-dos, tags and notebooks. - Offline first, so the entire data is always available on the device. - Ability to synchronise with multiple targets, including the file system and OneDrive (Dropbox is planned). - Synchronises to a plain text format, which can be easily manipulated, backed up, or exported to a different format. @@ -70,7 +70,7 @@ Create a new note with title "Wednesday's meeting": mknote "Wednesday's meeting" -Create a new todo: +Create a new to-do: mktodo "Buy bread" diff --git a/ReactNativeClient/lib/components/action-button.js b/ReactNativeClient/lib/components/action-button.js index b346316298..82af439804 100644 --- a/ReactNativeClient/lib/components/action-button.js +++ b/ReactNativeClient/lib/components/action-button.js @@ -67,7 +67,7 @@ class ActionButtonComponent extends React.Component { if (this.props.addFolderNoteButtons) { if (this.props.folders.length) { buttons.push({ - title: _('New todo'), + title: _('New to-do'), onPress: () => { this.newTodo_press() }, color: '#9b59b6', icon: 'md-checkbox-outline',