Merge pull request #3 from laurent22/master

Update fork from original repository

.gitignore

@@ -37,4 +37,7 @@ _mydocs
 Assets/DownloadBadges*.psd
 node_modules
 Tools/github_oauth_token.txt
-_releases
+_releases
+ReactNativeClient/lib/csstojs/
+ElectronClient/app/gui/note-viewer/fonts/
+Tools/commit_hook.txt

.travis.yml

@@ -46,6 +46,8 @@ before_install:
 
 script:
   - |
-    cd ElectronClient/app
+    cd Tools
+    npm install
+    cd ../ElectronClient/app
     rsync -aP --delete ../../ReactNativeClient/lib/ lib/
     npm install && yarn dist

BUILD.md

@@ -17,6 +17,15 @@ If you get a node-gyp related error you might need to manually install it: `npm
 - Install node v8.x (check with `node --version`) - https://nodejs.org/en/
 - If you get a node-gyp related error you might need to manually install it: `npm install -g node-gyp`
 
+# Building the tools
+
+Before building any of the applications, you need to build the tools:
+
+```
+cd Tools
+npm install
+```
+
 # Building the Electron application
 
 ```

CliClient/locales/de_DE.po

@@ -691,6 +691,13 @@ msgstr "Über Joplin"
 msgid "%s %s (%s, %s)"
 msgstr "%s %s (%s, %s)"
 
+#, fuzzy, javascript-format
+msgid "Open %s"
+msgstr "Auf %s: %s"
+
+msgid "Exit"
+msgstr ""
+
 msgid "OK"
 msgstr "OK"
 
@@ -700,23 +707,30 @@ msgstr "Abbrechen"
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
-msgstr ""
+#, fuzzy, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
+msgstr "Notizen löschen?"
 
-#, javascript-format
-msgid "Could not download the update: %s"
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
-msgid "Current version is up-to-date."
+msgid "Yes"
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
-msgstr ""
+#, fuzzy
+msgid "No"
+msgstr "N"
 
-#, javascript-format
-msgid "Could not install the update: %s"
+msgid "Current version is up-to-date."
 msgstr ""
 
+#, fuzzy
+msgid "Check synchronisation configuration"
+msgstr "Synchronisation abbrechen"
+
 #, javascript-format
 msgid "Notes and settings are stored in: %s"
 msgstr "Notizen und Einstellungen gespeichert in: %s"
@@ -785,6 +799,16 @@ msgstr ""
 "verwendet werden, abhängig davon, wie die jeweiligen Notizen oder "
 "Notizbücher ursprünglich verschlüsselt wurden."
 
+#, fuzzy
+msgid "Missing Master Keys"
+msgstr "Hauptschlüssel"
+
+msgid ""
+"The master keys with these IDs are used to encrypt some of your items, "
+"however the application does not currently have access to them. It is likely "
+"they will eventually be downloaded via synchronisation."
+msgstr ""
+
 msgid "Status"
 msgstr "Status"
 
@@ -860,16 +884,38 @@ msgstr ""
 "Momentan existieren noch keine Notizbücher. Erstelle eines, indem du auf den "
 "(+) Knopf drückst."
 
+msgid "Open..."
+msgstr ""
+
+#, fuzzy
+msgid "Save as..."
+msgstr "Änderungen speichern"
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr "Nicht unterstützter Link oder Nachricht: %s"
 
 msgid "Attach file"
 msgstr "Datei anhängen"
 
+msgid "Tags"
+msgstr "Markierungen"
+
 msgid "Set alarm"
 msgstr "Alarm erstellen"
 
+#, fuzzy
+msgid "to-do"
+msgstr "Neues To-Do"
+
+#, fuzzy
+msgid "note"
+msgstr "Neue Notiz"
+
+#, fuzzy, javascript-format
+msgid "Creating new %s..."
+msgstr "Importiere Notizen..."
+
 msgid "Refresh"
 msgstr "Aktualisieren"
 
@@ -906,9 +952,6 @@ msgstr "Synchronisieren"
 msgid "Notebooks"
 msgstr "Notizbücher"
 
-msgid "Tags"
-msgstr "Markierungen"
-
 msgid "Searches"
 msgstr "Suchen"
 
@@ -936,6 +979,9 @@ msgstr "OneDrive"
 msgid "OneDrive Dev (For testing only)"
 msgstr "OneDrive Dev (Nur für Tests)"
 
+msgid "WebDAV (Beta)"
+msgstr ""
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr "Unbekanntes Log Level: %s"
@@ -1095,6 +1141,9 @@ msgstr ""
 msgid "When creating a new note:"
 msgstr "Erstellt eine neue Notiz."
 
+msgid "Show tray icon"
+msgstr ""
+
 msgid "Set application zoom percentage"
 msgstr "Einstellen des Anwendungszooms"
 
@@ -1149,6 +1198,18 @@ msgstr "Nexcloud Benutzername"
 msgid "Nexcloud password"
 msgstr "Nexcloud Passwort"
 
+#, fuzzy
+msgid "WebDAV URL"
+msgstr "Nexcloud WebDAV URL"
+
+#, fuzzy
+msgid "WebDAV username"
+msgstr "Nexcloud Benutzername"
+
+#, fuzzy
+msgid "WebDAV password"
+msgstr "Setze ein Passwort"
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr "Ungültiger Optionswert: \"%s\". Mögliche Werte sind: %s."
@@ -1265,6 +1326,12 @@ msgstr "Dieses Notizbuch konnte nicht gespeichert werden: %s"
 msgid "Edit notebook"
 msgstr "Notizbuch bearbeiten"
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr "Diese Notiz wurde verändert:"
 

CliClient/locales/en_GB.po

@@ -599,6 +599,13 @@ msgstr ""
 msgid "%s %s (%s, %s)"
 msgstr ""
 
+#, javascript-format
+msgid "Open %s"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
 msgid "OK"
 msgstr ""
 
@@ -608,21 +615,26 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-msgid "An update is available, do you want to update now?"
+#, javascript-format
+msgid ""
+"Release notes:\n"
+"\n"
+"%s"
 msgstr ""
 
-#, javascript-format
-msgid "Could not download the update: %s"
+msgid "An update is available, do you want to download it now?"
 msgstr ""
 
-msgid "Current version is up-to-date."
+msgid "Yes"
 msgstr ""
 
-msgid "New version downloaded - application will quit now and update..."
+msgid "No"
 msgstr ""
 
-#, javascript-format
-msgid "Could not install the update: %s"
+msgid "Current version is up-to-date."
+msgstr ""
+
+msgid "Check synchronisation configuration"
 msgstr ""
 
 #, javascript-format
@@ -681,6 +693,15 @@ msgid ""
 "how the notes or notebooks were originally encrypted."
 msgstr ""
 
+msgid "Missing Master Keys"
+msgstr ""
+
+msgid ""
+"The master keys with these IDs are used to encrypt some of your items, "
+"however the application does not currently have access to them. It is likely "
+"they will eventually be downloaded via synchronisation."
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -750,16 +771,35 @@ msgid ""
 "There is currently no notebook. Create one by clicking on \"New notebook\"."
 msgstr ""
 
+msgid "Open..."
+msgstr ""
+
+msgid "Save as..."
+msgstr ""
+
 #, javascript-format
 msgid "Unsupported link or message: %s"
 msgstr ""
 
 msgid "Attach file"
 msgstr ""
 
+msgid "Tags"
+msgstr ""
+
 msgid "Set alarm"
 msgstr ""
 
+msgid "to-do"
+msgstr ""
+
+msgid "note"
+msgstr ""
+
+#, javascript-format
+msgid "Creating new %s..."
+msgstr ""
+
 msgid "Refresh"
 msgstr ""
 
@@ -796,9 +836,6 @@ msgstr ""
 msgid "Notebooks"
 msgstr ""
 
-msgid "Tags"
-msgstr ""
-
 msgid "Searches"
 msgstr ""
 
@@ -825,6 +862,9 @@ msgstr ""
 msgid "OneDrive Dev (For testing only)"
 msgstr ""
 
+msgid "WebDAV (Beta)"
+msgstr ""
+
 #, javascript-format
 msgid "Unknown log level: %s"
 msgstr ""
@@ -969,6 +1009,9 @@ msgstr ""
 msgid "When creating a new note:"
 msgstr ""
 
+msgid "Show tray icon"
+msgstr ""
+
 msgid "Set application zoom percentage"
 msgstr ""
 
@@ -1018,6 +1061,15 @@ msgstr ""
 msgid "Nexcloud password"
 msgstr ""
 
+msgid "WebDAV URL"
+msgstr ""
+
+msgid "WebDAV username"
+msgstr ""
+
+msgid "WebDAV password"
+msgstr ""
+
 #, javascript-format
 msgid "Invalid option value: \"%s\". Possible values are: %s."
 msgstr ""
@@ -1129,6 +1181,12 @@ msgstr ""
 msgid "Edit notebook"
 msgstr ""
 
+msgid "Show all"
+msgstr ""
+
+msgid "Errors only"
+msgstr ""
+
 msgid "This note has been modified:"
 msgstr ""