Merge branch 'm38'

# Conflicts:
#	docs/backend_api/Note.html
#	docs/frontend_api/NoteShort.html
#	src/services/import/enex.js

src/services/options_init.js

@@ -5,6 +5,7 @@ const appInfo = require('./app_info');
 const utils = require('./utils');
 const log = require('./log');
 const dateUtils = require('./date_utils');
+const keyboardActions = require('./keyboard_actions');
 
 async function initDocumentOptions() {
     await optionService.createOption('documentId', utils.randomSecureToken(16), false);
@@ -87,7 +88,9 @@ const defaultOptions = [
 async function initStartupOptions() {
     const optionsMap = await optionService.getOptionsMap();
 
-    for (const {name, value, isSynced} of defaultOptions) {
+    const allDefaultOptions = defaultOptions.concat(getKeyboardDefaultOptions());
+
+    for (const {name, value, isSynced} of allDefaultOptions) {
         if (!(name in optionsMap)) {
             await optionService.createOption(name, value, isSynced);
 
@@ -96,6 +99,16 @@ async function initStartupOptions() {
     }
 }
 
+function getKeyboardDefaultOptions() {
+    return keyboardActions.KEYBOARD_ACTIONS.map(ka => {
+        return {
+            name: "keyboardShortcuts" + ka.optionName,
+            value: JSON.stringify(ka.defaultShortcuts),
+            isSynced: false
+        };
+    });
+}
+
 module.exports = {
     initDocumentOptions,
     initSyncedOptions,