diff --git a/Befund.xcodeproj/project.pbxproj b/Befund.xcodeproj/project.pbxproj
index 7057999..64b5f72 100644
--- a/Befund.xcodeproj/project.pbxproj
+++ b/Befund.xcodeproj/project.pbxproj
@@ -922,8 +922,9 @@
 		69B7A137281C59F200A249C6 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon2Go;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_ENTITLEMENTS = Befund/Befund.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development: Artur Savitskiy (J576JNSQ97)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Limetec Biotechnologies GmbH (W86CN3N7WD)";
@@ -963,8 +964,9 @@
 		69B7A138281C59F200A249C6 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon2Go;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_ENTITLEMENTS = Befund/Befund.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development: Artur Savitskiy (J576JNSQ97)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Limetec Biotechnologies GmbH (W86CN3N7WD)";
diff --git a/Befund/.DS_Store b/Befund/.DS_Store
index 84ada17..1b867f9 100644
Binary files a/Befund/.DS_Store and b/Befund/.DS_Store differ
diff --git a/Befund/Core/Lang/EN.swift b/Befund/Core/Lang/EN.swift
index 514cabf..45c1827 100644
--- a/Befund/Core/Lang/EN.swift
+++ b/Befund/Core/Lang/EN.swift
@@ -22,54 +22,61 @@ extension Core.Lang
             //TODO: word have to be translated in english
             
             //MARK: LABELS
-            result.setValue("My results", forKey: "LBL_MY_RESULTS")
-            result.setValue("My result", forKey: "BTN_MY_RESULT")
-            result.setValue("ZIP", forKey: "LBL_ZIP")
-            result.setValue("Birthday", forKey: "LBL_BIRTHDAY")
-            result.setValue("Sample Id", forKey: "LBL_SAMPLEID")
+            result.setValue("My findings", forKey: "LBL_MY_RESULTS")
+            result.setValue("My findings", forKey: "BTN_MY_RESULT")
+            result.setValue("ZIP CODE", forKey: "LBL_ZIP")
+            result.setValue("Date Born", forKey: "LBL_BIRTHDAY")
+            result.setValue("Order number", forKey: "LBL_SAMPLEID")
             result.setValue("Password", forKey: "LBL_PASSWORD")
             result.setValue("Confirm Password", forKey: "LBL_PASSWORD_CONFIRM")
             result.setValue("Pending", forKey: "LBL_PENDING")
-            result.setValue("Ready to Download", forKey: "LBL_READY_TO_DOWNLOAD")
+            result.setValue("Ready to download", forKey: "LBL_READY_TO_DOWNLOAD")
+            result.setValue("Wird heruntergeladen", forKey: "LBL_DOWNLOADING")
             result.setValue("Downloaded", forKey: "LBL_ALREADY_DOWNLOAD")
             result.setValue("Rejected", forKey: "LBL_REJECTED")
             result.setValue("Expired", forKey: "LBL_EXPIRED")
-            result.setValue("You currently have no results", forKey: "LBL_NO_RESULTS")
+            result.setValue("You currently have no findings", forKey: "LBL_NO_RESULTS")
             //result.setValue("Old Password", forKey: "LBL_OLD_PASSWORD")
             //result.setValue("Support Code", forKey: "LBL_SUPPORT_CODE")
             result.setValue( "Privacy Policy", forKey: "LBL_PRIVACY_POLICY")
-            result.setValue( "Downloading...", forKey: "LBL_DOWNLOADING")
-            result.setValue( "Select Labor", forKey: "LBL_SELECT_LABOR")
+            //result.setValue( "Loading...", forKey: "LBL_DOWNLOADING")
+            result.setValue( "Select your lab", forKey: "LBL_SELECT_LABOR")
             result.setValue( "MENU", forKey: "LBL_MENU")
-            result.setValue( "Biometrical Authentification", forKey: "LBL_BIOMETRICAL_AUTHENTIFICATION")
+            //result.setValue( "Biometric Authentification", forKey: "LBL_BIOMETRICAL_AUTHENTIFICATION")
             //result.setValue( "Error", forKey: "LBL_ERROR")
-            result.setValue( "PIN", forKey: "LBL_PIN")
+            result.setValue( "Current PIN", forKey: "LBL_PIN")
+            result.setValue( "New PIN", forKey: "LBL_NEW_PIN")
             result.setValue( "New Password", forKey: "LBL_NEW_PASSWORD")
-            result.setValue( "Scan QR-Code", forKey: "LBL_SCAN_QR_CODE")
+            result.setValue( "My patient data", forKey: "LBL_OEGD")
+            result.setValue( "You have not yet entered your patient data. Select the menu below to enter your personal data.", forKey: "LBL_NO_OEGD")
+            result.setValue( "Please click on the QR code icon to scan the QR code.\n\tThis will automatically link your app to the appropriate lab.", forKey: "LBL_SCAN_QR_CODE")
+            result.setValue( "New patient data", forKey: "LBL_NEW_OEGD")
+            result.setValue( "Edit Patient Data", forKey: "LBL_EDIT_OEGD")
             result.setValue( "Title", forKey: "LBL_TITLE")
-            result.setValue( "Surname", forKey: "LBL_FIRSTNAME")
-            result.setValue( "Name", forKey: "LBL_LASTNAME")
+            result.setValue( "First Name", forKey: "LBL_FIRSTNAME")
+            result.setValue( "Last Name", forKey: "LBL_LASTNAME")
             result.setValue( "Prefix", forKey: "LBL_NAME_PREFIX")
-            result.setValue( "Additional Names", forKey: "LBL_ADDITION_NAME")
+            result.setValue( "Additional Name", forKey: "LBL_ADDITION_NAME")
             result.setValue( "Gender", forKey: "LBL_GENDER")
             result.setValue( "Street", forKey: "LBL_STREET")
-            result.setValue( "Nr.", forKey: "LBL_STREET_NUMBER")
+            result.setValue( "HouseNo.", forKey: "LBL_STREET_NUMBER")
             result.setValue( "City", forKey: "LBL_CITY")
             result.setValue( "Male", forKey: "LBL_GENDER_M")
             result.setValue( "Female", forKey: "LBL_GENDER_W")
-            result.setValue( "Diverse", forKey: "LBL_GENDER_D")
+            result.setValue( "Various", forKey: "LBL_GENDER_D")
             result.setValue( "Unknown", forKey: "LBL_GENDER_X")
             result.setValue( "Phone", forKey: "LBL_TELEFON")
-            result.setValue( "CWA Policy", forKey: "LBL_CWA_POLICY")
+            result.setValue( "CWA Consent Form", forKey: "LBL_CWA_POLICY")
+            result.setValue( "Edit Patient Data", forKey: "LBL_EDIT_OEGD")
             result.setValue( "Language", forKey: "LBL_LANGUAGE")
             result.setValue( "Current Password", forKey: "LBL_CURRENT_PASSWORD")
-            //result.setValue( "Settings", forKey: "LBL_SETTINGS")
-            result.setValue( "Your Labor", forKey: "LBL_YOUR_LABOR")
-            result.setValue( "Connected", forKey: "LBL_CONNECTED")
-            result.setValue( "Disconnected", forKey: "LBL_DISCONNECTED")
-            
+            //result.setValue( "Einstellungen", forKey: "LBL_SETTINGS")
+            result.setValue( "Your Lab", forKey: "LBL_YOUR_LABOR")
+            result.setValue( "Connection successful", forKey: "LBL_CONNECTED")
+            result.setValue( "Connection not successful", forKey: "LBL_DISCONNECTED")
+
             //MARK: BUTTONS
-            //result.setValue("New Result", forKey: "BTN_NEW_RESULTS")
+            //result.setValue("New findings", forKey: "BTN_NEW_RESULTS")
             result.setValue("Add", forKey: "BTN_ADD")
             result.setValue("Register", forKey: "BTN_REGISTER")
             result.setValue("Next", forKey: "BTN_NEXT")
@@ -78,100 +85,141 @@ extension Core.Lang
             result.setValue("Back", forKey: "BTN_BACK")
             result.setValue("Decrypt", forKey: "BTN_ENCRYPT")
             result.setValue("Delete", forKey: "BTN_DELETE")
-            //result.setValue("Accept", forKey: "BTN_TAKE_OVER")
+            //result.setValue("take over", forKey: "BTN_TAKE_OVER")
             
             result.setValue("Settings", forKey: "BTN_SETTINGS")
             result.setValue("Change Password", forKey: "BTN_CHANGE_PASSWORD")
+            //result.setValue("Capture patient data", forKey: "BTN_OEGD")
             result.setValue("Support", forKey: "BTN_SUPPORT")
             result.setValue("Close", forKey: "BTN_CLOSE")
             result.setValue("OK", forKey: "BTN_OK")
             result.setValue("FAQ", forKey: "BTN_FAQ")
 
-            result.setValue( "I accept the privacy policy", forKey: "BTN_ACCEPT_PRIVACY_POLICY")
+            result.setValue( "I accept the terms and conditions and the privacy policy", forKey: "BTN_ACCEPT_PRIVACY_POLICY")
             //result.setValue( "Select", forKey: "BTN_SELECT")
             result.setValue( "Login", forKey: "BTN_LOGIN")
-            result.setValue( "Forgot password", forKey: "BTN_FORGOT")
+            result.setValue( "Forget", forKey: "BTN_FORGOT")
             result.setValue( "Edit", forKey: "BTN_EDIT")
             result.setValue( "Change", forKey: "BTN_CHANGE")
             result.setValue( "Request PIN", forKey: "BTN_PIN_REQUEST")
             result.setValue( "Print", forKey: "BTN_PRINT")
-            result.setValue( "Share", forKey: "BTN_FILE_SHARE")
+            result.setValue( "File share", forKey: "BTN_FILE_SHARE")
             //result.setValue( "Create", forKey: "BTN_CREATE")
-            result.setValue( "Accept CWA Policy", forKey: "BTN_ACCEPT_CWA_POLICY")
+            result.setValue( "CWA Consent", forKey: "BTN_ACCEPT_CWA_POLICY")
             result.setValue( "No", forKey: "BTN_NO")
             result.setValue( "Yes", forKey: "BTN_YES")
             //result.setValue( "Save", forKey: "BTN_SAVE")
-            result.setValue( "Send", forKey: "BTN_SEND")
+            result.setValue( "Submit", forKey: "BTN_SEND")
             result.setValue( "Support", forKey: "LBL_SUPPORT")
             result.setValue( "E-Mail", forKey: "LBL_EMAIL")
             //result.setValue( "Text", forKey: "LBL_TEXT")
             result.setValue( "Information", forKey: "LBL_SUPPORT_TOPIC_INFO")
-            result.setValue( "Problem", forKey: "LBL_SUPPORT_TOPIC_TROUBLE")
+            result.setValue( "Malfunction", forKey: "LBL_SUPPORT_TOPIC_TROUBLE")
             result.setValue( "Delete Account", forKey: "LBL_SUPPORT_TOPIC_ACCOUNT_DELETE")
-
-            result.setValue("Submitting a report does not replace a conversation with the doctor.", forKey: "LBL_BEFUND_HINWEIS")
+            result.setValue("App Notifications", forKey: "LBL_PUSH_NOTIFICATION_EXPLAIN_HEADER")
+            
+            //result.setValue("reference number", forKey: "LBL_REFERENCE_NUMBER")
+            
+            result.setValue("Please select", forKey:"LBL_PLEASE_SELECT")
+            
+            result.setValue("Submitting a report does not replace a conversation with your doctor.", forKey: "LBL_BEFUND_HINWEIS")
 
             //MARK: ERRORS
-            result.setValue("Bitte geben Sie die PLZ Ihres Wohnorts ein", forKey: "ERROR_ENTER_ZIP")
-            result.setValue("Bitte geben Sie Ihr Geburtsdatum ein", forKey: "ERROR_ENTER_BIRTHDAY")
-            result.setValue("Bitte geben Sie eine Auftragsnummer ein", forKey: "ERROR_ENTER_SAMPLEID")
-            result.setValue("Bitte geben Sie Ihr persönliches Kennwort ein", forKey: "ERROR_ENTER_PASSWORD")
-            result.setValue("Leider ist Ihr Kennwort nicht stark genug(Min. 8 Zeichen, 1x Großbuchstabe, 1x Kleinbuchstabe, 1x Ziffer und 1x Sonderzeichen)", forKey: "ERROR_ENTER_STRONG_PASSWORD")
-            result.setValue("Bitte bestätigen Sie Ihr Kennwort", forKey: "ERROR_CONFIRM_PASSWORD")
-            result.setValue("Die Passwörter stimmen nicht überein", forKey: "ERROR_PASSWORD_MISMATCH")
-            result.setValue("Die Daten konnten auf dem Gerät nicht geschrieben werden. Bitte prüfen Sie, ob die Berechtigung zum Datenschreiben erlaubt ist", forKey: "ERROR_COULD_NOT_SAVE")
-            result.setValue("Leider Ihr Gerät unterstützt keine Verschlüsselung und kann für unsere Applikation nicht verwendet werden", forKey: "ERROR_ENCRYPTION_NOT_SUPPORTED")
-            result.setValue("Leider ist aktuell der Server nicht erreichbar. Bitte versuchen Sie es später erneut", forKey: "ERROR_SERVER_NOT_REACHABLE")
-            result.setValue("Bitte geben Sie eine gültige PLZ ein", forKey: "ERROR_ENTER_VALID_ZIP")
-            result.setValue("Bitte geben Sie ein gültiges Geburtsdatum ein", forKey: "ERROR_ENTER_VALID_BIRTHDAY")
-            result.setValue("Bitte geben Sie eine gültige Auftragsnummer ein", forKey: "ERROR_ENTER_VALID_SAMPLEID")
-            result.setValue("Die Antwort vom Server konnte nicht validiert werden. Bitte versuchen Sie es später erneut", forKey: "ERROR_INVALID_RESPONSE")
-            //result.setValue("Der Sicherheitsschlüssel konnte mit dem Server nicht ausgetauscht werden", forKey: "ERROR_KEYS_COULD_NOT_EXCHANGED")
-            result.setValue("Leider konnte Ihre Anfrage für diesen Auftrag nicht registriert werden", forKey: "ERROR_COULD_NOT_REGISTER_PGS")
-            result.setValue("Sie haben die Anzahl der maximalen zulässigen öffenen Anfragen überschritten. (Max. 10 öffene Anfragen erlaubt)", forKey: "ERROR_MAX_OPENED_REQUEST_LIMIT")
-            result.setValue("Die von Ihnen eingegebene Auftragsnummer wurde bereits auf einem anderen Gerät registriert", forKey: "ERROR_ALREADY_SUBSCRIBTED")
-            result.setValue("Sie haben in letzter Zeit zu viele Anfragen gesendet. Bitte warten Sie und versuchen Sie es später erneut", forKey: "ERROR_TOO_MANY_REQUESTS")
-            result.setValue("Das eingegebene Passwort ist ungültig", forKey: "ERROR_INVALID_PASSWORD")
-            result.setValue("Der Befund konnte leider nicht heruntergeladen werden. Bitte versuchen Sie es später erneut", forKey: "ERROR_DOWNLOAD_NOT_FOUND")
-            result.setValue("Der Befund konnte leider nicht entschlüsselt werden. Bitte versuchen Sie es später erneut", forKey: "ERROR_COULD_NOT_DECRYPT")
-            result.setValue("Der Befund konnte nicht gespeichert werden", forKey: "ERROR_COULD_NOT_SAVE_ENCRYPTED")
-            result.setValue("Der Befund konnte nicht gelesen werden", forKey: "ERROR_ENCRYPTED_FILE_NOT_FOUND")
-            result.setValue("Please enter your previous password", forKey: "ERROR_ENTER_OLD_PASSWORD")
-            //result.setValue("Leider konnte der Befund nicht übernommen werden. Bitte wenden Sie sich an unseren Support", forKey: "ERROR_NOT_AUTHORIZED_TO_TAKE_OVER")
-            //result.setValue("Bitte wenden Sie sich an unseren Support, um diesen Befund übernehmen zu können", forKey: "ERROR_SUPPORT_CODE_NEEDED")
-            //result.setValue("Please enter a Support Code. If you don't have a Support Code, please contact our hotline.", forKey: "ERROR_ENTER_SUPPORT_CODE_PASSWORD")
-            
-            result.setValue("Um unsere Datenschutzerklärung lesen und akzeptieren zu können müssen Sie mit dem Internet verbunden sein", forKey: "ERROR_PRIVACY_POLICY_NEEDS_CONNECTION")
+            result.setValue("Please enter the zip code of your residence", forKey: "ERROR_ENTER_ZIP")
+            result.setValue("Please enter your date of birth", forKey: "ERROR_ENTER_BIRTHDAY")
+            result.setValue("Please enter an order number", forKey: "ERROR_ENTER_SAMPLEID")
+            result.setValue("Please enter your personal password", forKey: "ERROR_ENTER_PASSWORD")
+            result.setValue("The password must contain min. 8 characters, including min. 1 uppercase letter, 1 lowercase letter, 1 digit and 1 special character.", forKey: "ERROR_ENTER_STRONG_PASSWORD")
+            result.setValue("Please confirm your password", forKey: "ERROR_CONFIRM_PASSWORD")
+            result.setValue("The passwords do not match", forKey: "ERROR_PASSWORD_MISMATCH")
+            result.setValue("The data could not be written on the device. Please check if the permission to write data is allowed", forKey: "ERROR_COULD_NOT_SAVE")
+            result.setValue("Unfortunately, your device does not support encryption and cannot be used for this application", forKey: "ERROR_ENCRYPTION_NOT_SUPPORTED")
+            //result.setValue("Unfortunately, currently the server is not available. Please try again later", forKey: "ERROR_SERVER_NOT_REACHABLE")
+            result.setValue("Please enter a valid zip code", forKey: "ERROR_ENTER_VALID_ZIP")
+            result.setValue("Please enter a valid date of birth", forKey: "ERROR_ENTER_VALID_BIRTHDAY")
+            result.setValue("Please enter a valid order number", forKey: "ERROR_ENTER_VALID_SAMPLEID")
+            result.setValue("The response from the server could not be validated. Please try again later", forKey: "ERROR_INVALID_RESPONSE")
+            result.setValue("The security key could not be exchanged with the server", forKey: "ERROR_KEYS_COULD_NOT_EXCHANGED")
+            result.setValue("Unfortunately, your request could not be registered for this order", forKey: "ERROR_COULD_NOT_REGISTER_PGS")
+            result.setValue("You have exceeded the maximum number of open requests allowed. (Max. 10 open requests allowed)", forKey: "ERROR_MAX_OPENED_REQUEST_LIMIT")
+            result.setValue("The order number you entered has already been registered on another device. If the app has been newly installed, the problem may also occur. In this case, please contact support (see menu) to get your finding.", forKey: "ERROR_ALREADY_SUBSCRIBTED")
+            result.setValue("You have sent too many requests recently. Please wait and try again later", forKey: "ERROR_TOO_MANY_REQUESTS")
+            result.setValue("The password you entered is invalid.", forKey: "ERROR_INVALID_PASSWORD")
+            result.setValue("Sorry, the finding could not be downloaded. Please try again later.", forKey: "ERROR_DOWNLOAD_NOT_FOUND")
+            result.setValue("Sorry, the finding could not be decrypted. Please try again later.", forKey: "ERROR_COULD_NOT_DECRYPT")
+            result.setValue("The finding could not be saved.", forKey: "ERROR_COULD_NOT_SAVE_ENCRYPTED")
+            result.setValue("The finding could not be read.", forKey: "ERROR_ENCRYPTED_FILE_NOT_FOUND")
+            result.setValue("Please enter the old password", forKey: "ERROR_ENTER_OLD_PASSWORD")
 
+            result.setValue( "Please read our terms and conditions and privacy policy carefully, as they must be accepted when using our application", forKey: "ERROR_ACCEPT_PRIVACY_POLICY")
+
+            result.setValue( "Biometric authentication could not be activated", forKey: "ERROR_BIOMETRICAL_AUTHENTICATION_COULD_NOT_ACTIVATED")
+            result.setValue( "Please enter a PIN", forKey: "ERROR_ENTER_PIN")
+            result.setValue( "PIN must consist of 5 digits", forKey: "ERROR_PIN_LENGTH")
+            result.setValue( "Please enter your PIN", forKey: "ERROR_ENTER_YOUR_PIN")
+            result.setValue( "The PIN you entered is not valid", forKey: "ERROR_INVALID_PASSWORD_RESET_PIN")
+            result.setValue( "PIN could not be received from the server", forKey: "ERROR_COULD_NOT_GET_PIN")
+            //result.setValue( "Password could not be changed", forKey: "ERROR_COULD_NOT_CHANGE_PASSWORD")
+            result.setValue( "For an OEGD slip, we need your consent form", forKey: "ERROR_ACCEPT_CWA_POLICY")
+            result.setValue( "OEGD could not be saved", forKey: "ERROR_COULD_NOT_SAVE_OEGD")
+            result.setValue( "Please enter your first name", forKey: "ERROR_ENTER_FIRSTNAME")
+            result.setValue( "Please enter your last name", forKey: "ERROR_ENTER_LASTNAME")
+            result.setValue( "Please enter your gender", forKey: "ERROR_ENTER_GENDER")
+            result.setValue( "Please enter the street", forKey: "ERROR_ENTER_STREET")
+            result.setValue( "Please enter the house no", forKey: "ERROR_ENTER_STREET_NUMBER")
+            result.setValue( "Please enter your city of residence", forKey: "ERROR_ENTER_CITY")
+
+            result.setValue( "Please enter your email", forKey: "ERROR_ENTER_EMAIL")
+            result.setValue( "Please select a subject", forKey: "ERROR_ENTER_TOPIC")
+            result.setValue( "Please enter the text", forKey: "ERROR_ENTER_TEXT")
             
-            result.setValue("Biometrical authentication is necessary to request your PIN", forKey: "MSG_TOUCHID_INFO")
-            
+            result.setValue("To read and accept our privacy policy you must be connected to the internet", forKey: "ERROR_PRIVACY_POLICY_NEEDS_CONNECTION")
+
             //MARK: MESSAGES
-            result.setValue("The number you've entered is already contained in your list.", forKey: "MSG_PGS_ALREADY_EXISTS")
-            result.setValue("Refreshing...", forKey: "MSG_DATA_REFRESHING")
-            result.setValue("Vielen Dank. Ein Status zu Ihrem Befund ist bereits vorhanden", forKey: "MSG_PGS_ALREADY_AVAILABLE")
-            //result.setValue("Please enter the password from your previous device.", forKey: "MSG_ENTER_OLD_PASSWORD")
-            //result.setValue("Your result was successfully transferred from your old device", forKey: "MSG_PGS_SUCCESSFULLY_OVER_TOOK")
-            result.setValue("Thank you, your request has been successfully registered. We will notify you of a new status for your finding.", forKey: "MSG_PGS_SUCCESSFULLY_CREATED")
- 
-            result.setValue("Account deleted successful", forKey: "MSG_ACCOUNT_SUCCESSFULLY_DELETED")
-            result.setValue("Your request was sent successfully", forKey: "MSG_SUPPORT_SUCCESSFULLY_SENT")
-            result.setValue("Account could not be deleted, please try again later", forKey: "MSG_ACCOUNT_COULD_NOT_DELETED")
-            result.setValue("Request could not be sent", forKey: "MSG_SUPPORT_COULD_NOT_SEND")
+            result.setValue("The order number you entered already exists in your list.", forKey: "MSG_PGS_ALREADY_EXISTS")
+            result.setValue("There is currently no finding. You will be notified via push message as soon as your findings are available.", forKey: "MSG_PGS_RESPONSE_PENDING")
+            result.setValue("Thank you, your request has been successfully registered. We will notify you about a new status on your finding", forKey: "MSG_PGS_SUCCESSFULLY_CREATED")
+            result.setValue("Data is being updated...", forKey: "MSG_DATA_REFRESHING")
+            result.setValue("Thank you. A status to your finding is already available", forKey: "MSG_PGS_ALREADY_AVAILABLE")
+            //result.setValue("Please enter the password from your old device", forKey: "MSG_ENTER_OLD_PASSWORD")
+            //result.setValue("The finding was successfully transferred from your old device", forKey: "MSG_PGS_SUCCESSFULLY_OVER_TOOK")
+            result.setValue( "You are not registered yet", forKey: "MSG_YOU_ARE_NOT_REGISTERED")
+            result.setValue( "Your password has been successfully changed. The current PIN has lost its validity for security reasons, the new PIN is [PIN]", forKey: "MSG_PASSWORD_HAS_BEEN_CHANGED")
+            result.setValue( "Do you really want to delete the selected entry([ITEM])?", forKey: "MSG_SURE_WANT_DELETE")
+            result.setValue( "Your password has been successfully changed. The current PIN has lost its validity for security reasons, the new PIN is [PIN]", forKey: "MSG_PASSWORD_HAS_BEEN_CHANGED")
             
-            result.setValue("Aktuell führen wir Wartungsarbeit durch. Bitte beachten Sie, dass unsere App nur eingeschränkt zur Verfügung steht.", forKey: "MSG_MAINTENANCE")
+            result.setValue( "Your previous PIN has been successfully requested. You can now assign a new PIN and password.", forKey: "PIN_HAS_BEEN_REQUESTED")
 
-            result.setValue("Your device does not support scanning a code from an item. Please use a device with a camera.", forKey: "MSG_SCAN_NOT_SUPPORTED")
+            result.setValue("Your account has been successfully deleted", forKey: "MSG_ACCOUNT_SUCCESSFULLY_DELETED")
+            result.setValue("Thank you, your request has been sent successfully", forKey: "MSG_SUPPORT_SUCCESSFULLY_SENT")
+            result.setValue("Account could not be deleted. Please try again later", forKey: "MSG_ACCOUNT_COULD_NOT_DELETED")
+            result.setValue("Message could not be sent.", forKey: "MSG_SUPPORT_COULD_NOT_SEND")
+            
+            result.setValue("Thank you, your request is now being processed. We will notify you of a new status on your finding. (Please note that the app needs permission to send you messages to do this)", forKey: "MSG_PGS_SUCCESSFULLY_CREATED")
+            
+            result.setValue("In order for you to be notified directly when your finding is available, it is important that this app can send you push messages.", forKey: "MSG_PUSH_NOTIFICATION_EXPLAIN_TEXT")
+            result.setValue("Biometric data is necessary to request the PIN", forKey: "MSG_TOUCHID_INFO")
+            
+            result.setValue("Currently we are performing maintenance work. Please note that our app is only available on a limited basis.", forKey: "MSG_MAINTENANCE")
+            
+            result.setValue("No order could be found for the information you provided. Please check your information.", forKey: "MSG_REQUESTED_RESULTS_NOT_FOUND")
+            result.setValue("Your findings could not be clearly assigned in the laboratory so far. Please check the information you have provided. If you continue to receive this result despite correct information, please contact support.", forKey: "MSG_REQUESTED_RESULTS_REJECTED")
+            
+            result.setValue("Privacy Policy", forKey: "LBL_PRIVACY_POLICY")
+            result.setValue("When visiting our website, selected.", forKey: "PRIVATE_POLICY_TEXT")
+            result.setValue("When visiting our website, selected.", forKey: "CWA_POLICY_TEXT")
+            
+            result.setValue("Your device does not allow QR code scanning in this app. Please enable the use of the camera in your settings and use a device with a working camera.", forKey: "MSG_SCAN_NOT_SUPPORTED")
             result.setValue("Scanning not supported", forKey: "LBL_SCAN_NOT_SUPPORTED")
 
-            result.setValue("<html><h1>Application must be closed.</h1></html>", forKey: "APP_MUST_BE_CLOSED")
-            result.setValue("<html><h1>Internet connection is needed. No AGB.</h1></html>", forKey: "NO_AGB_AVAILABLE")
-            result.setValue("<html><h1>Internet connection is needed. No FAQ.</h1></html>", forKey: "NO_FAQ_AVAILABLE")
-
             result.setValue("https://www.limbachgruppe.com/fileadmin/downloads/pba-data-protection.html", forKey: "AGB_POLICY_LINK")
             
             result.setValue("https://www.limbachgruppe.com/fileadmin/downloads/098235490.html", forKey: "FAQ_LINK")
 
+            result.setValue("<html><h1>Application must be closed.</h1></html>", forKey: "APP_MUST_BE_CLOSED")
+            result.setValue("<html><h1>Internet connection is required. No T&C.</h1></html>", forKey: "NO_AGB_AVAILABLE")
+            result.setValue("<html><h1>nternet connection is required. No FAQ.</h1></html>", forKey: "NO_FAQ_AVAILABLE")
+
             return result
         }
     }