@tracearr/translations 2.3.0-beta.4 → 2.3.0-beta.6

package/src/locales/en/common.json

@@ -191,7 +191,8 @@
     "selectAllOnPage": "Select all on page",
     "selectRow": "Select row",
     "pageOf": "Page {{page}} of {{total}}",
-    "pagination": "Pagination"
+    "pagination": "Pagination",
+    "goToPage": "Go to page {{page}}"
   },
   "filters": {
     "clearAll": "Clear all",

package/src/locales/en/nav.json

@@ -8,6 +8,7 @@
   "users": "Users",
   "automations": "Automations",
   "violations": "Violations",
+  "requests": "Requests",
   "alerts": "Alerts",
   "settings": "Settings",
   "overview": "Overview",

package/src/locales/en/notifications.json

@@ -159,6 +159,8 @@
       "serverUserSplit": {
         "title": "Account split into a separate user"
       },
+      "mergeSuggestionDismissed": "Marked as not the same person",
+      "mergeSuggestionRestored": "Suggestion restored",
       "destinationSaved": "Destination saved",
       "destinationDeleted": "Destination deleted",
       "destinationTestSent": "Test notification sent",
@@ -215,6 +217,8 @@
       "plexDirectUrl": "plex.direct URLs are relay addresses that cannot be used here. Please use a direct IP address or hostname instead.",
       "userMergeFailed": "Failed to merge users",
       "serverUserSplitFailed": "Failed to split account",
+      "mergeSuggestionDismissFailed": "Could not dismiss the suggestion",
+      "mergeSuggestionRestoreFailed": "Could not restore the suggestion",
       "invalidClaimCode": {
         "title": "Invalid claim code",
         "message": "Please check the server logs"

package/src/locales/en/pages.json

@@ -63,26 +63,60 @@
     "resetTrustScoreTitle_other": "Reset Trust Score for {{count}} Users",
     "resetTrustScoreConfirm": "Are you sure you want to reset the trust score to 100? This action cannot be undone.",
     "mergeUsers": "Merge users",
-    "mergeDialogTitle": "Merge users",
-    "mergeDialogDescription": "Every server account, session, and violation from the duplicate moves to the primary. The duplicate identity is deleted.",
-    "mergePickPrimary": "Choose the primary identity",
-    "mergePrimaryBadge": "Primary",
-    "mergePrimaryForced": "This account can log in, so it must stay the primary.",
-    "mergeSameServerWarningTitle": "This action is irreversible",
-    "mergeSameServerDialogDescription": "This merge permanently combines both accounts on the same server. It cannot be undone.",
-    "mergeSameServerWarning": "Both identities already have an account on the same server. Merging will permanently combine their session history, violations, and trust score into a single account on that server. This cannot be undone, and splitting the account afterward will not restore the original two accounts.",
-    "mergeSameServerAcknowledge": "I understand the same-server history combine cannot be undone",
-    "mergeSameServerFallbackName": "this server",
+    "mergeTitleSuggestion": "Are these the same person?",
+    "mergeTitleBulk": "Merge these users?",
+    "mergeReasonEmail": "Both have the email {{value}} on their server accounts.",
+    "mergeReasonEmailUsername": "Both use {{value}} as a username or account email.",
+    "mergeReasonUsername": "Both use the username {{value}}.",
+    "mergeKeep": "Keep",
+    "mergeFoldIn": "Fold in, then deleted",
+    "mergeSwap": "Swap which one is kept",
+    "mergeRequired": "{{name}} can sign in to Tracearr, so {{name}} is kept.",
+    "mergeLastActive": "Last active {{relative}}",
+    "mergeNeverActive": "Never active",
+    "mergeSessions_one": "{{count}} session",
+    "mergeSessions_other": "{{count}} sessions",
+    "mergeMoreServers": "+{{count}}",
+    "mergeWhatHappens": "What happens",
+    "mergeMoves_one": "{{foldName}}'s server accounts and {{count}} session move to {{keepName}}.",
+    "mergeMoves_other": "{{foldName}}'s server accounts and {{count}} sessions move to {{keepName}}.",
+    "mergeMovesNoCount": "{{foldName}}'s server accounts and sessions move to {{keepName}}.",
+    "mergeCarriesOver": "Their contact email, newsletter exclusions and Seerr requests carry over.",
+    "mergeDeleted": "{{foldName}} is deleted. You can split an account back out from {{keepName}}'s page.",
+    "mergeRulesKept": "Per-server rules with the same name keep {{keepName}}'s version.",
+    "mergeIrreversibleTitle": "This cannot be undone",
+    "mergeIrreversibleBody": "Both have an account on the same server. Those two accounts become one, with their sessions, violations and trust score combined. Splitting later does not bring the second account back.",
+    "mergeServerLabel": "Server",
+    "mergeServerUnknown": "Unknown server",
+    "mergeIrreversibleAcknowledge": "I understand the two accounts on this server cannot be separated again",
     "mergeServerAccountRemoved": "Removed",
-    "mergeConfirm": "Merge",
+    "mergeConfirmInto": "Merge into {{keepName}}",
     "mergeSelectTwo": "Select exactly two users to merge",
     "mergeSameIdentity": "These accounts already belong to the same user",
     "mergeSelectAllActive": "Clear the select-all selection and pick exactly two users to merge",
     "suggestionsTitle": "Possible duplicate users",
-    "suggestionsDescription": "These identities look like the same person across servers. Review and merge them if they match.",
+    "suggestionsCount_one": "{{count}} possible duplicate user",
+    "suggestionsCount_other": "{{count}} possible duplicate users",
+    "suggestionsPairEmail": "{{first}} and {{second}} share an email",
+    "suggestionsPairEmailMore_one": "{{first}} and {{second}} share an email, plus {{count}} more",
+    "suggestionsPairEmailMore_other": "{{first}} and {{second}} share an email, plus {{count}} more",
+    "suggestionsPairEmailUsername": "{{first}} and {{second}} use the same address as a username or account email",
+    "suggestionsPairEmailUsernameMore_one": "{{first}} and {{second}} use the same address as a username or account email, plus {{count}} more",
+    "suggestionsPairEmailUsernameMore_other": "{{first}} and {{second}} use the same address as a username or account email, plus {{count}} more",
+    "suggestionsPairUsername": "{{first}} and {{second}} share a username",
+    "suggestionsPairUsernameMore_one": "{{first}} and {{second}} share a username, plus {{count}} more",
+    "suggestionsPairUsernameMore_other": "{{first}} and {{second}} share a username, plus {{count}} more",
+    "suggestionsSheetDescription": "Merging keeps one user and deletes the other. A pair marked as not the same person stops showing up until you restore it.",
     "suggestionsReview": "Review",
+    "suggestionsNotSame": "Not the same person",
     "suggestionsMatchEmail": "Same email",
+    "suggestionsMatchEmailUsername": "Both use {{value}} as a username or account email",
     "suggestionsMatchUsername": "Same username",
+    "suggestionsEmpty": "Nothing left to review.",
+    "suggestionsDismissed": "Dismissed ({{count}})",
+    "suggestionsDismissedPair": "{{first}} and {{second}}",
+    "suggestionsDismissedAt": "Dismissed {{relative}}",
+    "suggestionsRestore": "Restore",
     "suggestionsError": "Could not load merge suggestions",
     "filterHasAccessTo": "Has access to",
     "filterHasAccessToPlaceholder": "Any server",
@@ -1624,7 +1658,7 @@
         "smtpPreset": "Fills the host, port and security for common providers. Amazon SES and Mailgun EU need the region edited into the host.",
         "smtpVerifyCertificate": "Checks the mail server's TLS certificate against a trusted authority. Turn it off only for a server with a self-signed certificate, such as a local bridge: anyone on the path between Tracearr and the mail server can then intercept the connection.",
         "smtpUsernameOptional": "Leave blank when the server needs no login",
-        "smtpTo": "Alerts sent to this destination go to these addresses. Newsletters ignore this list and pick their own recipients, so you can leave it blank.",
+        "smtpTo": "Alerts go out as one email with every address here in To. Leave it blank if this server only sends newsletters.",
         "smtpRate": "Per Tracearr instance; stay under your provider's limit",
         "smtpMessageStream": "Postmark only: the stream ID to send through, for example broadcast. Leave blank elsewhere.",
         "smtpGmailUsername": "Your full Gmail address. Gmail sends from this address whatever the sender address says, and personal accounts stop near 500 recipients a day.",
@@ -1642,6 +1676,9 @@
         "smtpPostmarkUsername": "Your Server API token.",
         "smtpPostmarkPassword": "The same Server API token, or a stream token's secret."
       },
+      "newsletterAlertsNote": "Newsletter recipients are set on the newsletter itself. To send alerts through this server too, edit it later under Destinations.",
+      "newsletterDescription": "Tracearr sends newsletters through this SMTP server.",
+      "newsletterTitle": "Add email server",
       "newslettersOnly": "Newsletters only",
       "noAlertRecipients": "No alert recipients",
       "options": {
@@ -2166,10 +2203,8 @@
       "watched": "Watched"
     },
     "wait": {
-      "pending": "still waiting",
-      "declined": "declined",
-      "landed": "landed {{duration}} later",
-      "sameMinute": "landed within a minute"
+      "pending": "waiting",
+      "declined": "declined"
     },
     "seasons": {
       "all": "All seasons",
@@ -2200,6 +2235,63 @@
       },
       "empty": "No requests yet"
     },
-    "unattributed": "Not on this server"
+    "unattributed": "Not on this server",
+    "watched": {
+      "byRequester": "Watched by the requester",
+      "byOthers": "Watched by someone else"
+    },
+    "page": {
+      "title": "Requests",
+      "description": "What people asked for, what landed, and whether they ever played it.",
+      "failedToLoad": "Couldn't load request analytics",
+      "notConfigured": "No Seerr linked",
+      "notConfiguredDescription": "Link a Seerr instance to a server and this page fills in after the first sync.",
+      "linkSeerr": "Link Seerr",
+      "kpi": {
+        "requested": "Requested",
+        "landedOf": "{{count}} landed",
+        "watched": "Watched",
+        "neverPlayed": "Never played",
+        "ofLanded": "{{share}} of landed",
+        "onDisk": "{{size}} on disk"
+      }
+    },
+    "funnel": {
+      "title": "Where requests end up",
+      "description": "Watched means someone got through 85% of it, the same bar the library pages use. A request has to land and be matched to a title before Tracearr can measure that.",
+      "requested": "Requested",
+      "landed": "Landed",
+      "watched": "Watched",
+      "share": "{{count}} of {{total}} requests",
+      "empty": "No requests yet"
+    },
+    "unplayed": {
+      "title": "Landed and never played",
+      "description": "Downloaded because someone asked, and no account on these servers has pressed play even once.",
+      "emptyTitle": "Everything that landed got played",
+      "emptyDescription": "Nothing here is holding disk for no reason."
+    },
+    "outcomes": {
+      "title": "Title",
+      "requester": "Requested by",
+      "wait": "Wait",
+      "requested": "Requested",
+      "onDisk": "On disk",
+      "untitled": "Untitled",
+      "failedToLoad": "Couldn't load these requests"
+    },
+    "followThrough": {
+      "title": "Requesters",
+      "description": "Who asks for what, whether they watch it through, and whether anyone else does.",
+      "person": "Person",
+      "asked": "Asked",
+      "landed": "Landed",
+      "watched": "Watched",
+      "watchedByOthers": "Watched by others",
+      "medianWait": "Median wait",
+      "emptyTitle": "No requesters yet",
+      "emptyDescription": "Requests appear here once a linked Seerr has synced.",
+      "failedToLoad": "Couldn’t load requesters"
+    }
   }
 }

package/src/locales/en/settings.json

@@ -168,7 +168,7 @@
     "removeServer": "Remove Server",
     "removeServerConfirm": "Are you sure you want to remove this server? All associated session data will be retained, but you won't be able to monitor new sessions from this server.",
     "editServer": "Edit Server",
-    "editServerDesc": "Update the server name or connection URL.",
+    "editServerDesc": "Update the server name, connection URL or API key.",
     "serverColor": "Server Color",
     "serverColorDesc": "Used for visual attribution in multi-server view",
     "updating": "Updating...",
@@ -185,6 +185,7 @@
     "publicUrlHint": "The address members use to open this server. Newsletter links use it.",
     "apiKeyHelpJellyfin": "Find this in Jellyfin Dashboard → API Keys",
     "apiKeyHelpEmby": "Find this in Emby Server → API Keys",
+    "apiKeyKeepCurrent": "Leave blank to keep the current key",
     "plexServerPlaceholder": "My Plex Server",
     "plexServerUrlPlaceholder": "http://192.168.1.100:32400",
     "updateHint": "Or click Update below to save only the name change.",
@@ -544,7 +545,7 @@
     "empty": "No newsletters yet",
     "emptyDescription": "A newsletter emails the members of a server what was added recently.",
     "noDestinationTitle": "Newsletters need an email destination",
-    "noDestinationDescription": "An email destination is the SMTP server newsletters send through. Each newsletter picks its own recipients, so this one only needs the server and sender details.",
+    "noDestinationDescription": "An email destination is the SMTP server newsletters send through, so it only needs the server and sender details. Each newsletter reaches everyone shared on the servers you choose automatically, plus any extra addresses you add.",
     "noDestinationHint": "No email destination yet.",
     "addEmailDestination": "Add email destination",
     "enabled": "Enabled",
@@ -605,7 +606,7 @@
       "name": "Name",
       "nameHelp": "Only you see this. It names the newsletter in this list and in the send history.",
       "turnOnNow": "Turn it on now",
-      "enabledHelp": "Off means the schedule does not run; Send now still works.",
+      "enabledHelp": "When on, the next scheduled run mails everyone listed under Recipients. Off means the schedule does not run; Send now still works.",
       "schedule": "Schedule",
       "scheduleKind": "Repeats",
       "kinds": {
@@ -713,49 +714,68 @@
       "recipients": {
         "title": "Recipients",
         "members": "Everyone on the chosen servers",
-        "membersHelp": "Everyone with an active account on {{servers}}. Their address comes from their contact email, then their Tracearr email, then the address their media server account carries.",
-        "ownerNote": "If you have an account on one of these servers you are on the list below; use Exclude to take yourself off.",
-        "membersOff": "Members are off; only the extra addresses receive this newsletter.",
-        "membersOffSuppressed": "Members are off; only the extra addresses receive this newsletter. {{count}} of them are on the suppression list and will not be mailed.",
-        "extraAddresses": "Extra addresses",
-        "extraAddressesHelp": "Addresses with no account here. They get the version covering every server, and they can unsubscribe like anyone else.",
-        "addAddress": "Add address",
+        "membersHelp": "Everyone shared on {{servers}} is already included. Each person is mailed at their contact email if you set one, otherwise at the email on their Tracearr or media server account. Each person gets their own copy and sees only their own address.",
+        "ownerNote": "If you have an account on one of these servers you are included too. Open Manage recipients to exclude yourself.",
+        "extraTrigger": "Add people without an account ({{count}})",
+        "extraHelp": "For someone who isn't on your servers. Everyone shared on the chosen servers is already on the list above.",
+        "pasteAddresses": "Paste addresses, one per line or separated by commas",
         "addressLabel": "Address {{n}}",
         "nameLabel": "Name {{n}}",
         "namePlaceholder": "Name (optional)",
         "removeAddress": "Remove address {{n}}",
         "badAddress": "That is not an email address.",
-        "saveFirst": "Save to see recipients.",
-        "saveFirstHelp": "Preview renders the email for the current servers and shows how many people each version reaches.",
         "loadFailed": "Could not load the recipients.",
-        "willReceive": "Will receive ({{count}})",
-        "groupsNote": "People on different servers get different emails. Each list below only sees what was added to the servers named.",
-        "staleScope": "This list still reflects the saved servers. Save to see who the new selection reaches.",
-        "noAddress": "No email address ({{count}})",
-        "noAddressHelp": "Nothing was found for these people: no contact email, no Tracearr email, and nothing from their media server account. Jellyfin and Emby never send one. Add a contact email here and it saves straight away.",
+        "willReceive": "Will receive {{count}}",
+        "excludedCount": "Excluded {{count}}",
+        "notIncludable": "{{count}} can't be included",
+        "noAddress": "No email address {{count}}",
+        "suppressedCount": "Suppressed {{count}}",
+        "joinedSinceLastSend": "{{count}} joined since the last send",
+        "newSinceLastSend": "New since last send",
+        "manage": "Manage recipients ({{count}})",
+        "manageHelp": "Exclude and Include change the form. Nothing is saved until you press Save.",
+        "searchPlaceholder": "Search by name, username or address",
+        "serverFilter": "Server",
+        "allServers": "All servers",
+        "tabs": {
+          "receiving": "Receiving ({{count}})",
+          "excluded": "Excluded ({{count}})",
+          "noAddress": "No email address ({{count}})",
+          "suppressed": "Suppressed ({{count}})"
+        },
+        "selectAll": "Select all {{count}}",
+        "selectPerson": "Select {{name}}",
+        "selectedCount": "{{count}} selected",
+        "excludeSelected": "Exclude selected",
+        "includeSelected": "Include selected",
+        "noMatches": "Nobody here matches the search.",
+        "groupsNote": "People on different servers get different emails. Each group below only sees what was added to the servers named.",
+        "noAddressHelp": "Nothing was found for these people: no contact email, no Tracearr email, and nothing from their media server account. Jellyfin and Emby never send one, so their accounts only count when the username is an email address. Add a contact email here and it saves straight away.",
         "contactEmailFor": "Contact email for {{name}}",
         "saveEmail": "Save the contact email for {{name}}",
         "openUserPage": "Open {{name}}'s page",
         "unknownMember": "Unknown member",
         "account": "{{username}} on {{server}}",
+        "fromUsername": "from username",
         "extraAddress": "Extra address",
         "suppressed": "Suppressed",
-        "suppressedHeading": "Suppressed ({{count}})",
         "suppressedHelp": "These addresses unsubscribed or were suppressed by hand under Email; the send skips them.",
         "exclude": "Exclude {{name}} from this newsletter",
         "excludeAction": "Exclude",
         "include": "Include {{name}} again",
         "includeAction": "Include",
-        "excludedCount": "Excluded ({{count}})",
         "excludedHelp": "These people stay off this newsletter until you include them again. Other newsletters are unaffected.",
+        "notIncludableHelp": "{{count}} more can't be included because they are banned, pending, or not on a chosen server.",
         "excludedAfterSave": "Excluded after save",
         "includedAfterSave": "Included after save",
         "reasons": {
+          "excluded": "Excluded",
           "banned": "Banned",
-          "pending": "Pending"
+          "pending": "Pending",
+          "noServer": "Not on a chosen server"
         },
         "emptyTitle": "Nobody will receive this newsletter",
-        "emptyDescription": "Turn on Members above, or add an extra address, to reach someone."
+        "emptyDescription": "Turn on Everyone on the chosen servers, or add an address below."
       },
       "delivery": {
         "title": "Delivery",
@@ -793,7 +813,6 @@
         "fixDestination": "Choose a destination",
         "fixRecipients": "Go to recipients",
         "fixExternalUrl": "Set the external URL",
-        "staleScope": "The recipient rows reflect the saved servers. Save to check the new selection.",
         "externalUrl": "External URL is set; hosted posters, the browser view and Tracearr links work.",
         "externalUrlFail": "No external URL: hosted posters, the browser view and Tracearr links are off.",
         "externalUrlNotHttps": "External URL is set over http: members get an unsubscribe link, but one-click unsubscribe needs https.",
@@ -808,7 +827,7 @@
         "recipients_one": "{{count}} recipient resolves to an address.",
         "recipients_other": "{{count}} recipients resolve to an address.",
         "recipientsFail": "Nobody resolves to an address yet.",
-        "recipientsUnknown": "Recipients are unknown until the newsletter is saved.",
+        "recipientsChecking": "Checking who receives this newsletter.",
         "recipientsLoadFailed": "Recipients could not be loaded.",
         "dns": "Deliverability depends on SPF, DKIM and DMARC records for the sending domain.",
         "dnsLink": "Read how to set them"
@@ -856,7 +875,7 @@
       "send": {
         "title": "Send {{name}} now?",
         "previewing": "Working out who gets what...",
-        "summary": "Send to {{count}} recipients: {{counts}} added between {{start}} and {{end}}",
+        "summary": "Send to {{count}} recipients: {{counts}} added between {{start}} and {{end}}. Each person gets their own copy and sees only their own address.",
         "nobody": "Nobody resolves to an address ({{missing}} members have none), so there is nothing to send.",
         "trimmed_one": "{{count}} item is held back as a +N more line so the email stays under the 102 KB at which Gmail clips it.",
         "trimmed_other": "{{count}} items are held back as +N more lines so the email stays under the 102 KB at which Gmail clips it.",