4 files changed, 91 insertions, 78 deletions

diff --git a/src/i18n/messages/src/components/layout/Sidebar.json b/src/i18n/messages/src/components/layout/Sidebar.json
index d67adc96e..837dc54bc 100644
--- a/src/i18n/messages/src/components/layout/Sidebar.json
+++ b/src/i18n/messages/src/components/layout/Sidebar.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Settings",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 13,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 16,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Add new service",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 17,
+      "line": 19,
       "column": 17
     },
     "end": {
-      "line": 20,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Disable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 21,
+      "line": 23,
       "column": 8
     },
     "end": {
-      "line": 24,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable notifications & audio",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 25,
+      "line": 27,
       "column": 10
     },
     "end": {
-      "line": 28,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Open workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 29,
+      "line": 31,
       "column": 23
     },
     "end": {
-      "line": 32,
+      "line": 34,
       "column": 3
     }
   },
@@ -69,11 +69,37 @@
     "defaultMessage": "!!!Close workspace drawer",
     "file": "src/components/layout/Sidebar.js",
     "start": {
-      "line": 33,
+      "line": 35,
       "column": 24
     },
     "end": {
-      "line": 36,
+      "line": 38,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.openTodosDrawer",
+    "defaultMessage": "!!!Open Franz Todos",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 39,
+      "column": 19
+    },
+    "end": {
+      "line": 42,
+      "column": 3
+    }
+  },
+  {
+    "id": "sidebar.closeTodosDrawer",
+    "defaultMessage": "!!!Close Franz Todos",
+    "file": "src/components/layout/Sidebar.js",
+    "start": {
+      "line": 43,
+      "column": 20
+    },
+    "end": {
+      "line": 46,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index d50389066..d0a243ec0 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "settings.app.form.autoLaunchOnStart",
-    "defaultMessage": "!!!Launch Ferdi on start",
+    "defaultMessage": "!!!Launch Franz on start",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 26,
@@ -27,7 +27,7 @@
   },
   {
     "id": "settings.app.form.runInBackground",
-    "defaultMessage": "!!!Keep Ferdi in background when closing the window",
+    "defaultMessage": "!!!Keep Franz in background when closing the window",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 34,
@@ -40,7 +40,7 @@
   },
   {
     "id": "settings.app.form.enableSystemTray",
-    "defaultMessage": "!!!Show Ferdi in system tray",
+    "defaultMessage": "!!!Show Franz in system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 38,
@@ -53,7 +53,7 @@
   },
   {
     "id": "settings.app.form.minimizeToSystemTray",
-    "defaultMessage": "!!!Minimize Ferdi to system tray",
+    "defaultMessage": "!!!Minimize Franz to system tray",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 42,
@@ -65,12 +65,12 @@
     }
   },
   {
-    "id": "settings.app.form.privateNotifications",
-    "defaultMessage": "!!!Don't show message content in notifications",
+    "id": "settings.app.form.language",
+    "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 46,
-      "column": 24
+      "column": 12
     },
     "end": {
       "line": 49,
@@ -78,12 +78,12 @@
     }
   },
   {
-    "id": "settings.app.form.server",
-    "defaultMessage": "!!!Server",
+    "id": "settings.app.form.darkMode",
+    "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 50,
-      "column": 10
+      "column": 12
     },
     "end": {
       "line": 53,
@@ -91,12 +91,12 @@
     }
   },
   {
-    "id": "settings.app.form.todoServer",
-    "defaultMessage": "!!!Todo Server",
+    "id": "settings.app.form.showDisabledServices",
+    "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 54,
-      "column": 14
+      "column": 24
     },
     "end": {
       "line": 57,
@@ -104,12 +104,12 @@
     }
   },
   {
-    "id": "settings.app.form.language",
-    "defaultMessage": "!!!Language",
+    "id": "settings.app.form.showMessagesBadgesWhenMuted",
+    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 58,
-      "column": 12
+      "column": 29
     },
     "end": {
       "line": 61,
@@ -117,12 +117,12 @@
     }
   },
   {
-    "id": "settings.app.form.darkMode",
-    "defaultMessage": "!!!Dark Mode",
+    "id": "settings.app.form.enableSpellchecking",
+    "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 62,
-      "column": 12
+      "column": 23
     },
     "end": {
       "line": 65,
@@ -130,12 +130,12 @@
     }
   },
   {
-    "id": "settings.app.form.showDisabledServices",
-    "defaultMessage": "!!!Display disabled services tabs",
+    "id": "settings.app.form.enableGPUAcceleration",
+    "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 66,
-      "column": 24
+      "column": 25
     },
     "end": {
       "line": 69,
@@ -143,12 +143,12 @@
     }
   },
   {
-    "id": "settings.app.form.showMessagesBadgesWhenMuted",
-    "defaultMessage": "!!!Show unread message badge when notifications are disabled",
+    "id": "settings.app.form.beta",
+    "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 70,
-      "column": 29
+      "column": 8
     },
     "end": {
       "line": 73,
@@ -156,12 +156,12 @@
     }
   },
   {
-    "id": "settings.app.form.enableSpellchecking",
-    "defaultMessage": "!!!Enable spell checking",
+    "id": "settings.app.form.enableTodos",
+    "defaultMessage": "!!!Enable Franz Todos",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 74,
-      "column": 23
+      "column": 15
     },
     "end": {
       "line": 77,
@@ -169,42 +169,16 @@
     }
   },
   {
-    "id": "settings.app.form.enableGPUAcceleration",
-    "defaultMessage": "!!!Enable GPU Acceleration",
+    "id": "settings.app.form.keepAllWorkspacesLoaded",
+    "defaultMessage": "!!!Keep all workspaces loaded",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
       "line": 78,
-      "column": 25
+      "column": 27
     },
     "end": {
       "line": 81,
       "column": 3
     }
-  },
-  {
-    "id": "settings.app.form.beta",
-    "defaultMessage": "!!!Include beta versions",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 82,
-      "column": 8
-    },
-    "end": {
-      "line": 85,
-      "column": 3
-    }
-  },
-  {
-    "id": "settings.app.form.enableTodos",
-    "defaultMessage": "!!!Enable Franz Todos",
-    "file": "src/containers/settings/EditSettingsScreen.js",
-    "start": {
-      "line": 86,
-      "column": 15
-    },
-    "end": {
-      "line": 89,
-      "column": 3
-    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json
index 664e8613b..7f230e82a 100644
--- a/src/i18n/messages/src/features/todos/components/TodosWebview.json
+++ b/src/i18n/messages/src/features/todos/components/TodosWebview.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Franz Todos are available to premium users now!",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 20,
+      "line": 15,
       "column": 15
     },
     "end": {
-      "line": 23,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Upgrade Account",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 24,
+      "line": 19,
       "column": 14
     },
     "end": {
-      "line": 27,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Everyone else will have to wait a little longer.",
     "file": "src/features/todos/components/TodosWebview.js",
     "start": {
-      "line": 28,
+      "line": 23,
       "column": 15
     },
     "end": {
-      "line": 31,
+      "line": 26,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json
index aa4973216..26850c5b3 100644
--- a/src/i18n/messages/src/lib/Menu.json
+++ b/src/i18n/messages/src/lib/Menu.json
@@ -313,7 +313,7 @@
   },
   {
     "id": "menu.view.reloadFranz",
-    "defaultMessage": "!!!Reload Ferdi",
+    "defaultMessage": "!!!Reload Franz",
     "file": "src/lib/Menu.js",
     "start": {
       "line": 113,
@@ -404,7 +404,7 @@
   },
   {
     "id": "menu.help.debugInfoCopiedHeadline",
-    "defaultMessage": "!!!Ferdi Debug Information",
+    "defaultMessage": "!!!Franz Debug Information",
     "file": "src/lib/Menu.js",
     "start": {
       "line": 141,
@@ -521,7 +521,7 @@
   },
   {
     "id": "menu.app.about",
-    "defaultMessage": "!!!About Ferdi",
+    "defaultMessage": "!!!About Franz",
     "file": "src/lib/Menu.js",
     "start": {
       "line": 177,
@@ -791,5 +791,18 @@
       "line": 260,
       "column": 3
     }
+  },
+  {
+    "id": "menu.todos.enableTodos",
+    "defaultMessage": "!!!Enable Todos",
+    "file": "src/lib/Menu.js",
+    "start": {
+      "line": 261,
+      "column": 15
+    },
+    "end": {
+      "line": 264,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file