diff --git a/locales/en-US/common.json b/locales/en-US/common.json index aabcd974..cbadc703 100644 --- a/locales/en-US/common.json +++ b/locales/en-US/common.json @@ -10,11 +10,11 @@ "thisApiCallEitherInsertsANewSubscription": "This API call either inserts a new subscription or updates existing. Fields not included are left as is, so if you update only LAST_NAME value, then FIRST_NAME is kept untouched for an existing subscription.", "arguments": "arguments", "yourPersonalAccessToken": "your personal access token", - "subscribersEmailAddress": "subscriber\\'s email address", + "subscribersEmailAddress": "subscriber's email address", "required": "required", - "subscribersFirstName": "subscriber\\'s first name", - "subscribersLastName": "subscriber\\'s last name", - "subscribersTimezoneEgEuropeTallinnPstOr": "subscriber\\'s timezone (eg. \"Europe/Tallinn\", \"PST\" or \"UTC\"). If not set defaults to \"UTC\"", + "subscribersFirstName": "subscriber's first name", + "subscribersLastName": "subscriber's last name", + "subscribersTimezoneEgEuropeTallinnPstOr": "subscriber's timezone (eg. \"Europe/Tallinn\", \"PST\" or \"UTC\"). If not set defaults to \"UTC\"", "customFieldValueUseYesnoForOptionGroup": "custom field value. Use yes/no for option group values (checkboxes, radios, drop downs)", "additionalPostArguments": "Additional POST arguments", "setToYesIfYouWantToMakeSureTheEmailIs": "set to \"yes\" if you want to make sure the email is marked as subscribed even if it was previously marked as unsubscribed. If the email was already unsubscribed/blocked then subscription status is not changed", @@ -28,7 +28,7 @@ "thisApiCallCreatesANewCustomFieldForA": "This API call creates a new custom field for a list.", "fieldName": "field name", "oneOfTheFollowingTypes": "one of the following types:", - "ifTheTypeIsOptionThenYouAlsoNeedTo": "If the type is \\'option\\' then you also need to specify the parent element ID", + "ifTheTypeIsOptionThenYouAlsoNeedTo": "If the type is 'option' then you also need to specify the parent element ID", "templateForTheGroupElementIfNotSetThen": "Template for the group element. If not set, then values of the elements are joined with commas", "ifNotVisibleThenTheSubscriberCanNotView": "if not visible then the subscriber can not view or modify this value at the profile page", "getListOfBlacklistedEmails": "Get list of blacklisted emails", @@ -485,7 +485,7 @@ "formsPreview": "Forms Preview", "listToPreviewOn": "List To Preview On", "selectListWhoseFieldsWillBeUsedToPreview": "Select list whose fields will be used to preview the forms.", - "noteTheseLinksAreSolelyForAQuickPreview": "Note: These links are solely for a quick preview. To get the address of the subscription form, go to the list\\'s subscribers and click on \"Subscription Form\".", + "noteTheseLinksAreSolelyForAQuickPreview": "Note: These links are solely for a quick preview. To get the address of the subscription form, go to the list's subscribers and click on \"Subscription Form\".", "formPreview": "Form preview:", "templates": "Templates", "customFormsUseMjmlForFormattingSeeThe": "Custom forms use MJML for formatting. See the MJML documentation <1>here", @@ -768,7 +768,7 @@ "theVerpServerHostnameEgBouncesexamplecom": "The VERP server hostname, eg. bounces.example.com", "verpBounceHandlingServerHostnameThis": "VERP bounce handling server hostname. This hostname is used in the SMTP envelope FROM address and the MX DNS records should point to this server", "disableSenderHeader": "Disable sender header", - "withDmarcTheReturnPathAndFromAddressMust": "With DMARC, the Return-Path and From address must match the same domain. By default we get around this by using the VERP address in the Sender header, with the side effect that some email clients diplay an ugly on behalf of message. You can safely disable this Sender header if you\\'re not using DMARC or your VERP hostname is in the same domain as the From address.", + "withDmarcTheReturnPathAndFromAddressMust": "With DMARC, the Return-Path and From address must match the same domain. By default we get around this by using the VERP address in the Sender header, with the side effect that some email clients diplay an ugly on behalf of message. You can safely disable this Sender header if you're not using DMARC or your VERP hostname is in the same domain as the From address.", "mailtrainIsAbleToUseVerpBasedRoutingTo": "<0>Mailtrain is able to use VERP based routing to detect bounces. In this case the message is sent to the recipient using a custom VERP address as the return path of the message. If the message is not accepted a bounce email is sent to this special VERP address and thus a bounce is detected.", "toGetVerpWorkingYouNeedToSetUpADnsMx": "<0>To get VERP working you need to set up a DNS MX record that points to your Mailtrain hostname. You must also ensure that Mailtrain VERP interface is available from port 25 of your server (port 25 usually requires root user privileges). This way if anyone tries to send email to someuser@verp-hostname then the email should end up to this server.", "verpUsuallyOnlyWorksIfYouAreUsingYourOwn": "<0>VERP usually only works if you are using your own SMTP server. Regular relay services (SES, SparkPost, Gmail etc.) tend to remove the VERP address from the message.", @@ -786,8 +786,8 @@ "uswest2": "US-WEST-2", "euwest1": "EU-WEST-1", "builtinZoneMta": "Built-in ZoneMTA", - "dynamicConfigurationOfDkimKeysViaZoneMt": "Dynamic configuration of DKIM keys via ZoneMTA\\'s Mailtrain plugin (use this option for builtin ZoneMTA)", - "dynamicConfigurationOfDkimKeysViaZoneMt-1": "Dynamic configuration of DKIM keys via ZoneMTA\\'s HTTP config plugin", + "dynamicConfigurationOfDkimKeysViaZoneMt": "Dynamic configuration of DKIM keys via ZoneMTA's Mailtrain plugin", + "dynamicConfigurationOfDkimKeysViaZoneMt-1": "Dynamic configuration of DKIM keys via ZoneMTA's HTTP config plugin", "noDynamicConfigurationOfDkimKeys": "No dynamic configuration of DKIM keys", "mailerSettings": "Mailer Settings", "mailerType": "Mailer type", @@ -845,7 +845,7 @@ "passphraseForTheKeyIfSet": "Passphrase for the key if set", "onlyFillThisIfYourPrivateKeyIsEncrypted": "Only fill this if your private key is encrypted with a passphrase", "gpgPrivateKey": "GPG private key", - "beginsWithBeginPgpPrivateKeyBlock": "Begins with \\'-----BEGIN PGP PRIVATE KEY BLOCK-----\\'", + "beginsWithBeginPgpPrivateKeyBlock": "Begins with '-----BEGIN PGP PRIVATE KEY BLOCK-----'", "thisValueIsOptionalIfYouDoNotProvideA": "This value is optional. If you do not provide a private key GPG encrypted messages are sent without signing.", "onlyMessagesThatAreEncryptedCanBeSigned": "<0>Only messages that are encrypted can be signed. Subsribers who have not set up a GPG public key in their profile receive normal email messages. Users with GPG key set receive encrypted messages and if you have signing key also set, the messages are signed with this key.", "doNotUseSensitiveKeysHereThePrivateKey": "<0>Do not use sensitive keys here. The private key and passphrase are not encrypted in the database.", diff --git a/mvis/ivis-core b/mvis/ivis-core index 7d15f154..d260de2e 160000 --- a/mvis/ivis-core +++ b/mvis/ivis-core @@ -1 +1 @@ -Subproject commit 7d15f154c933c4789d6c9b288fbdf7437be3d856 +Subproject commit d260de2e153f9c1d6bc7af69c1c3d733073bab74