More tweaks

CliClient/app/app.js

@@ -119,14 +119,14 @@ class Application {
 			let nextArg = argv.length >= 2 ? argv[1] : null;
 			
 			if (arg == '--profile') {
-				if (!nextArg) throw new Error(_('Usage: --profile <dir-path>'));
+				if (!nextArg) throw new Error(_('Usage: %s', '--profile <dir-path>'));
 				matched.profileDir = nextArg;
 				argv.splice(0, 2);
 				continue;
 			}
 
 			if (arg == '--env') {
-				if (!nextArg) throw new Error(_('Usage: --env <dev|prod>'));
+				if (!nextArg) throw new Error(_('Usage: %s', '--env <dev|prod>'));
 				matched.env = nextArg;
 				argv.splice(0, 2);
 				continue;
@@ -151,7 +151,7 @@ class Application {
 			}
 
 			if (arg == '--log-level') {
-				if (!nextArg) throw new Error(_('Usage: --log-level <none|error|warn|info|debug>'));
+				if (!nextArg) throw new Error(_('Usage: %s', '--log-level <none|error|warn|info|debug>'));
 				matched.logLevel = Logger.levelStringToId(nextArg);
 				argv.splice(0, 2);
 				continue;

CliClient/app/command-cat.js

@@ -9,7 +9,7 @@ import { autocompleteItems } from './autocomplete.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('cat <title>');
+		return 'cat <title>';
 	}
 
 	description() {

CliClient/app/command-config.js

@@ -6,7 +6,7 @@ import { Setting } from 'lib/models/setting.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('config [name] [value]');
+		return 'config [name] [value]';
 	}
 
 	description() {

CliClient/app/command-cp.js

@@ -9,7 +9,7 @@ import { autocompleteItems } from './autocomplete.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('cp <pattern> [notebook]');
+		return 'cp <pattern> [notebook]';
 	}
 
 	description() {

CliClient/app/command-edit.js

@@ -12,7 +12,7 @@ import { autocompleteItems } from './autocomplete.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('edit <title>');
+		return 'edit <title>';
 	}
 
 	description() {

CliClient/app/command-geoloc.js

@@ -9,7 +9,7 @@ import { autocompleteItems } from './autocomplete.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('geoloc <title>');
+		return 'geoloc <title>';
 	}
 
 	description() {

CliClient/app/command-import-enex.js

@@ -9,7 +9,7 @@ import { filename, basename } from 'lib/path-utils.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('import-enex <file> [notebook]');
+		return 'import-enex <file> [notebook]';
 	}
 
 	description() {

CliClient/app/command-ls.js

@@ -12,7 +12,7 @@ import { vorpalUtils } from './vorpal-utils.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('ls [pattern]');
+		return 'ls [pattern]';
 	}
 
 	description() {
@@ -21,11 +21,11 @@ class Command extends BaseCommand {
 	
 	options() {
 		return [
-			[_('-n, --limit <num>'), _('Displays only the first top <num> notes.')],
+			['-n, --limit <num>', _('Displays only the first top <num> notes.')],
-			[_('-s, --sort <field>'), _('Sorts the item by <field> (eg. title, updated_time, created_time).')],
+			['-s, --sort <field>', _('Sorts the item by <field> (eg. title, updated_time, created_time).')],
 			['-r, --reverse', _('Reverses the sorting order.')],
-			[_('-t, --type <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 <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.')],
-			[_('-f, --format <format>'), _('Either "text" or "json"')],
+			['-f, --format <format>', _('Either "text" or "json"')],
 			['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for todos), TITLE')],
 		];
 	}

CliClient/app/command-mkbook.js

@@ -7,7 +7,7 @@ import { reg } from 'lib/registry.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('mkbook <notebook>');
+		return 'mkbook <notebook>';
 	}
 
 	description() {

CliClient/app/command-mknote.js

@@ -7,7 +7,7 @@ import { reg } from 'lib/registry.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('mknote <note>');
+		return 'mknote <note>';
 	}
 
 	description() {

CliClient/app/command-mv.js

@@ -9,7 +9,7 @@ import { autocompleteItems } from './autocomplete.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('mv <pattern> <destination>');
+		return 'mv <pattern> <destination>';
 	}
 
 	description() {

CliClient/app/command-rm.js

@@ -11,7 +11,7 @@ import { vorpalUtils } from './vorpal-utils.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('rm <pattern>');
+		return 'rm <pattern>';
 	}
 
 	description() {

CliClient/app/command-search.js

@@ -12,7 +12,7 @@ import { vorpalUtils } from './vorpal-utils.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('search <pattern> [notebook]');
+		return 'search <pattern> [notebook]';
 	}
 
 	description() {

CliClient/app/command-set.js

@@ -10,7 +10,7 @@ import { autocompleteItems } from './autocomplete.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('set <note> <name> [value]');
+		return 'set <note> <name> [value]';
 	}
 
 	description() {

CliClient/app/command-sync.js

@@ -30,7 +30,7 @@ class Command extends BaseCommand {
 
 	options() {
 		return [
-			[_('--target <target>'), _('Sync to provided target (defaults to sync.target config value)')],
+			['--target <target>', _('Sync to provided target (defaults to sync.target config value)')],
 			['--random-failures', 'For debugging purposes. Do not use.'],
 		];
 	}

CliClient/app/command-tag.js

@@ -7,7 +7,7 @@ import { BaseModel } from 'lib/base-model.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('tag <command> [tag] [note]');
+		return 'tag <command> [tag] [note]';
 	}
 
 	description() {

CliClient/app/command-todo.js

@@ -10,7 +10,7 @@ import { autocompleteItems } from './autocomplete.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('todo <action> <pattern>');
+		return 'todo <action> <pattern>';
 	}
 
 	description() {

CliClient/app/command-use.js

@@ -8,7 +8,7 @@ import { autocompleteFolders } from './autocomplete.js';
 class Command extends BaseCommand {
 
 	usage() {
-		return _('use <notebook>');
+		return 'use <notebook>';
 	}
 
 	description() {

CliClient/app/onedrive-api-node-utils.js

@@ -17,7 +17,7 @@ class OneDriveApiNodeUtils {
 	}
 
 	possibleOAuthDancePorts() {
-		return [1917, 9917, 8917];
+		return [9967, 8967, 8867];
 	}
 
 	makePage(message) {

CliClient/locales/en_GB.po

@@ -21,13 +21,8 @@ msgstr ""
 msgid "No notebook has been specified."
 msgstr ""
 
-msgid "Usage: --profile <dir-path>"
+#, javascript-format
-msgstr ""
+msgid "Usage: %s"
-
-msgid "Usage: --env <dev|prod>"
-msgstr ""
-
-msgid "Usage: --log-level <none|error|warn|info|debug>"
 msgstr ""
 
 #, javascript-format
@@ -88,9 +83,6 @@ msgstr ""
 msgid "USAGE"
 msgstr ""
 
-msgid "cat <title>"
-msgstr ""
-
 msgid "Displays the given note."
 msgstr ""
 
@@ -101,9 +93,6 @@ msgstr ""
 msgid "Cannot find \"%s\"."
 msgstr ""
 
-msgid "config [name] [value]"
-msgstr ""
-
 msgid ""
 "Gets or sets a config value. If [value] is not provided, it will show the "
 "value of [name]. If neither [name] nor [value] is provided, it will list the "
@@ -121,17 +110,11 @@ msgstr ""
 msgid "%s = %s"
 msgstr ""
 
-msgid "cp <pattern> [notebook]"
-msgstr ""
-
 msgid ""
 "Duplicates the notes matching <pattern> to [notebook]. If no notebook is "
 "specified the note is duplicated in the current notebook."
 msgstr ""
 
-msgid "edit <title>"
-msgstr ""
-
 msgid "Edit note."
 msgstr ""
 
@@ -152,15 +135,9 @@ msgstr ""
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 
-msgid "geoloc <title>"
-msgstr ""
-
 msgid "Displays a geolocation URL for the note."
 msgstr ""
 
-msgid "import-enex <file> [notebook]"
-msgstr ""
-
 msgid "Imports an Evernote notebook file (.enex file)."
 msgstr ""
 
@@ -202,41 +179,26 @@ msgstr ""
 msgid "Importing notes..."
 msgstr ""
 
-msgid "ls [pattern]"
-msgstr ""
-
 msgid ""
 "Displays the notes in [notebook]. Use `ls /` to display the list of "
 "notebooks."
 msgstr ""
 
-msgid "-n, --limit <num>"
-msgstr ""
-
 msgid "Displays only the first top <num> notes."
 msgstr ""
 
-msgid "-s, --sort <field>"
-msgstr ""
-
 msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
 msgstr ""
 
 msgid "Reverses the sorting order."
 msgstr ""
 
-msgid "-t, --type <type>"
-msgstr ""
-
 msgid ""
 "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."
 msgstr ""
 
-msgid "-f, --format <format>"
-msgstr ""
-
 msgid "Either \"text\" or \"json\""
 msgstr ""
 
@@ -248,33 +210,21 @@ msgstr ""
 msgid "Please select a notebook first."
 msgstr ""
 
-msgid "mkbook <notebook>"
-msgstr ""
-
 msgid "Creates a new notebook."
 msgstr ""
 
-msgid "mknote <note>"
-msgstr ""
-
 msgid "Creates a new note."
 msgstr ""
 
 msgid "Notes can only be created within a notebook."
 msgstr ""
 
-msgid "mv <pattern> <destination>"
-msgstr ""
-
 msgid ""
 "Moves the notes matching <pattern> to <destination>. If <pattern> is a note, "
 "it will be moved to the notebook <destination>. If <pattern> is a notebook, "
 "it will be renamed to <destination>."
 msgstr ""
 
-msgid "rm <pattern>"
-msgstr ""
-
 msgid "Deletes the items matching <pattern>."
 msgstr ""
 
@@ -292,15 +242,9 @@ msgstr ""
 msgid "%d notes match this pattern. Delete them?"
 msgstr ""
 
-msgid "search <pattern> [notebook]"
-msgstr ""
-
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
-msgid "set <note> <name> [value]"
-msgstr ""
-
 msgid "Sets the property <name> of the given <note> to the given [value]."
 msgstr ""
 
@@ -310,9 +254,6 @@ msgstr ""
 msgid "Synchronises with remote storage."
 msgstr ""
 
-msgid "--target <target>"
-msgstr ""
-
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 
@@ -335,9 +276,6 @@ msgstr ""
 msgid "Cancelling..."
 msgstr ""
 
-msgid "tag <command> [tag] [note]"
-msgstr ""
-
 msgid ""
 "<command> can be \"add\", \"remove\" or \"list\" to assign or remove [tag] "
 "from [note], or to list the notes associated with [tag]. The command `tag "
@@ -348,9 +286,6 @@ msgstr ""
 msgid "Invalid command: \"%s\""
 msgstr ""
 
-msgid "todo <action> <pattern>"
-msgstr ""
-
 msgid ""
 "<action> can either be \"toggle\" or \"clear\". Use \"toggle\" to toggle the "
 "given todo between completed and uncompleted state (If the target is a "
@@ -358,9 +293,6 @@ msgid ""
 "todo back to a regular note."
 msgstr ""
 
-msgid "use <notebook>"
-msgstr ""
-
 msgid ""
 "Switches to [notebook] - all further operations will happen within this "
 "notebook."

CliClient/locales/fr_FR.po

@@ -21,14 +21,9 @@ msgstr "Aucun carnet n'est sélectionné."
 msgid "No notebook has been specified."
 msgstr "Aucun carnet n'est spécifié."
 
-msgid "Usage: --profile <dir-path>"
+#, javascript-format
-msgstr "Utilisation: --profile <chemin>"
+msgid "Usage: %s"
-
+msgstr "Utilisation : %s."
-msgid "Usage: --env <dev|prod>"
-msgstr "Utilisation : --env <dev|prod>"
-
-msgid "Usage: --log-level <none|error|warn|info|debug>"
-msgstr "Utilisation: --log-level <none|error|warn|info|debug>"
 
 #, javascript-format
 msgid "Unknown flag: %s"
@@ -52,13 +47,13 @@ msgid "No notebook is defined. Create one with `mkbook <notebook>`."
 msgstr "Aucun carnet n'est défini. Créez-en un avec `mkbook <carnet>`."
 
 msgid "NAME"
-msgstr ""
+msgstr "NOM"
 
 msgid "joplin - a note taking and todo app with synchronisation capabilities"
 msgstr ""
 
 msgid "DESCRIPTION"
-msgstr ""
+msgstr "DESCRIPTION"
 
 msgid ""
 "Joplin is a note taking and todo application, which can handle a large "
@@ -82,16 +77,13 @@ msgid ""
 msgstr ""
 
 msgid "WEBSITE"
-msgstr ""
+msgstr "SITE INTERNET"
 
 msgid "LICENSE"
-msgstr ""
+msgstr "LISENSE"
 
 msgid "USAGE"
-msgstr ""
+msgstr "UTILISATION"
-
-msgid "cat <title>"
-msgstr "cat <titre>"
 
 msgid "Displays the given note."
 msgstr "Affiche la note."
@@ -103,9 +95,6 @@ msgstr "Affiche tous les détails de la note."
 msgid "Cannot find \"%s\"."
 msgstr "Impossible de trouver \"%s\"."
 
-msgid "config [name] [value]"
-msgstr "config [nom] [valeur]"
-
 msgid ""
 "Gets or sets a config value. If [value] is not provided, it will show the "
 "value of [name]. If neither [name] nor [value] is provided, it will list the "
@@ -126,9 +115,6 @@ msgstr "%s = %s (%s)"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-msgid "cp <pattern> [notebook]"
-msgstr "cp <nom> [carnet]"
-
 msgid ""
 "Duplicates the notes matching <pattern> to [notebook]. If no notebook is "
 "specified the note is duplicated in the current notebook."
@@ -136,9 +122,6 @@ msgstr ""
 "Copie les notes correspondant à [nom] vers [carnet]. Si aucun carnet n'est "
 "spécifié, la note est dupliqué sur place."
 
-msgid "edit <title>"
-msgstr "edit <titre>"
-
 msgid "Edit note."
 msgstr "Editer la note."
 
@@ -154,7 +137,7 @@ msgstr ""
 msgid "No active notebook."
 msgstr "Aucun carnet actif."
 
-#, fuzzy, javascript-format
+#, javascript-format
 msgid "Note does not exist: \"%s\". Create it?"
 msgstr "Ce carnet n'existe pas : \"%s\". Le créer ?"
 
@@ -163,16 +146,9 @@ msgstr ""
 "Edition de la note en cours. Fermez l'éditeur de texte pour retourner à "
 "l'invite de commande."
 
-#, fuzzy
-msgid "geoloc <title>"
-msgstr "cat <titre>"
-
 msgid "Displays a geolocation URL for the note."
 msgstr "Afficher l'URL de l'emplacement de la note."
 
-msgid "import-enex <file> [notebook]"
-msgstr "import-enex <fichier> [carnet]"
-
 msgid "Imports an Evernote notebook file (.enex file)."
 msgstr "Importer un carnet Evernote (fichier .enex)."
 
@@ -214,9 +190,6 @@ msgstr "Etiquettes : %d."
 msgid "Importing notes..."
 msgstr "Importation des notes..."
 
-msgid "ls [pattern]"
-msgstr "ls [motif]"
-
 msgid ""
 "Displays the notes in [notebook]. Use `ls /` to display the list of "
 "notebooks."
@@ -224,15 +197,9 @@ msgstr ""
 "Affiche les notes dans le carnet. Utilisez `ls /` pour afficher la liste des "
 "carnets."
 
-msgid "-n, --limit <num>"
-msgstr ""
-
 msgid "Displays only the first top <num> notes."
 msgstr "Affiche uniquement les <num> premières notes."
 
-msgid "-s, --sort <field>"
-msgstr ""
-
 msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
 msgstr ""
 "Trier les notes par <field> (par exemple, title, updated_time, created_time)."
@@ -240,9 +207,6 @@ msgstr ""
 msgid "Reverses the sorting order."
 msgstr "Inverser l'ordre."
 
-msgid "-t, --type <type>"
-msgstr ""
-
 msgid ""
 "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 "
@@ -252,9 +216,6 @@ msgstr ""
 "`n` pour les notes, `t` pour les tâches (par exemple, `-tt` affiche "
 "uniquement les tâches, tandis que `-ttd` affiche les notes et les tâches)."
 
-msgid "-f, --format <format>"
-msgstr ""
-
 msgid "Either \"text\" or \"json\""
 msgstr "Soit \"text\" soit \"json\""
 
@@ -268,24 +229,15 @@ msgstr ""
 msgid "Please select a notebook first."
 msgstr "Veuillez d'abord sélectionner un carnet."
 
-msgid "mkbook <notebook>"
-msgstr "mkbook <carnet>"
-
 msgid "Creates a new notebook."
 msgstr "Créer un carnet."
 
-msgid "mknote <note>"
-msgstr "mknote <note>"
-
 msgid "Creates a new note."
 msgstr "Créer une note."
 
 msgid "Notes can only be created within a notebook."
 msgstr "Les notes ne peuvent être créées que dans un carnet."
 
-msgid "mv <pattern> <destination>"
-msgstr "mv <motif> <destination>"
-
 msgid ""
 "Moves the notes matching <pattern> to <destination>. If <pattern> is a note, "
 "it will be moved to the notebook <destination>. If <pattern> is a notebook, "
@@ -295,9 +247,6 @@ msgstr ""
 "est une note, elle sera déplacée vers le carnet <destination>. Si <motif> "
 "est un carnet, il sera renommé <destination>."
 
-msgid "rm <pattern>"
-msgstr "rm <motif>"
-
 msgid "Deletes the items matching <pattern>."
 msgstr "Supprime les objets correspondants à <motif>."
 
@@ -315,17 +264,9 @@ msgstr "Supprimer le carnet \"%s\" ?"
 msgid "%d notes match this pattern. Delete them?"
 msgstr "%d notes correspondent à ce motif. Les supprimer ?"
 
-#, fuzzy
-msgid "search <pattern> [notebook]"
-msgstr "cp <nom> [carnet]"
-
 msgid "Searches for the given <pattern> in all the notes."
 msgstr "Chercher le motif <pattern> dans toutes les notes."
 
-#, fuzzy
-msgid "set <note> <name> [value]"
-msgstr "config [nom] [valeur]"
-
 msgid "Sets the property <name> of the given <note> to the given [value]."
 msgstr "Assigner la valeur [value] à la propriété <name> de la <note> donnée."
 
@@ -335,9 +276,6 @@ msgstr "Afficher un résumé des notes et carnets."
 msgid "Synchronises with remote storage."
 msgstr "Synchroniser les notes et carnets."
 
-msgid "--target <target>"
-msgstr ""
-
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 "Synchroniser avec la cible donnée (par défaut, la valeur de configuration "
@@ -362,9 +300,6 @@ msgstr "Terminé."
 msgid "Cancelling..."
 msgstr "Annulation..."
 
-msgid "tag <command> [tag] [note]"
-msgstr ""
-
 msgid ""
 "<command> can be \"add\", \"remove\" or \"list\" to assign or remove [tag] "
 "from [note], or to list the notes associated with [tag]. The command `tag "
@@ -379,10 +314,6 @@ msgstr ""
 msgid "Invalid command: \"%s\""
 msgstr "Commande invalide : \"%s\""
 
-msgid "todo <action> <pattern>"
-msgstr ""
-
-#, fuzzy
 msgid ""
 "<action> can either be \"toggle\" or \"clear\". Use \"toggle\" to toggle the "
 "given todo between completed and uncompleted state (If the target is a "
@@ -394,10 +325,6 @@ msgstr ""
 "terminé (Si la cible est une note, elle sera convertie en tâche). Utilisez "
 "\"clear\" pour convertir la tâche en note."
 
-#, fuzzy
-msgid "use <notebook>"
-msgstr "Nouveau carnet"
-
 msgid ""
 "Switches to [notebook] - all further operations will happen within this "
 "notebook."
@@ -611,7 +538,7 @@ msgid "Edit notebook"
 msgstr "Editer le carnet"
 
 msgid "Refresh"
-msgstr ""
+msgstr "Rafraîchir"
 
 msgid "Untitled"
 msgstr "Sans titre"
@@ -667,6 +594,61 @@ msgstr ""
 msgid "Welcome"
 msgstr "Bienvenu"
 
+#~ msgid "Usage: --profile <dir-path>"
+#~ msgstr "Utilisation: --profile <chemin>"
+
+#~ msgid "Usage: --env <dev|prod>"
+#~ msgstr "Utilisation : --env <dev|prod>"
+
+#~ msgid "Usage: --log-level <none|error|warn|info|debug>"
+#~ msgstr "Utilisation: --log-level <none|error|warn|info|debug>"
+
+#~ msgid "cat <title>"
+#~ msgstr "cat <titre>"
+
+#~ msgid "config [name] [value]"
+#~ msgstr "config [nom] [valeur]"
+
+#~ msgid "cp <pattern> [notebook]"
+#~ msgstr "cp <nom> [carnet]"
+
+#~ msgid "edit <title>"
+#~ msgstr "edit <titre>"
+
+#, fuzzy
+#~ msgid "geoloc <title>"
+#~ msgstr "cat <titre>"
+
+#~ msgid "import-enex <file> [notebook]"
+#~ msgstr "import-enex <fichier> [carnet]"
+
+#~ msgid "ls [pattern]"
+#~ msgstr "ls [motif]"
+
+#~ msgid "mkbook <notebook>"
+#~ msgstr "mkbook <carnet>"
+
+#~ msgid "mknote <note>"
+#~ msgstr "mknote <note>"
+
+#~ msgid "mv <pattern> <destination>"
+#~ msgstr "mv <motif> <destination>"
+
+#~ msgid "rm <pattern>"
+#~ msgstr "rm <motif>"
+
+#, fuzzy
+#~ msgid "search <pattern> [notebook]"
+#~ msgstr "cp <nom> [carnet]"
+
+#, fuzzy
+#~ msgid "set <note> <name> [value]"
+#~ msgstr "config [nom] [valeur]"
+
+#, fuzzy
+#~ msgid "use <notebook>"
+#~ msgstr "Nouveau carnet"
+
 #~ msgid "Attach file"
 #~ msgstr "Attacher un fichier"
 

CliClient/locales/joplin.pot

@@ -21,13 +21,8 @@ msgstr ""
 msgid "No notebook has been specified."
 msgstr ""
 
-msgid "Usage: --profile <dir-path>"
+#, javascript-format
-msgstr ""
+msgid "Usage: %s"
-
-msgid "Usage: --env <dev|prod>"
-msgstr ""
-
-msgid "Usage: --log-level <none|error|warn|info|debug>"
 msgstr ""
 
 #, javascript-format
@@ -88,9 +83,6 @@ msgstr ""
 msgid "USAGE"
 msgstr ""
 
-msgid "cat <title>"
-msgstr ""
-
 msgid "Displays the given note."
 msgstr ""
 
@@ -101,9 +93,6 @@ msgstr ""
 msgid "Cannot find \"%s\"."
 msgstr ""
 
-msgid "config [name] [value]"
-msgstr ""
-
 msgid ""
 "Gets or sets a config value. If [value] is not provided, it will show the "
 "value of [name]. If neither [name] nor [value] is provided, it will list the "
@@ -121,17 +110,11 @@ msgstr ""
 msgid "%s = %s"
 msgstr ""
 
-msgid "cp <pattern> [notebook]"
-msgstr ""
-
 msgid ""
 "Duplicates the notes matching <pattern> to [notebook]. If no notebook is "
 "specified the note is duplicated in the current notebook."
 msgstr ""
 
-msgid "edit <title>"
-msgstr ""
-
 msgid "Edit note."
 msgstr ""
 
@@ -152,15 +135,9 @@ msgstr ""
 msgid "Starting to edit note. Close the editor to get back to the prompt."
 msgstr ""
 
-msgid "geoloc <title>"
-msgstr ""
-
 msgid "Displays a geolocation URL for the note."
 msgstr ""
 
-msgid "import-enex <file> [notebook]"
-msgstr ""
-
 msgid "Imports an Evernote notebook file (.enex file)."
 msgstr ""
 
@@ -202,41 +179,26 @@ msgstr ""
 msgid "Importing notes..."
 msgstr ""
 
-msgid "ls [pattern]"
-msgstr ""
-
 msgid ""
 "Displays the notes in [notebook]. Use `ls /` to display the list of "
 "notebooks."
 msgstr ""
 
-msgid "-n, --limit <num>"
-msgstr ""
-
 msgid "Displays only the first top <num> notes."
 msgstr ""
 
-msgid "-s, --sort <field>"
-msgstr ""
-
 msgid "Sorts the item by <field> (eg. title, updated_time, created_time)."
 msgstr ""
 
 msgid "Reverses the sorting order."
 msgstr ""
 
-msgid "-t, --type <type>"
-msgstr ""
-
 msgid ""
 "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."
 msgstr ""
 
-msgid "-f, --format <format>"
-msgstr ""
-
 msgid "Either \"text\" or \"json\""
 msgstr ""
 
@@ -248,33 +210,21 @@ msgstr ""
 msgid "Please select a notebook first."
 msgstr ""
 
-msgid "mkbook <notebook>"
-msgstr ""
-
 msgid "Creates a new notebook."
 msgstr ""
 
-msgid "mknote <note>"
-msgstr ""
-
 msgid "Creates a new note."
 msgstr ""
 
 msgid "Notes can only be created within a notebook."
 msgstr ""
 
-msgid "mv <pattern> <destination>"
-msgstr ""
-
 msgid ""
 "Moves the notes matching <pattern> to <destination>. If <pattern> is a note, "
 "it will be moved to the notebook <destination>. If <pattern> is a notebook, "
 "it will be renamed to <destination>."
 msgstr ""
 
-msgid "rm <pattern>"
-msgstr ""
-
 msgid "Deletes the items matching <pattern>."
 msgstr ""
 
@@ -292,15 +242,9 @@ msgstr ""
 msgid "%d notes match this pattern. Delete them?"
 msgstr ""
 
-msgid "search <pattern> [notebook]"
-msgstr ""
-
 msgid "Searches for the given <pattern> in all the notes."
 msgstr ""
 
-msgid "set <note> <name> [value]"
-msgstr ""
-
 msgid "Sets the property <name> of the given <note> to the given [value]."
 msgstr ""
 
@@ -310,9 +254,6 @@ msgstr ""
 msgid "Synchronises with remote storage."
 msgstr ""
 
-msgid "--target <target>"
-msgstr ""
-
 msgid "Sync to provided target (defaults to sync.target config value)"
 msgstr ""
 
@@ -335,9 +276,6 @@ msgstr ""
 msgid "Cancelling..."
 msgstr ""
 
-msgid "tag <command> [tag] [note]"
-msgstr ""
-
 msgid ""
 "<command> can be \"add\", \"remove\" or \"list\" to assign or remove [tag] "
 "from [note], or to list the notes associated with [tag]. The command `tag "
@@ -348,9 +286,6 @@ msgstr ""
 msgid "Invalid command: \"%s\""
 msgstr ""
 
-msgid "todo <action> <pattern>"
-msgstr ""
-
 msgid ""
 "<action> can either be \"toggle\" or \"clear\". Use \"toggle\" to toggle the "
 "given todo between completed and uncompleted state (If the target is a "
@@ -358,9 +293,6 @@ msgid ""
 "todo back to a regular note."
 msgstr ""
 
-msgid "use <notebook>"
-msgstr ""
-
 msgid ""
 "Switches to [notebook] - all further operations will happen within this "
 "notebook."

README.md

@@ -1,4 +1,4 @@
-# Joplin
+# Joplin (BETA)
 
 Joplin is a 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. The Android application supports markdown rendering.
 

ReactNativeClient/lib/onedrive-api.js

@@ -238,7 +238,7 @@ class OneDriveApi {
 	async refreshAccessToken() {
 		if (!this.auth_ || !this.auth_.refresh_token) {
 			this.setAuth(null);
-			throw new Error('Cannot refresh token: authentication data is missing');
+			throw new Error(_('Cannot refresh token: authentication data is missing. Starting the synchronisation again may fix the problem.'));
 		}
 
 		let body = new shim.FormData();