From b81111743f13350752de88c6589898442c382c60 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 28 Jul 2017 18:13:07 +0000 Subject: [PATCH] More tweaks --- CliClient/app/app.js | 6 +- CliClient/app/command-cat.js | 2 +- CliClient/app/command-config.js | 2 +- CliClient/app/command-cp.js | 2 +- CliClient/app/command-edit.js | 2 +- CliClient/app/command-geoloc.js | 2 +- CliClient/app/command-import-enex.js | 2 +- CliClient/app/command-ls.js | 10 +- CliClient/app/command-mkbook.js | 2 +- CliClient/app/command-mknote.js | 2 +- CliClient/app/command-mv.js | 2 +- CliClient/app/command-rm.js | 2 +- CliClient/app/command-search.js | 2 +- CliClient/app/command-set.js | 2 +- CliClient/app/command-sync.js | 2 +- CliClient/app/command-tag.js | 2 +- CliClient/app/command-todo.js | 2 +- CliClient/app/command-use.js | 2 +- CliClient/app/onedrive-api-node-utils.js | 2 +- CliClient/locales/en_GB.po | 72 +---------- CliClient/locales/fr_FR.po | 148 ++++++++++------------- CliClient/locales/joplin.pot | 72 +---------- README.md | 2 +- ReactNativeClient/lib/onedrive-api.js | 2 +- 24 files changed, 96 insertions(+), 250 deletions(-) diff --git a/CliClient/app/app.js b/CliClient/app/app.js index 558aa3895..8dc195bc4 100644 --- a/CliClient/app/app.js +++ b/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 ')); + if (!nextArg) throw new Error(_('Usage: %s', '--profile ')); matched.profileDir = nextArg; argv.splice(0, 2); continue; } if (arg == '--env') { - if (!nextArg) throw new Error(_('Usage: --env ')); + if (!nextArg) throw new Error(_('Usage: %s', '--env ')); 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 ')); + if (!nextArg) throw new Error(_('Usage: %s', '--log-level ')); matched.logLevel = Logger.levelStringToId(nextArg); argv.splice(0, 2); continue; diff --git a/CliClient/app/command-cat.js b/CliClient/app/command-cat.js index a3028e9d7..16308c068 100644 --- a/CliClient/app/command-cat.js +++ b/CliClient/app/command-cat.js @@ -9,7 +9,7 @@ import { autocompleteItems } from './autocomplete.js'; class Command extends BaseCommand { usage() { - return _('cat '); + return 'cat <title>'; } description() { diff --git a/CliClient/app/command-config.js b/CliClient/app/command-config.js index 606b6374a..0cfe7ba1f 100644 --- a/CliClient/app/command-config.js +++ b/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() { diff --git a/CliClient/app/command-cp.js b/CliClient/app/command-cp.js index bdfba7992..ea00459ea 100644 --- a/CliClient/app/command-cp.js +++ b/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() { diff --git a/CliClient/app/command-edit.js b/CliClient/app/command-edit.js index c4c8d0336..ec5589ecb 100644 --- a/CliClient/app/command-edit.js +++ b/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() { diff --git a/CliClient/app/command-geoloc.js b/CliClient/app/command-geoloc.js index df25f5868..507312ada 100644 --- a/CliClient/app/command-geoloc.js +++ b/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() { diff --git a/CliClient/app/command-import-enex.js b/CliClient/app/command-import-enex.js index 9ea0ada2d..50c044357 100644 --- a/CliClient/app/command-import-enex.js +++ b/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() { diff --git a/CliClient/app/command-ls.js b/CliClient/app/command-ls.js index baea158ee..0e8a96460 100644 --- a/CliClient/app/command-ls.js +++ b/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.')], - [_('-s, --sort <field>'), _('Sorts the item by <field> (eg. title, updated_time, created_time).')], + ['-n, --limit <num>', _('Displays only the first top <num> notes.')], + ['-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.')], - [_('-f, --format <format>'), _('Either "text" or "json"')], + ['-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"')], ['-l, --long', _('Use long list format. Format is ID, NOTE_COUNT (for notebook), DATE, TODO_CHECKED (for todos), TITLE')], ]; } diff --git a/CliClient/app/command-mkbook.js b/CliClient/app/command-mkbook.js index 2d394e08c..82f78a043 100644 --- a/CliClient/app/command-mkbook.js +++ b/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() { diff --git a/CliClient/app/command-mknote.js b/CliClient/app/command-mknote.js index 51745ed65..82842d139 100644 --- a/CliClient/app/command-mknote.js +++ b/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() { diff --git a/CliClient/app/command-mv.js b/CliClient/app/command-mv.js index 6e343dac3..59e434d9e 100644 --- a/CliClient/app/command-mv.js +++ b/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() { diff --git a/CliClient/app/command-rm.js b/CliClient/app/command-rm.js index aea1cda50..088f5b567 100644 --- a/CliClient/app/command-rm.js +++ b/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() { diff --git a/CliClient/app/command-search.js b/CliClient/app/command-search.js index 52082441c..0e5de29aa 100644 --- a/CliClient/app/command-search.js +++ b/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() { diff --git a/CliClient/app/command-set.js b/CliClient/app/command-set.js index 440841d33..94560b27e 100644 --- a/CliClient/app/command-set.js +++ b/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() { diff --git a/CliClient/app/command-sync.js b/CliClient/app/command-sync.js index b896b503d..a75d7a9c6 100644 --- a/CliClient/app/command-sync.js +++ b/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.'], ]; } diff --git a/CliClient/app/command-tag.js b/CliClient/app/command-tag.js index 587d88677..7bf1987be 100644 --- a/CliClient/app/command-tag.js +++ b/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() { diff --git a/CliClient/app/command-todo.js b/CliClient/app/command-todo.js index 0a8447fd3..3938edc25 100644 --- a/CliClient/app/command-todo.js +++ b/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() { diff --git a/CliClient/app/command-use.js b/CliClient/app/command-use.js index 1dd000cff..813bbc2fe 100644 --- a/CliClient/app/command-use.js +++ b/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() { diff --git a/CliClient/app/onedrive-api-node-utils.js b/CliClient/app/onedrive-api-node-utils.js index 8607e367c..f955eba40 100644 --- a/CliClient/app/onedrive-api-node-utils.js +++ b/CliClient/app/onedrive-api-node-utils.js @@ -17,7 +17,7 @@ class OneDriveApiNodeUtils { } possibleOAuthDancePorts() { - return [1917, 9917, 8917]; + return [9967, 8967, 8867]; } makePage(message) { diff --git a/CliClient/locales/en_GB.po b/CliClient/locales/en_GB.po index 8e786555d..ee9174741 100644 --- a/CliClient/locales/en_GB.po +++ b/CliClient/locales/en_GB.po @@ -21,13 +21,8 @@ msgstr "" msgid "No notebook has been specified." msgstr "" -msgid "Usage: --profile <dir-path>" -msgstr "" - -msgid "Usage: --env <dev|prod>" -msgstr "" - -msgid "Usage: --log-level <none|error|warn|info|debug>" +#, javascript-format +msgid "Usage: %s" 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." diff --git a/CliClient/locales/fr_FR.po b/CliClient/locales/fr_FR.po index abfeef7b8..91f0b5c6e 100644 --- a/CliClient/locales/fr_FR.po +++ b/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>" -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>" +#, javascript-format +msgid "Usage: %s" +msgstr "Utilisation : %s." #, 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 "" - -msgid "cat <title>" -msgstr "cat <titre>" +msgstr "UTILISATION" 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" diff --git a/CliClient/locales/joplin.pot b/CliClient/locales/joplin.pot index 8e786555d..ee9174741 100644 --- a/CliClient/locales/joplin.pot +++ b/CliClient/locales/joplin.pot @@ -21,13 +21,8 @@ msgstr "" msgid "No notebook has been specified." msgstr "" -msgid "Usage: --profile <dir-path>" -msgstr "" - -msgid "Usage: --env <dev|prod>" -msgstr "" - -msgid "Usage: --log-level <none|error|warn|info|debug>" +#, javascript-format +msgid "Usage: %s" 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." diff --git a/README.md b/README.md index 38cea2028..64e7fc43b 100644 --- a/README.md +++ b/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. diff --git a/ReactNativeClient/lib/onedrive-api.js b/ReactNativeClient/lib/onedrive-api.js index a6c1dbf70..a6ad555bb 100644 --- a/ReactNativeClient/lib/onedrive-api.js +++ b/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();