resolve conflicts

packages/cli/src/Server.ts

@@ -30,7 +30,7 @@
 /* eslint-disable no-await-in-loop */
 
 import express from 'express';
-import { readFileSync } from 'fs';
+import { readFileSync, existsSync } from 'fs';
 import { readFile } from 'fs/promises';
 import _, { cloneDeep } from 'lodash';
 import { dirname as pathDirname, join as pathJoin, resolve as pathResolve } from 'path';

packages/editor-ui/src/plugins/i18n/locales/en.json

@@ -1,15 +1,66 @@
 {
-	"reusableBaseText.cancel": "Cancel",
-	"reusableBaseText.name": "Name",
-	"reusableBaseText.save": "Save",
-	"reusableDynamicText.oauth2.clientId": "Client ID",
-	"reusableDynamicText.oauth2.clientSecret": "Client Secret",
 	"about.aboutN8n": "About n8n",
 	"about.close": "Close",
 	"about.license": "License",
-	"about.n8nVersion": "n8n Version",
 	"about.n8nLicense": "Sustainable Use License",
+	"about.n8nVersion": "n8n Version",
 	"about.sourceCode": "Source Code",
+	"activationModal.butYouCanSeeThem": "but you can see them in the",
+	"activationModal.dontShowAgain": "Don't show again",
+	"activationModal.executionList": "execution list",
+	"activationModal.gotIt": "Got it",
+	"activationModal.ifYouChooseTo": "if you choose to",
+	"activationModal.saveExecutions": "save executions.",
+	"activationModal.theseExecutionsWillNotShowUp": "These executions will not show up immediately in the editor,",
+	"activationModal.workflowActivated": "Workflow activated",
+	"activationModal.yourTriggerWillNowFire": "Your trigger will now fire production executions automatically.",
+	"activationModal.yourTriggersWillNowFire": "Your triggers will now fire production executions automatically.",
+	"activationModal.yourWorkflowWillNowListenForEvents": "Your workflow will now listen for events from {serviceName} and trigger executions.",
+	"activationModal.yourWorkflowWillNowRegularlyCheck": "Your workflow will now regularly check {serviceName} for events and trigger executions for them.",
+	"auth.changePassword": "Change Password",
+	"auth.changePassword.currentPassword": "Current Password",
+	"auth.changePassword.error": "Problem changing the password",
+	"auth.changePassword.missingTokenError": "Missing token",
+	"auth.changePassword.missingUserIdError": "Missing user ID",
+	"auth.changePassword.passwordUpdated": "Password updated",
+	"auth.changePassword.passwordUpdatedMessage": "You can now sign in with your new password",
+	"auth.changePassword.passwordsMustMatchError": "Passwords must match",
+	"auth.changePassword.reenterNewPassword": "Re-enter New Password",
+	"auth.changePassword.tokenValidationError": "Issue validating invite token",
+	"auth.defaultPasswordRequirements": "8+ characters, at least 1 number and 1 capital letter",
+	"auth.email": "Email",
+	"auth.firstName": "First Name",
+	"auth.lastName": "Last Name",
+	"auth.newPassword": "New Password",
+	"auth.password": "Password",
+	"auth.role": "Role",
+	"auth.roles.member": "Member",
+	"auth.roles.owner": "Owner",
+	"auth.setup.confirmOwnerSetup": "Set up owner account?",
+	"auth.setup.confirmOwnerSetupMessage": "To give others access to your <b>{entities}</b>, you’ll need to share these account details with them. Or you can continue as before with no account, by going back and skipping this setup. <a href=\"https://docs.n8n.io/reference/user-management.html\" target=\"_blank\">More info</a>",
+	"auth.setup.createAccount": "Create account",
+	"auth.setup.goBack": "Go back",
+	"auth.setup.next": "Next",
+	"auth.setup.ownerAccountBenefits": "Setting up an owner account allows you to invite others, and prevents people using n8n without an account",
+	"auth.setup.settingUpOwnerError": "Problem setting up owner",
+	"auth.setup.setupConfirmation.concatEntities": "{workflows} and {credentials}",
+	"auth.setup.setupConfirmation.credentialsCount": "{count} credentials",
+	"auth.setup.setupConfirmation.oneCredentialCount": "{count} credential",
+	"auth.setup.setupConfirmation.oneWorkflowCount": "{count} existing workflow",
+	"auth.setup.setupConfirmation.workflowsCount": "{count} existing workflows",
+	"auth.setup.setupOwner": "Set up owner account",
+	"auth.setup.skipOwnerSetupQuestion": "Skip owner account setup?",
+	"auth.setup.skipSetup": "Skip setup",
+	"auth.setup.skipSetupTemporarily": "Skip setup for now",
+	"auth.signin": "Sign in",
+	"auth.signin.error": "Problem logging in",
+	"auth.signout": "Sign out",
+	"auth.signout.error": "Could not sign out",
+	"auth.signup.finishAccountSetup": "Finish account setup",
+	"auth.signup.missingTokenError": "Missing token",
+	"auth.signup.setupYourAccount": "Set up your account",
+	"auth.signup.setupYourAccountError": "Problem setting up your account",
+	"auth.signup.tokenValidationError": "Issue validating invite token",
 	"binaryDataDisplay.backToList": "Back to list",
 	"binaryDataDisplay.backToOverviewPage": "Back to overview page",
 	"binaryDataDisplay.noDataFoundToDisplay": "No data found to display",
@@ -48,8 +99,8 @@
 	"credentialEdit.credentialEdit.connection": "Connection",
 	"credentialEdit.credentialEdit.couldNotFindCredentialOfType": "Could not find credential of type",
 	"credentialEdit.credentialEdit.couldNotFindCredentialWithId": "Could not find credential with ID",
-	"credentialEdit.credentialEdit.details": "Details",
 	"credentialEdit.credentialEdit.delete": "Delete",
+	"credentialEdit.credentialEdit.details": "Details",
 	"credentialEdit.credentialEdit.saving": "Saving",
 	"credentialEdit.credentialEdit.showError.createCredential.title": "Problem creating credential",
 	"credentialEdit.credentialEdit.showError.deleteCredential.title": "Problem deleting credential",
@@ -79,6 +130,7 @@
 	"credentialsList.credentials": "Credentials",
 	"credentialsList.deleteCredential": "Delete Credential",
 	"credentialsList.editCredential": "Edit Credential",
+	"credentialsList.errorLoadingCredentials": "Error loading credentials",
 	"credentialsList.name": "@:reusableBaseText.name",
 	"credentialsList.operations": "Operations",
 	"credentialsList.showError.deleteCredential.title": "Problem deleting credential",
@@ -86,7 +138,6 @@
 	"credentialsList.type": "Type",
 	"credentialsList.updated": "Updated",
 	"credentialsList.yourSavedCredentials": "Your saved credentials",
-	"credentialsList.errorLoadingCredentials": "Error loading credentials",
 	"dataDisplay.needHelp": "Need help?",
 	"dataDisplay.nodeDocumentation": "Node Documentation",
 	"dataDisplay.openDocumentationFor": "Open {nodeTypeDisplayName} documentation",
@@ -100,15 +151,18 @@
 	"duplicateWorkflowDialog.save": "@:reusableBaseText.save",
 	"duplicateWorkflowDialog.showMessage.message": "Please enter a name.",
 	"duplicateWorkflowDialog.showMessage.title": "Name missing",
+	"error": "Error",
+	"error.goBack": "Go back",
+	"error.pageNotFound": "Oops, couldn’t find that",
 	"executionDetails.executionFailed": "Execution failed",
 	"executionDetails.executionId": "Execution ID",
 	"executionDetails.executionWaiting": "Execution waiting",
 	"executionDetails.executionWasSuccessful": "Execution was successful",
-	"executionDetails.openWorkflow": "Open Workflow",
 	"executionDetails.of": "of",
-	"executionDetails.workflow": "workflow",
+	"executionDetails.openWorkflow": "Open Workflow",
 	"executionDetails.readOnly.readOnly": "Read only",
 	"executionDetails.readOnly.youreViewingTheLogOf": "You're viewing the log of a previous execution. You cannot<br />\n\t\tmake changes since this execution already occurred. Make changes<br />\n\t\tto this workflow by clicking on its name on the left.",
+	"executionDetails.workflow": "workflow",
 	"executionsList.allWorkflows": "All Workflows",
 	"executionsList.anyStatus": "Any Status",
 	"executionsList.autoRefresh": "Auto refresh",
@@ -176,6 +230,15 @@
 	"fixedCollectionParameter.deleteItem": "Delete item",
 	"fixedCollectionParameter.moveDown": "Move down",
 	"fixedCollectionParameter.moveUp": "Move up",
+	"forgotPassword": "Forgot my password",
+	"forgotPassword.emailSentIfExists": "We’ve emailed {email} (if there’s a matching account)",
+	"forgotPassword.getRecoveryLink": "Email me a recovery link",
+	"forgotPassword.noSMTPToSendEmailWarning": "Please contact your admin. n8n isn’t set up to send email right now.",
+	"forgotPassword.recoverPassword": "Recover password",
+	"forgotPassword.recoveryEmailSent": "Recovery email sent",
+	"forgotPassword.returnToSignIn": "Back to sign in",
+	"forgotPassword.sendingEmailError": "Problem sending email",
+	"forgotPassword.smtpErrorContactAdministrator": "Please contact your administrator (problem with your SMTP setup)",
 	"genericHelpers.loading": "Loading",
 	"genericHelpers.min": "min",
 	"genericHelpers.sec": "sec",
@@ -225,6 +288,38 @@
 	"multipleParameter.deleteItem": "Delete item",
 	"multipleParameter.moveDown": "Move down",
 	"multipleParameter.moveUp": "Move up",
+	"ndv.title.rename": "Rename",
+	"ndv.title.cancel": "Cancel",
+	"ndv.title.renameNode": "Rename node",
+	"ndv.execute.executeNode": "Execute node",
+	"ndv.execute.executing": "Executing",
+	"ndv.execute.fetchEvent": "Fetch Event",
+	"ndv.execute.listenForEvent": "Listen For Event",
+	"ndv.output.pollEventNodeHint": "Fetch an event to output data",
+	"ndv.output.triggerEventNodeHint": "Listen for an event to output data",
+	"ndv.output": "Output",
+	"ndv.output.runNodeHint": "Execute this node to output data",
+	"ndv.output.executing": "Executing node...",
+	"ndv.output.noOutputData.title": "No output data returned",
+	"ndv.output.noOutputData.message": "n8n stops executing the workflow when a node has no output data. You can change this default behaviour via",
+	"ndv.output.noOutputData.message.settings": "Settings",
+	"ndv.output.noOutputData.message.settingsOption": "> “Always Output Data”.",
+	"ndv.output.noOutputDataInBranch": "No output data in this branch",
+	"ndv.output.tooMuchData.title": "Output data is huge!",
+	"ndv.output.tooMuchData.message": "The node contains {size} MB of data. Displaying it may cause problems. <br /> If you do decide to display it, avoid the JSON view.",
+	"ndv.output.tooMuchData.showDataAnyway": "Show data anyway",
+	"ndv.output.all": "all",
+	"ndv.output.items": "items",
+	"ndv.output.pageSize": "Page Size",
+	"ndv.output.item": "item",
+	"ndv.output.run": "Run",
+	"ndv.output.of": " of ",
+	"ndv.output.branch": "Branch",
+	"ndv.output.emptyOutput": "This output item is empty.",
+	"ndv.output.emptyInput": "This input item is empty. {name} will still execute when it recieves an empty item.",
+	"ndv.output.staleDataWarning": "Node parameters have changed. <br /> Execute node again to refresh output.",
+	"ndv.backToCanvas": "Back to canvas",
+	"ndv.backToCanvas.waitingForTriggerWarning": "Waiting for a Trigger node to execute. Close this view to see the Workflow Canvas.",
 	"noTagsView.readyToOrganizeYourWorkflows": "Ready to organize your workflows?",
 	"noTagsView.withWorkflowTagsYouReFree": "With workflow tags, you're free to create the perfect tagging system for your flows",
 	"node.activateDeactivateNode": "Activate/Deactivate Node",
@@ -238,6 +333,7 @@
 	"node.nodeIsWaitingTill": "Node is waiting until {date} {time}",
 	"node.theNodeIsWaitingIndefinitelyForAnIncomingWebhookCall": "The node is waiting for an incoming webhook call (indefinitely)",
 	"node.waitingForYouToCreateAnEventIn": "Waiting for you to create an event in {nodeType}",
+	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node<br />or drag to connect",
 	"nodeCreator.categoryNames.analytics": "Analytics",
 	"nodeCreator.categoryNames.communication": "Communication",
 	"nodeCreator.categoryNames.coreNodes": "Core Nodes",
@@ -288,7 +384,6 @@
 	"nodeErrorView.stack": "Stack",
 	"nodeErrorView.theErrorCauseIsTooLargeToBeDisplayed": "The error cause is too large to be displayed",
 	"nodeErrorView.time": "Time",
-	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node<br />or drag to connect",
 	"nodeSettings.alwaysOutputData.description": "If active, will output a single, empty item when the output would have been empty. Use to prevent the workflow finishing on this node.",
 	"nodeSettings.alwaysOutputData.displayName": "Always Output Data",
 	"nodeSettings.clickOnTheQuestionMarkIcon": "Click the '?' icon to open this node on n8n.io",
@@ -381,6 +476,8 @@
 	"nodeWebhooks.showMessage.title": "URL copied",
 	"nodeWebhooks.testUrl": "Test URL",
 	"nodeWebhooks.webhookUrls": "Webhook URLs",
+	"openWorkflow.workflowImportError": "Could not import workflow",
+	"openWorkflow.workflowNotFoundError": "Could not find workflow",
 	"parameterInput.addExpression": "Add Expression",
 	"parameterInput.error": "ERROR",
 	"parameterInput.issues": "Issues",
@@ -394,19 +491,26 @@
 	"parameterInput.refreshList": "Refresh List",
 	"parameterInput.removeExpression": "Remove Expression",
 	"parameterInput.resetValue": "Reset Value",
-	"parameterInput.selectDateAndTime": "Select date and time",
 	"parameterInput.select": "Select",
+	"parameterInput.selectDateAndTime": "Select date and time",
 	"parameterInputExpanded.openDocs": "Open docs",
 	"parameterInputExpanded.thisFieldIsRequired": "This field is required",
 	"parameterInputList.delete": "Delete",
 	"parameterInputList.deleteParameter": "Delete Parameter",
 	"parameterInputList.parameterOptions": "Parameter Options",
+	"personalizationModal.automationAgencyOrConsultant": "Automation agency/consultant",
 	"personalizationModal.automationConsulting": "Automation consulting",
+	"personalizationModal.cloudInfrastructure": "Cloud infrastructure",
 	"personalizationModal.continue": "Continue",
+	"personalizationModal.customerIntegrations": "Customer integrations",
+	"personalizationModal.customerSupport": "Customer support",
 	"personalizationModal.customizeN8n": "Customize n8n to you",
+	"personalizationModal.digitalAgencyOrConsultant": "Digital agency/consultant",
 	"personalizationModal.eCommerce": "eCommerce",
+	"personalizationModal.education": "Education",
 	"personalizationModal.errorWhileSubmittingResults": "Error while submitting results",
 	"personalizationModal.executiveTeam": "Executive team",
+	"personalizationModal.financeOrAccounting": "Finance / Accounting",
 	"personalizationModal.financeOrInsurance": "Finance / Insurance",
 	"personalizationModal.getStarted": "Get started",
 	"personalizationModal.government": "Government",
@@ -414,7 +518,6 @@
 	"personalizationModal.howAreYourCodingSkills": "How are your coding skills?",
 	"personalizationModal.howBigIsYourCompany": "How big is your company?",
 	"personalizationModal.hr": "HR",
-	"personalizationModal.it": "IT",
 	"personalizationModal.iCanCodeSomeUsefulThingsBut": "2. I can code some useful things, but I spend a lot of time stuck",
 	"personalizationModal.iCanDoAlmostAnythingIWant": "5. I can do almost anything I want, easily (pro coder)",
 	"personalizationModal.iCanFigureMostThingsOut": "4. I can figure most things out",
@@ -422,60 +525,59 @@
 	"personalizationModal.iKnowEnoughToBeDangerousBut": "3. I know enough to be dangerous, but I'm no expert",
 	"personalizationModal.imNotUsingN8nForWork": "I'm not using n8n for work",
 	"personalizationModal.individualConsumers": "Customers are individual consumers",
-	"personalizationModal.smallBusinesses": "Customers are small businesses (under 20 employees)",
+	"personalizationModal.it": "IT",
-	"personalizationModal.mediumBusinesses": "Customers are medium businesses (20-499 employees)",
-	"personalizationModal.largeBusinesses": "Customers are large businesses (500+ employees)",
-	"personalizationModal.whatKindOfCustomersDoYouServe": "What kind of customers do you serve?",
-	"personalizationModal.cloudInfrastructure": "Cloud infrastructure",
-	"personalizationModal.itSupport": "IT support",
-	"personalizationModal.networkingOrCommunication": "Networking / Communication",
 	"personalizationModal.itEngineering": "IT / Engineering",
+	"personalizationModal.itSupport": "IT support",
+	"personalizationModal.largeBusinesses": "Customers are large businesses (500+ employees)",
 	"personalizationModal.legal": "Legal",
 	"personalizationModal.lessThan20People": "Less than 20 people",
 	"personalizationModal.lookOutForThingsMarked": "Look out for things marked with a ✨. They are personalized to make n8n more relevant to you.",
+	"personalizationModal.managedServiceProvider": "Managed service provider",
+	"personalizationModal.manufacturing": "Manufacturing",
 	"personalizationModal.marketing": "Marketing",
 	"personalizationModal.media": "Media",
-	"personalizationModal.manufacturing": "Manufacturing",
+	"personalizationModal.mediumBusinesses": "Customers are medium businesses (20-499 employees)",
-	"personalizationModal.managedServiceProvider": "Managed service provider",
+	"personalizationModal.networkingOrCommunication": "Networking / Communication",
-	"personalizationModal.digitalAgencyOrConsultant": "Digital agency/consultant",
-	"personalizationModal.automationAgencyOrConsultant": "Automation agency/consultant",
 	"personalizationModal.neverCoded": "0. Never coded",
+	"personalizationModal.notSureYet": "Not sure yet",
 	"personalizationModal.operations": "Operations",
-	"personalizationModal.otherPleaseSpecify": "Other (please specify)",
 	"personalizationModal.other": "Other",
+	"personalizationModal.otherPleaseSpecify": "Other (please specify)",
 	"personalizationModal.people": "people",
-	"personalizationModal.proCoder": "Pro coder",
 	"personalizationModal.physicalRetailOrServices": "Physical retail or services",
+	"personalizationModal.pleaseSpecifyYourCompanyFocus": "Please specify your company focus",
+	"personalizationModal.proCoder": "Pro coder",
+	"personalizationModal.product": "Product (e.g. fast prototyping)",
 	"personalizationModal.realEstateOrConstruction": "Real estate / Construction",
 	"personalizationModal.saas": "SaaS",
-	"personalizationModal.education": "Education",
+	"personalizationModal.salesAndMarketing": "Sales and Marketing",
 	"personalizationModal.salesBizDev": "Sales / Bizdev",
 	"personalizationModal.salesBusinessDevelopment": "Sales / Business Development",
 	"personalizationModal.security": "Security",
 	"personalizationModal.select": "Select...",
+	"personalizationModal.smallBusinesses": "Customers are small businesses (under 20 employees)",
+	"personalizationModal.specifyYourAutomationGoal": "Please specify your automation goal",
 	"personalizationModal.specifyYourCompanysIndustry": "Specify your company's industry",
 	"personalizationModal.specifyYourWorkArea": "Specify your work area",
 	"personalizationModal.support": "Support",
 	"personalizationModal.systemsIntegration": "Systems Integration",
 	"personalizationModal.systemsIntegrator": "Systems Integrator",
-	"personalizationModal.thanks": "Thanks!",
 	"personalizationModal.telecoms": "Telecoms",
+	"personalizationModal.thanks": "Thanks!",
 	"personalizationModal.theseQuestionsHelpUs": "These questions help us tailor n8n to you",
-	"personalizationModal.whichIndustriesIsYourCompanyIn": "Which industries is your company in?",
+	"personalizationModal.whatAreYouLookingToAutomate": "What are you looking to automate?",
 	"personalizationModal.whatBestDescribesYourCompany": "What best describes your company?",
 	"personalizationModal.whatDoesYourCompanyFocusOn": "Which services does your company focus on?",
-	"personalizationModal.pleaseSpecifyYourCompanyFocus": "Please specify your company focus",
+	"personalizationModal.whatKindOfCustomersDoYouServe": "What kind of customers do you serve?",
-	"personalizationModal.whatAreYouLookingToAutomate": "What are you looking to automate?",
+	"personalizationModal.whichIndustriesIsYourCompanyIn": "Which industries is your company in?",
-	"personalizationModal.customerIntegrations": "Customer integrations",
-	"personalizationModal.customerSupport": "Customer support",
-	"personalizationModal.financeOrAccounting": "Finance / Accounting",
-	"personalizationModal.product": "Product (e.g. fast prototyping)",
-	"personalizationModal.salesAndMarketing": "Sales and Marketing",
-	"personalizationModal.notSureYet": "Not sure yet",
-	"personalizationModal.specifyYourAutomationGoal": "Please specify your automation goal",
 	"pushConnection.showMessage.title": "Workflow executed successfully",
 	"pushConnectionTracker.cannotConnectToServer": "You have a connection issue or the server is down. <br />n8n should reconnect automatically once the issue is resolved.",
 	"pushConnectionTracker.connectionLost": "Connection lost",
+	"reusableBaseText.cancel": "Cancel",
+	"reusableBaseText.name": "Name",
+	"reusableBaseText.save": "Save",
+	"reusableDynamicText.oauth2.clientId": "Client ID",
+	"reusableDynamicText.oauth2.clientSecret": "Client Secret",
 	"runData.binary": "Binary",
 	"runData.copyItemPath": "Copy Item Path",
 	"runData.copyParameterPath": "Copy Parameter Path",
@@ -484,6 +586,7 @@
 	"runData.dataOfExecution": "Data of Execution",
 	"runData.dataReturnedByThisNodeWillDisplayHere": "Data returned by this node will display here",
 	"runData.displayDataAnyway": "Display Data Anyway",
+	"runData.downloadBinaryData": "Download",
 	"runData.entriesExistButThey": "Entries exist but they do not contain any JSON data",
 	"runData.executeNode": "Execute Node",
 	"runData.executesThisNodeAfterExecuting": "Executes this {nodeName} node after executing any previous nodes that have not yet returned data",
@@ -499,7 +602,6 @@
 	"runData.noTextDataFound": "No text data found",
 	"runData.nodeReturnedALargeAmountOfData": "Node returned a large amount of data",
 	"runData.output": "Output",
-	"runData.downloadBinaryData": "Download",
 	"runData.showBinaryData": "View",
 	"runData.startTime": "Start Time",
 	"runData.table": "Table",
@@ -507,9 +609,57 @@
 	"saveButton.save": "@:reusableBaseText.save",
 	"saveButton.saved": "Saved",
 	"saveButton.saving": "Saving",
+	"settings": "Settings",
+	"settings.goBack": "Go back",
+	"settings.personal": "Personal",
+	"settings.personal.basicInformation": "Basic Information",
+	"settings.personal.personalSettings": "Personal Settings",
+	"settings.personal.personalSettingsUpdated": "Personal details updated",
+	"settings.personal.personalSettingsUpdatedError": "Problem updating your details",
+	"settings.personal.save": "Save",
+	"settings.personal.security": "Security",
+	"settings.signup.signUpInviterInfo": "{firstName} {lastName} has invited you to n8n",
+	"settings.users": "Users",
+	"settings.users.confirmDataHandlingAfterDeletion": "What should we do with their data?",
+	"settings.users.confirmUserDeletion": "Are you sure you want to delete this invited user?",
+	"settings.users.delete": "Delete",
+	"settings.users.deleteConfirmationMessage": "Type “delete all data” to confirm",
+	"settings.users.deleteConfirmationText": "delete all data",
+	"settings.users.deleteUser": "Delete {user}",
+	"settings.users.deleteWorkflowsAndCredentials": "Delete their workflows and credentials",
+	"settings.users.emailInvitesSent": "An invite email was sent to {emails}",
+	"settings.users.emailInvitesSentError": "Could not invite {emails}",
+	"settings.users.emailSentTo": "Email sent to {email}",
+	"settings.users.invalidEmailError": "{email} is not a valid email",
+	"settings.users.invite": "Invite",
+	"settings.users.inviteNewUsers": "Invite new users",
+	"settings.users.inviteResent": "Invite resent",
+	"settings.users.inviteUser": "Invite user",
+	"settings.users.inviteXUser": "Invite {count} users",
+	"settings.users.newEmailsToInvite": "New User Email Addresses",
+	"settings.users.noUsersToInvite": "No users to invite",
+	"settings.users.setupMyAccount": "Set up my owner account",
+	"settings.users.setupSMTPToInviteUsers": "Set up SMTP to invite users. <a href=\"https://docs.n8n.io/reference/user-management.html#step-one-smtp\" target=\"_blank\">Instructions</a>",
+	"settings.users.setupToInviteUsers": "To invite users, set up your own account",
+	"settings.users.setupToInviteUsersInfo": "Invited users won’t be able to see workflows and credentials of other users. <a href=\"https://docs.n8n.io/reference/user-management.html\" target=\"_blank\">More info</a> <br /> <br /> You will need details of an <a href=\"https://docs.n8n.io/reference/user-management.html#step-one-smtp\" target=\"_blank\">SMTP server</a> to complete the setup.",
+	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/reference/user-management.html#step-one-smtp\">Instructions</a>",
+	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another user",
+	"settings.users.transferredToUser": "Data transferred to {user}",
+	"settings.users.userDeleted": "User deleted",
+	"settings.users.userDeletedError": "Problem while deleting user",
+	"settings.users.userInvited": "User invited",
+	"settings.users.userInvitedError": "User could not be invited",
+	"settings.users.userReinviteError": "Could not reinvite user",
+	"settings.users.userToTransferTo": "User to transfer to",
+	"settings.users.usersEmailedError": "Couldn't send invite email",
+	"settings.users.usersInvited": "Users invited",
+	"settings.users.usersInvitedError": "Could not invite users",
+	"settings.version": "Version",
 	"showMessage.cancel": "@:reusableBaseText.cancel",
 	"showMessage.ok": "OK",
 	"showMessage.showDetails": "Show Details",
+	"startupError": "Error connecting to n8n",
+	"startupError.message": "Could not connect to server. <a onclick='window.location.reload(false);'>Refresh</a> to try again",
 	"tagsDropdown.createTag": "Create tag \"{filter}\"",
 	"tagsDropdown.manageTags": "Manage tags",
 	"tagsDropdown.noMatchingTagsExist": "No matching tags exist",
@@ -544,8 +694,8 @@
 	"tagsView.notBeingUsed": "Not being used",
 	"template.buttons.goBackButton": "Go back",
 	"template.buttons.useThisWorkflowButton": "Use this workflow",
-	"template.details.appsInTheWorkflow": "Apps in this workflow",
 	"template.details.appsInTheCollection": "This collection features",
+	"template.details.appsInTheWorkflow": "Apps in this workflow",
 	"template.details.by": "by",
 	"template.details.categories": "Categories",
 	"template.details.created": "Created",
@@ -557,6 +707,7 @@
 	"templates.collection": "Collection",
 	"templates.collections": "Collections",
 	"templates.collectionsNotFound": "Collection could not be found",
+	"templates.connectionWarning": "⚠️ There was a problem fetching workflow templates. Check your internet connection.",
 	"templates.endResult": "Share your own useful workflows through your <a href='https://n8n.io/dashboard' target='_blank'>n8n.io account</a>",
 	"templates.heading": "Workflow templates",
 	"templates.newButton": "New blank workflow",
@@ -565,7 +716,6 @@
 	"templates.workflow": "Workflow",
 	"templates.workflows": "Workflows",
 	"templates.workflowsNotFound": "Workflow could not be found",
-	"templates.connectionWarning": "⚠️ There was a problem fetching workflow templates. Check your internet connection.",
 	"textEdit.edit": "Edit",
 	"timeAgo.daysAgo": "%s days ago",
 	"timeAgo.hoursAgo": "%s hours ago",
@@ -628,25 +778,29 @@
 	"workflowActivator.thisWorkflowHasNoTriggerNodes": "This workflow has no trigger nodes that require activation",
 	"workflowDetails.active": "Active",
 	"workflowDetails.addTag": "Add tag",
+	"workflowDetails.chooseOrCreateATag": "Choose or create a tag",
 	"workflowDetails.showMessage.message": "Please enter a name, or press 'esc' to go back to the old one",
 	"workflowDetails.showMessage.title": "Name missing",
-	"workflowDetails.chooseOrCreateATag": "Choose or create a tag",
 	"workflowHelpers.showMessage.title": "Problem saving workflow",
 	"workflowOpen.active": "Active",
 	"workflowOpen.confirmMessage.cancelButtonText": "Leave without saving",
 	"workflowOpen.confirmMessage.confirmButtonText": "Save",
 	"workflowOpen.confirmMessage.headline": "Save changes before leaving?",
 	"workflowOpen.confirmMessage.message": "If you don't save, you will lose your changes.",
+	"workflowOpen.couldNotLoadActiveWorkflows": "Could not load active workflows",
 	"workflowOpen.created": "Created",
+	"workflowOpen.filterWorkflows": "Filter by tags",
 	"workflowOpen.name": "@:reusableBaseText.name",
 	"workflowOpen.openWorkflow": "Open Workflow",
-	"workflowOpen.filterWorkflows": "Filter by tags",
 	"workflowOpen.searchWorkflows": "Search workflows...",
 	"workflowOpen.showError.title": "Problem loading workflows",
 	"workflowOpen.showMessage.message": "This is the current workflow",
 	"workflowOpen.showMessage.title": "Workflow already open",
 	"workflowOpen.updated": "Updated",
-	"workflowOpen.couldNotLoadActiveWorkflows": "Could not load active workflows",
+	"workflowPreview.showError.arrayEmpty": "Must have an array of nodes",
+	"workflowPreview.showError.missingWorkflow": "Missing workflow",
+	"workflowPreview.showError.previewError.message": "Unable to preview workflow",
+	"workflowPreview.showError.previewError.title": "Preview error",
 	"workflowRun.noActiveConnectionToTheServer": "Lost connection to the server",
 	"workflowRun.showError.title": "Problem running workflow",
 	"workflowRun.showMessage.message": "Please fix them before executing",
@@ -695,159 +849,5 @@
 	"workflowSettings.showMessage.saveSettings.title": "Workflow settings saved",
 	"workflowSettings.timeoutAfter": "Timeout After",
 	"workflowSettings.timeoutWorkflow": "Timeout Workflow",
-	"workflowSettings.timezone": "Timezone",
+	"workflowSettings.timezone": "Timezone"
-	"activationModal.workflowActivated": "Workflow activated",
-	"activationModal.theseExecutionsWillNotShowUp": "These executions will not show up immediately in the editor,",
-	"activationModal.butYouCanSeeThem": "but you can see them in the",
-	"activationModal.executionList": "execution list",
-	"activationModal.ifYouChooseTo": "if you choose to",
-	"activationModal.saveExecutions": "save executions.",
-	"activationModal.dontShowAgain": "Don't show again",
-	"activationModal.yourTriggersWillNowFire": "Your triggers will now fire production executions automatically.",
-	"activationModal.yourTriggerWillNowFire": "Your trigger will now fire production executions automatically.",
-	"activationModal.yourWorkflowWillNowRegularlyCheck": "Your workflow will now regularly check {serviceName} for events and trigger executions for them.",
-	"activationModal.yourWorkflowWillNowListenForEvents": "Your workflow will now listen for events from {serviceName} and trigger executions.",
-	"activationModal.gotIt": "Got it",
-	"workflowPreview.showError.previewError.message": "Unable to preview workflow",
-	"workflowPreview.showError.previewError.title": "Preview error",
-	"workflowPreview.showError.missingWorkflow": "Missing workflow",
-	"workflowPreview.showError.arrayEmpty": "Must have an array of nodes",
-	"auth.changePassword": "Change Password",
-	"auth.changePassword.currentPassword": "Current Password",
-	"auth.changePassword.error": "Problem changing the password",
-	"auth.changePassword.missingTokenError": "Missing token",
-	"auth.changePassword.missingUserIdError": "Missing user ID",
-	"auth.changePassword.passwordUpdated": "Password updated",
-	"auth.changePassword.passwordUpdatedMessage": "You can now sign in with your new password",
-	"auth.changePassword.passwordsMustMatchError": "Passwords must match",
-	"auth.changePassword.reenterNewPassword": "Re-enter New Password",
-	"auth.changePassword.tokenValidationError": "Issue validating invite token",
-	"auth.defaultPasswordRequirements": "8+ characters, at least 1 number and 1 capital letter",
-	"auth.email": "Email",
-	"auth.firstName": "First Name",
-	"auth.lastName": "Last Name",
-	"auth.newPassword": "New Password",
-	"auth.password": "Password",
-	"auth.role": "Role",
-	"auth.roles.member": "Member",
-	"auth.roles.owner": "Owner",
-	"auth.setup.setupOwner": "Set up owner account",
-	"auth.setup.skipOwnerSetupQuestion": "Skip owner account setup?",
-	"auth.setup.skipSetup": "Skip setup",
-	"auth.setup.goBack": "Go back",
-	"auth.setup.confirmOwnerSetup": "Set up owner account?",
-	"auth.setup.setupConfirmation.oneWorkflowCount": "{count} existing workflow",
-	"auth.setup.setupConfirmation.oneCredentialCount": "{count} credential",
-	"auth.setup.setupConfirmation.workflowsCount": "{count} existing workflows",
-	"auth.setup.setupConfirmation.credentialsCount": "{count} credentials",
-	"auth.setup.setupConfirmation.concatEntities": "{workflows} and {credentials}",
-	"auth.setup.confirmOwnerSetupMessage": "To give others access to your <b>{entities}</b>, you’ll need to share these account details with them. Or you can continue as before with no account, by going back and skipping this setup. <a href=\"https://docs.n8n.io/reference/user-management.html\" target=\"_blank\">More info</a>",
-	"auth.setup.createAccount": "Create account",
-	"auth.setup.skipSetupTemporarily": "Skip setup for now",
-	"auth.setup.next": "Next",
-	"auth.setup.ownerAccountBenefits": "Setting up an owner account allows you to invite others, and prevents people using n8n without an account",
-	"auth.setup.settingUpOwnerError": "Problem setting up owner",
-	"auth.signin": "Sign in",
-	"auth.signin.error": "Problem logging in",
-	"auth.signout": "Sign out",
-	"auth.signout.error": "Could not sign out",
-	"auth.signup.finishAccountSetup": "Finish account setup",
-	"auth.signup.missingTokenError": "Missing token",
-	"auth.signup.setupYourAccount": "Set up your account",
-	"auth.signup.setupYourAccountError": "Problem setting up your account",
-	"auth.signup.tokenValidationError": "Issue validating invite token",
-	"error": "Error",
-	"error.goBack": "Go back",
-	"error.pageNotFound": "Oops, couldn’t find that",
-	"forgotPassword": "Forgot my password",
-	"forgotPassword.emailSentIfExists": "We’ve emailed {email} (if there’s a matching account)",
-	"forgotPassword.getRecoveryLink": "Email me a recovery link",
-	"forgotPassword.noSMTPToSendEmailWarning": "Please contact your admin. n8n isn’t set up to send email right now.",
-	"forgotPassword.recoverPassword": "Recover password",
-	"forgotPassword.recoveryEmailSent": "Recovery email sent",
-	"forgotPassword.returnToSignIn": "Back to sign in",
-	"forgotPassword.sendingEmailError": "Problem sending email",
-	"forgotPassword.smtpErrorContactAdministrator": "Please contact your administrator (problem with your SMTP setup)",
-	"ndv.title.rename": "Rename",
-	"ndv.title.cancel": "Cancel",
-	"ndv.title.renameNode": "Rename node",
-	"ndv.execute.executeNode": "Execute node",
-	"ndv.execute.executing": "Executing",
-	"ndv.execute.fetchEvent": "Fetch Event",
-	"ndv.execute.listenForEvent": "Listen For Event",
-	"ndv.output.pollEventNodeHint": "Fetch an event to output data",
-	"ndv.output.triggerEventNodeHint": "Listen for an event to output data",
-	"ndv.output": "Output",
-	"ndv.output.runNodeHint": "Execute this node to output data",
-	"ndv.output.executing": "Executing node...",
-	"ndv.output.noOutputData.title": "No output data returned",
-	"ndv.output.noOutputData.message": "n8n stops executing the workflow when a node has no output data. You can change this default behaviour via",
-	"ndv.output.noOutputData.message.settings": "Settings",
-	"ndv.output.noOutputData.message.settingsOption": "> “Always Output Data”.",
-	"ndv.output.noOutputDataInBranch": "No output data in this branch",
-	"ndv.output.tooMuchData.title": "Output data is huge!",
-	"ndv.output.tooMuchData.message": "The node contains {size} MB of data. Displaying it may cause problems. <br /> If you do decide to display it, avoid the JSON view.",
-	"ndv.output.tooMuchData.showDataAnyway": "Show data anyway",
-	"ndv.output.all": "all",
-	"ndv.output.items": "items",
-	"ndv.output.pageSize": "Page Size",
-	"ndv.output.item": "item",
-	"ndv.output.run": "Run",
-	"ndv.output.of": " of ",
-	"ndv.output.branch": "Branch",
-	"ndv.output.emptyOutput": "This output item is empty.",
-	"ndv.output.emptyInput": "This input item is empty. {name} will still execute when it recieves an empty item.",
-	"ndv.output.staleDataWarning": "Node parameters have changed. <br /> Execute node again to refresh output.",
-	"ndv.backToCanvas": "Back to canvas",
-	"ndv.backToCanvas.waitingForTriggerWarning": "Waiting for a Trigger node to execute. Close this view to see the Workflow Canvas.",
-	"openWorkflow.workflowImportError": "Could not import workflow",
-	"openWorkflow.workflowNotFoundError": "Could not find workflow",
-	"settings": "Settings",
-	"settings.goBack": "Go back",
-	"settings.personal": "Personal",
-	"settings.personal.basicInformation": "Basic Information",
-	"settings.personal.personalSettings": "Personal Settings",
-	"settings.personal.personalSettingsUpdated": "Personal details updated",
-	"settings.personal.personalSettingsUpdatedError": "Problem updating your details",
-	"settings.personal.save": "Save",
-	"settings.personal.security": "Security",
-	"settings.signup.signUpInviterInfo": "{firstName} {lastName} has invited you to n8n",
-	"settings.users": "Users",
-	"settings.users.confirmDataHandlingAfterDeletion": "What should we do with their data?",
-	"settings.users.confirmUserDeletion": "Are you sure you want to delete this invited user?",
-	"settings.users.delete": "Delete",
-	"settings.users.deleteConfirmationMessage": "Type “delete all data” to confirm",
-	"settings.users.deleteConfirmationText": "delete all data",
-	"settings.users.deleteUser": "Delete {user}",
-	"settings.users.deleteWorkflowsAndCredentials": "Delete their workflows and credentials",
-	"settings.users.emailInvitesSent": "An invite email was sent to {emails}",
-	"settings.users.emailInvitesSentError": "Could not invite {emails}",
-	"settings.users.emailSentTo": "Email sent to {email}",
-	"settings.users.invalidEmailError": "{email} is not a valid email",
-	"settings.users.invite": "Invite",
-	"settings.users.inviteNewUsers": "Invite new users",
-	"settings.users.inviteResent": "Invite resent",
-	"settings.users.inviteUser": "Invite user",
-	"settings.users.inviteXUser": "Invite {count} users",
-	"settings.users.newEmailsToInvite": "New User Email Addresses",
-	"settings.users.noUsersToInvite": "No users to invite",
-	"settings.users.setupMyAccount": "Set up my owner account",
-	"settings.users.setupSMTPToInviteUsers": "Set up SMTP to invite users. <a href=\"https://docs.n8n.io/reference/user-management.html#step-one-smtp\" target=\"_blank\">Instructions</a>",
-	"settings.users.setupToInviteUsers": "To invite users, set up your own account",
-	"settings.users.setupToInviteUsersInfo": "Invited users won’t be able to see workflows and credentials of other users. <a href=\"https://docs.n8n.io/reference/user-management.html\" target=\"_blank\">More info</a> <br /> <br /> You will need details of an <a href=\"https://docs.n8n.io/reference/user-management.html#step-one-smtp\" target=\"_blank\">SMTP server</a> to complete the setup.",
-	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/reference/user-management.html#step-one-smtp\">Instructions</a>",
-	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another user",
-	"settings.users.transferredToUser": "Data transferred to {user}",
-	"settings.users.userDeleted": "User deleted",
-	"settings.users.userDeletedError": "Problem while deleting user",
-	"settings.users.userInvited": "User invited",
-	"settings.users.userInvitedError": "User could not be invited",
-	"settings.users.userReinviteError": "Could not reinvite user",
-	"settings.users.userToTransferTo": "User to transfer to",
-	"settings.users.usersInvited": "Users invited",
-	"settings.users.usersInvitedError": "Could not invite users",
-	"settings.users.usersEmailedError": "Couldn't send invite email",
-	"settings.version": "Version",
-	"startupError": "Error connecting to n8n",
-	"startupError.message": "Could not connect to server. <a onclick='window.location.reload(false);'>Refresh</a> to try again"
 }