7 files changed, 154 insertions, 100 deletions

diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json
index c8f74a3c0..87e0b5857 100644
--- a/src/i18n/messages/src/components/auth/ChangeServer.json
+++ b/src/i18n/messages/src/components/auth/ChangeServer.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Change server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 9
     },
     "end": {
-      "line": 21,
+      "line": 22,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 22,
+      "line": 23,
       "column": 11
     },
     "end": {
-      "line": 25,
+      "line": 26,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Custom server",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 26,
+      "line": 27,
       "column": 21
     },
     "end": {
-      "line": 29,
+      "line": 30,
       "column": 3
     }
   },
@@ -56,24 +56,11 @@
     "defaultMessage": "!!!Enter a valid URL",
     "file": "src/components/auth/ChangeServer.js",
     "start": {
-      "line": 30,
+      "line": 31,
       "column": 12
     },
     "end": {
-      "line": 33,
-      "column": 3
-    }
-  },
-  {
-    "id": "changeserver.submit",
-    "defaultMessage": "!!!Submit",
-    "file": "src/components/auth/ChangeServer.js",
-    "start": {
       "line": 34,
-      "column": 10
-    },
-    "end": {
-      "line": 37,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/Password.json b/src/i18n/messages/src/components/auth/Password.json
index f335b3acb..336ba42ef 100644
--- a/src/i18n/messages/src/components/auth/Password.json
+++ b/src/i18n/messages/src/components/auth/Password.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Forgot password",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 14,
+      "line": 15,
       "column": 12
     },
     "end": {
-      "line": 17,
+      "line": 18,
       "column": 3
     }
   },
@@ -17,24 +17,11 @@
     "defaultMessage": "!!!Email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 18,
+      "line": 19,
       "column": 14
     },
     "end": {
-      "line": 21,
-      "column": 3
-    }
-  },
-  {
-    "id": "password.submit.label",
-    "defaultMessage": "!!!Submit",
-    "file": "src/components/auth/Password.js",
-    "start": {
       "line": 22,
-      "column": 21
-    },
-    "end": {
-      "line": 25,
       "column": 3
     }
   },
@@ -43,11 +30,11 @@
     "defaultMessage": "!!!Your new password was sent to your email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 26,
+      "line": 23,
       "column": 15
     },
     "end": {
-      "line": 29,
+      "line": 26,
       "column": 3
     }
   },
@@ -56,11 +43,11 @@
     "defaultMessage": "!!!No user affiliated with that email address",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 30,
+      "line": 27,
       "column": 10
     },
     "end": {
-      "line": 33,
+      "line": 30,
       "column": 3
     }
   },
@@ -69,11 +56,11 @@
     "defaultMessage": "!!!Create a free account",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 34,
+      "line": 31,
       "column": 14
     },
     "end": {
-      "line": 37,
+      "line": 34,
       "column": 3
     }
   },
@@ -82,11 +69,11 @@
     "defaultMessage": "!!!Sign in to your account",
     "file": "src/components/auth/Password.js",
     "start": {
-      "line": 38,
+      "line": 35,
       "column": 13
     },
     "end": {
-      "line": 41,
+      "line": 38,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/auth/SetupAssistant.json b/src/i18n/messages/src/components/auth/SetupAssistant.json
index f950228b7..108adab26 100644
--- a/src/i18n/messages/src/components/auth/SetupAssistant.json
+++ b/src/i18n/messages/src/components/auth/SetupAssistant.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Let's get started",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 19,
+      "line": 20,
       "column": 12
     },
     "end": {
-      "line": 22,
+      "line": 23,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Choose from our most used services and get back on top of your messaging now.",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 23,
+      "line": 24,
       "column": 15
     },
     "end": {
-      "line": 27,
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Let's go",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 21
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Invitations sent successfully",
     "file": "src/components/auth/SetupAssistant.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 21
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/services/tabs/TabItem.json b/src/i18n/messages/src/components/services/tabs/TabItem.json
index 92ff6fb14..377808db3 100644
--- a/src/i18n/messages/src/components/services/tabs/TabItem.json
+++ b/src/i18n/messages/src/components/services/tabs/TabItem.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Reload",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 10
     },
     "end": {
-      "line": 23,
+      "line": 24,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Edit",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 24,
+      "line": 25,
       "column": 8
     },
     "end": {
-      "line": 27,
+      "line": 28,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Disable notifications",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 28,
+      "line": 29,
       "column": 24
     },
     "end": {
-      "line": 31,
+      "line": 32,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Enable notifications",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 32,
+      "line": 33,
       "column": 23
     },
     "end": {
-      "line": 35,
+      "line": 36,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Disable audio",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 36,
+      "line": 37,
       "column": 16
     },
     "end": {
-      "line": 39,
+      "line": 40,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!Enable audio",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 40,
+      "line": 41,
       "column": 15
     },
     "end": {
-      "line": 43,
+      "line": 44,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Enable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 44,
+      "line": 45,
       "column": 18
     },
     "end": {
-      "line": 47,
+      "line": 48,
       "column": 3
     }
   },
@@ -95,11 +95,11 @@
     "defaultMessage": "!!!Disable Dark mode",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 48,
+      "line": 49,
       "column": 19
     },
     "end": {
-      "line": 51,
+      "line": 52,
       "column": 3
     }
   },
@@ -108,11 +108,11 @@
     "defaultMessage": "!!!Disable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 52,
+      "line": 53,
       "column": 18
     },
     "end": {
-      "line": 55,
+      "line": 56,
       "column": 3
     }
   },
@@ -121,11 +121,11 @@
     "defaultMessage": "!!!Enable Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 56,
+      "line": 57,
       "column": 17
     },
     "end": {
-      "line": 59,
+      "line": 60,
       "column": 3
     }
   },
@@ -134,11 +134,11 @@
     "defaultMessage": "!!!Hibernate Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 60,
+      "line": 61,
       "column": 20
     },
     "end": {
-      "line": 63,
+      "line": 64,
       "column": 3
     }
   },
@@ -147,11 +147,11 @@
     "defaultMessage": "!!!Wake Up Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 64,
+      "line": 65,
       "column": 17
     },
     "end": {
-      "line": 67,
+      "line": 68,
       "column": 3
     }
   },
@@ -160,11 +160,11 @@
     "defaultMessage": "!!!Delete Service",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 68,
+      "line": 69,
       "column": 17
     },
     "end": {
-      "line": 71,
+      "line": 72,
       "column": 3
     }
   },
@@ -173,11 +173,11 @@
     "defaultMessage": "!!!Do you really want to delete the {serviceName} service?",
     "file": "src/components/services/tabs/TabItem.js",
     "start": {
-      "line": 72,
+      "line": 73,
       "column": 24
     },
     "end": {
-      "line": 76,
+      "line": 77,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/features/basicAuth/Component.json b/src/i18n/messages/src/features/basicAuth/Component.json
new file mode 100644
index 000000000..fea1b0838
--- /dev/null
+++ b/src/i18n/messages/src/features/basicAuth/Component.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "feature.basicAuth.signIn",
+    "defaultMessage": "!!!Sign In",
+    "file": "src/features/basicAuth/Component.js",
+    "start": {
+      "line": 24,
+      "column": 10
+    },
+    "end": {
+      "line": 27,
+      "column": 3
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/i18n/messages/src/features/nightlyBuilds/Component.json b/src/i18n/messages/src/features/nightlyBuilds/Component.json
index 084079635..0b2eab354 100644
--- a/src/i18n/messages/src/features/nightlyBuilds/Component.json
+++ b/src/i18n/messages/src/features/nightlyBuilds/Component.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Nightly Builds",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 16,
+      "line": 17,
       "column": 9
     },
     "end": {
-      "line": 19,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Nightly builds are highly experimental versions of Ferdi that may contain unpolished or uncompleted features. These nightly builds are mainly used by developers to test their newly developed features and how they will perform in the final build. If you don't know what you are doing, we suggest not activating nightly builds.",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 20,
+      "line": 21,
       "column": 8
     },
     "end": {
-      "line": 23,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,24 +30,11 @@
     "defaultMessage": "!!!Activate",
     "file": "src/features/nightlyBuilds/Component.js",
     "start": {
-      "line": 24,
+      "line": 25,
       "column": 12
     },
     "end": {
-      "line": 27,
-      "column": 3
-    }
-  },
-  {
-    "id": "feature.nightlyBuilds.cancel",
-    "defaultMessage": "!!!Cancel",
-    "file": "src/features/nightlyBuilds/Component.js",
-    "start": {
       "line": 28,
-      "column": 10
-    },
-    "end": {
-      "line": 31,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/i18n/globalMessages.json b/src/i18n/messages/src/i18n/globalMessages.json
index ed2bfa092..39c1693d5 100644
--- a/src/i18n/messages/src/i18n/globalMessages.json
+++ b/src/i18n/messages/src/i18n/globalMessages.json
@@ -102,5 +102,83 @@
       "line": 35,
       "column": 3
     }
+  },
+  {
+    "id": "global.yes",
+    "defaultMessage": "!!!Yes",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 36,
+      "column": 7
+    },
+    "end": {
+      "line": 39,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.no",
+    "defaultMessage": "!!!No",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 40,
+      "column": 6
+    },
+    "end": {
+      "line": 43,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.ok",
+    "defaultMessage": "!!!Ok",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 44,
+      "column": 6
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.cancel",
+    "defaultMessage": "!!!Cancel",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 48,
+      "column": 10
+    },
+    "end": {
+      "line": 51,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.save",
+    "defaultMessage": "!!!Save",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 52,
+      "column": 8
+    },
+    "end": {
+      "line": 55,
+      "column": 3
+    }
+  },
+  {
+    "id": "global.submit",
+    "defaultMessage": "!!!Submit",
+    "file": "src/i18n/globalMessages.js",
+    "start": {
+      "line": 56,
+      "column": 10
+    },
+    "end": {
+      "line": 59,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file