mirror of
https://github.com/laurent22/joplin.git
synced 2024-11-24 08:12:24 +02:00
Updated Readme, mentioned Homebrew
This commit is contained in:
Laurent Cozic
parent
3894dd1191
commit
ff502670bf
@ -68,8 +68,11 @@ function buildLocale(inputFile, outputFile) {
|
||||
}
|
||||
|
||||
async function removePoHeaderDate(filePath) {
|
||||
await execCommand('sed -i "" -e\'/POT-Creation-Date:/d\' "' + filePath + '"');
|
||||
await execCommand('sed -i "" -e\'/PO-Revision-Date:/d\' "' + filePath + '"');
|
||||
// Note: on macOS this will fail because it needs to be 'sed -i ""'
|
||||
// Solution would be to install gsed, detect it here, and use it in place of sed in macOS
|
||||
// https://stackoverflow.com/questions/30003570/how-to-use-gnu-sed-on-mac-os-x#34815955
|
||||
await execCommand('sed -i -e\'/POT-Creation-Date:/d\' "' + filePath + '"');
|
||||
await execCommand('sed -i -e\'/PO-Revision-Date:/d\' "' + filePath + '"');
|
||||
}
|
||||
|
||||
async function createPotFile(potFilePath, sources) {
|
||||
|
||||
@ -562,7 +562,7 @@ msgstr ""
|
||||
msgid "Rename notebook:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Set or clear alarm:"
|
||||
msgid "Set alarm:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Layout"
|
||||
|
||||
@ -609,8 +609,8 @@ msgid "Rename notebook:"
|
||||
msgstr "Renombrar cuaderno:"
|
||||
|
||||
#, fuzzy
|
||||
msgid "Set or clear alarm:"
|
||||
msgstr "Establecer o eliminar alarma:"
|
||||
msgid "Set alarm:"
|
||||
msgstr "Establecer alarma"
|
||||
|
||||
#, fuzzy
|
||||
msgid "Layout"
|
||||
@ -996,3 +996,7 @@ msgstr "Actualmente no tiene cuadernos. Cree uno presionando el botón (+)."
|
||||
|
||||
msgid "Welcome"
|
||||
msgstr "Bienvenido"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "Set or clear alarm:"
|
||||
#~ msgstr "Establecer o eliminar alarma:"
|
||||
|
||||
@ -614,8 +614,9 @@ msgstr "Séparez chaque étiquette par une virgule."
|
||||
msgid "Rename notebook:"
|
||||
msgstr "Renommer le carnet :"
|
||||
|
||||
msgid "Set or clear alarm:"
|
||||
msgstr "Définir ou modifier alarme :"
|
||||
#, fuzzy
|
||||
msgid "Set alarm:"
|
||||
msgstr "Définir ou modifier alarme"
|
||||
|
||||
msgid "Layout"
|
||||
msgstr "Disposition"
|
||||
@ -1005,6 +1006,9 @@ msgstr ""
|
||||
msgid "Welcome"
|
||||
msgstr "Bienvenue"
|
||||
|
||||
#~ msgid "Set or clear alarm:"
|
||||
#~ msgstr "Définir ou modifier alarme :"
|
||||
|
||||
#~ msgid "Set or clear alarm"
|
||||
#~ msgstr "Définir ou modifier alarme"
|
||||
|
||||
|
||||
@ -562,7 +562,7 @@ msgstr ""
|
||||
msgid "Rename notebook:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Set or clear alarm:"
|
||||
msgid "Set alarm:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Layout"
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
12
README.md
12
README.md
@ -31,14 +31,18 @@ iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'
|
||||
|
||||
## Terminal application
|
||||
|
||||
On macOS, Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)), type:
|
||||
**IMPORTANT: Node v8+ is required**
|
||||
|
||||
On macOS:
|
||||
|
||||
brew install joplin
|
||||
|
||||
On Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)), type:
|
||||
|
||||
NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin
|
||||
sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
|
||||
|
||||
**IMPORTANT: Node v8+ is required**
|
||||
|
||||
By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed.
|
||||
By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed. Alternatively, if your npm permissions are setup as described [here](https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2) then simply running `npm -g install joplin` would work.
|
||||
|
||||
To start it, type `joplin`.
|
||||
|
||||
|
||||
@ -10,9 +10,18 @@ The notes can be [synchronised](#synchronisation) with various targets including
|
||||
|
||||
# Installation
|
||||
|
||||
On macOS, Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)), type:
|
||||
**IMPORTANT: Node v8+ is required**
|
||||
|
||||
npm install -g joplin
|
||||
On macOS:
|
||||
|
||||
brew install joplin
|
||||
|
||||
On Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)), type:
|
||||
|
||||
NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin
|
||||
sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin
|
||||
|
||||
By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed. Alternatively, if your npm permissions are setup as described [here](https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2) then simply running `npm -g install joplin` would work.
|
||||
|
||||
To start it, type `joplin`.
|
||||
|
||||
@ -168,6 +177,11 @@ The following commands are available in [command-line mode](#command-line-mode):
|
||||
|
||||
Possible keys/values:
|
||||
|
||||
sync.2.path File system synchronisation target directory.
|
||||
The path to synchronise with when file system
|
||||
synchronisation is enabled. See `sync.target`.
|
||||
Type: string.
|
||||
|
||||
editor Text editor.
|
||||
The editor that will be used to open a note. If
|
||||
none is provided it will try to auto-detect the
|
||||
@ -176,13 +190,29 @@ The following commands are available in [command-line mode](#command-line-mode):
|
||||
|
||||
locale Language.
|
||||
Type: Enum.
|
||||
Possible values: en_GB (English), fr_FR (Français).
|
||||
Possible values: en_GB (English), es_CR (Español),
|
||||
fr_FR (Français).
|
||||
Default: "en_GB"
|
||||
|
||||
sync.2.path File system synchronisation target directory.
|
||||
The path to synchronise with when file system
|
||||
synchronisation is enabled. See `sync.target`.
|
||||
Type: string.
|
||||
dateFormat Date format.
|
||||
Type: Enum.
|
||||
Possible values: DD/MM/YYYY (30/01/2017), DD/MM/YY
|
||||
(30/01/17), MM/DD/YYYY (01/30/2017), MM/DD/YY
|
||||
(01/30/17), YYYY-MM-DD (2017-01-30).
|
||||
Default: "DD/MM/YYYY"
|
||||
|
||||
timeFormat Time format.
|
||||
Type: Enum.
|
||||
Possible values: HH:mm (20:30), h:mm A (8:30 PM).
|
||||
Default: "HH:mm"
|
||||
|
||||
uncompletedTodosOnTop Show uncompleted todos on top of the lists.
|
||||
Type: bool.
|
||||
Default: true
|
||||
|
||||
trackLocation Save geo-location with notes.
|
||||
Type: bool.
|
||||
Default: true
|
||||
|
||||
sync.interval Synchronisation interval.
|
||||
Type: Enum.
|
||||
@ -196,18 +226,10 @@ The following commands are available in [command-line mode](#command-line-mode):
|
||||
the file system, set `sync.2.path` to specify the
|
||||
target directory.
|
||||
Type: Enum.
|
||||
Possible values: 1 (Memory), 2 (File system), 3
|
||||
(OneDrive).
|
||||
Possible values: 2 (File system), 3 (OneDrive), 4
|
||||
(OneDrive Dev (For testing only)).
|
||||
Default: 3
|
||||
|
||||
trackLocation Save geo-location with notes.
|
||||
Type: bool.
|
||||
Default: true
|
||||
|
||||
uncompletedTodosOnTop Show uncompleted todos on top of the lists.
|
||||
Type: bool.
|
||||
Default: true
|
||||
|
||||
cp <note> [notebook]
|
||||
|
||||
Duplicates the notes matching <note> to [notebook]. If no notebook is
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user