diff --git a/app/models/WebhookSubscription.ts b/app/models/WebhookSubscription.ts index be7c73320..093df0315 100644 --- a/app/models/WebhookSubscription.ts +++ b/app/models/WebhookSubscription.ts @@ -15,6 +15,10 @@ class WebhookSubscription extends BaseModel { @observable url: string; + @Field + @observable + secret: string; + @Field @observable enabled: boolean; diff --git a/app/scenes/Settings/components/WebhookSubscriptionForm.tsx b/app/scenes/Settings/components/WebhookSubscriptionForm.tsx index fc58ec498..629f514ba 100644 --- a/app/scenes/Settings/components/WebhookSubscriptionForm.tsx +++ b/app/scenes/Settings/components/WebhookSubscriptionForm.tsx @@ -146,6 +146,7 @@ type Props = { interface FormData { name: string; url: string; + secret: string; events: string[]; } @@ -163,6 +164,7 @@ function WebhookSubscriptionForm({ handleSubmit, webhookSubscription }: Props) { events: webhookSubscription ? [...webhookSubscription.events] : [], name: webhookSubscription?.name, url: webhookSubscription?.url, + secret: webhookSubscription?.secret, }, }); @@ -237,6 +239,7 @@ function WebhookSubscriptionForm({ handleSubmit, webhookSubscription }: Props) { autoFocus flex label={t("Name")} + placeholder={t("A memorable identifer")} {...register("name", { required: true, })} @@ -250,6 +253,14 @@ function WebhookSubscriptionForm({ handleSubmit, webhookSubscription }: Props) { label={t("URL")} {...register("url", { required: true })} /> + diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts index c8e571d58..a51e8e5d0 100644 --- a/app/typings/styled-components.d.ts +++ b/app/typings/styled-components.d.ts @@ -16,7 +16,6 @@ declare module "styled-components" { tableDivider: string; tableSelected: string; tableSelectedBackground: string; - tableHeaderBackground: string; quote: string; codeBackground: string; codeBorder: string; diff --git a/package.json b/package.json index 308c9c555..9a231f1a6 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ "prosemirror-transform": "1.2.5", "prosemirror-utils": "^0.9.6", "prosemirror-view": "1.26.5", - "query-string": "^7.0.1", + "query-string": "^7.1.1", "quoted-printable": "^1.0.1", "randomstring": "1.1.5", "rate-limiter-flexible": "^2.3.7", @@ -306,7 +306,7 @@ "babel-plugin-transform-inline-environment-variables": "^0.4.3", "babel-plugin-transform-typescript-metadata": "^0.3.2", "babel-plugin-tsconfig-paths-module-resolver": "^1.0.3", - "concurrently": "^7.3.0", + "concurrently": "^7.4.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.6", "eslint": "^7.32.0", @@ -335,7 +335,7 @@ "rimraf": "^2.5.4", "terser-webpack-plugin": "^4.1.0", "typescript": "^4.7.4", - "url-loader": "^0.6.2", + "url-loader": "^4.1.1", "webpack": "4.44.1", "webpack-cli": "^4.10.0", "webpack-manifest-plugin": "^3.0.0", diff --git a/server/commands/revisionCreator.ts b/server/commands/revisionCreator.ts index 9ce4db287..962b8fe7f 100644 --- a/server/commands/revisionCreator.ts +++ b/server/commands/revisionCreator.ts @@ -10,10 +10,7 @@ export default async function revisionCreator({ user: User; ip?: string; }) { - let transaction; - - try { - transaction = await sequelize.transaction(); + return sequelize.transaction(async (transaction) => { const revision = await Revision.createFromDocument(document, { transaction, }); @@ -32,13 +29,6 @@ export default async function revisionCreator({ transaction, } ); - await transaction.commit(); return revision; - } catch (err) { - if (transaction) { - await transaction.rollback(); - } - - throw err; - } + }); } diff --git a/server/emails/templates/DocumentNotificationEmail.tsx b/server/emails/templates/DocumentNotificationEmail.tsx index f7c7a54f4..d99a1693b 100644 --- a/server/emails/templates/DocumentNotificationEmail.tsx +++ b/server/emails/templates/DocumentNotificationEmail.tsx @@ -3,6 +3,7 @@ import { Document } from "@server/models"; import BaseEmail from "./BaseEmail"; import Body from "./components/Body"; import Button from "./components/Button"; +import Diff from "./components/Diff"; import EmailTemplate from "./components/EmailLayout"; import EmptySpace from "./components/EmptySpace"; import Footer from "./components/Footer"; @@ -17,6 +18,7 @@ type InputProps = { eventName: string; teamUrl: string; unsubscribeUrl: string; + content: string; }; type BeforeSend = { @@ -73,25 +75,34 @@ Open Document: ${teamUrl}${document.url} eventName = "published", teamUrl, unsubscribeUrl, + content, }: Props) { + const link = `${teamUrl}${document.url}?ref=notification-email`; + return (
- "{document.title}" {eventName} + “{document.title}” {eventName}

- {actorName} {eventName} the document "{document.title}", in the{" "} - {collectionName} collection. + {actorName} {eventName} the document{" "} + {document.title}, in the {collectionName}{" "} + collection.

-
- -

{document.getSummary()}

- + {content && ( + <> + + +
+ + + + )}

- +

diff --git a/server/emails/templates/InviteEmail.tsx b/server/emails/templates/InviteEmail.tsx index c7259fa56..a80f0fffe 100644 --- a/server/emails/templates/InviteEmail.tsx +++ b/server/emails/templates/InviteEmail.tsx @@ -57,7 +57,7 @@ Join now: ${teamUrl}

- +

diff --git a/server/emails/templates/InviteReminderEmail.tsx b/server/emails/templates/InviteReminderEmail.tsx index 6dc6a6f61..b06f83ecb 100644 --- a/server/emails/templates/InviteReminderEmail.tsx +++ b/server/emails/templates/InviteReminderEmail.tsx @@ -59,7 +59,9 @@ If you haven't signed up yet, you can do so here: ${teamUrl}

If you haven't signed up yet, you can do so here:

- +

diff --git a/server/emails/templates/WelcomeEmail.tsx b/server/emails/templates/WelcomeEmail.tsx index 1c787f8c6..d8fe13fba 100644 --- a/server/emails/templates/WelcomeEmail.tsx +++ b/server/emails/templates/WelcomeEmail.tsx @@ -59,7 +59,9 @@ ${teamUrl}/home

- +

diff --git a/server/emails/templates/components/Diff.tsx b/server/emails/templates/components/Diff.tsx new file mode 100644 index 000000000..ad73ae906 --- /dev/null +++ b/server/emails/templates/components/Diff.tsx @@ -0,0 +1,25 @@ +import * as React from "react"; +import theme from "@shared/styles/theme"; + +type Props = { + children: React.ReactNode; + href?: string; +}; + +export default ({ children, ...rest }: Props) => { + const style = { + borderRadius: "4px", + background: theme.secondaryBackground, + padding: ".75em 1em", + color: theme.text, + display: "block", + textDecoration: "none", + width: "100%", + }; + + return ( +
+ {children} +
+ ); +}; diff --git a/server/migrations/20220922073737-webhook-signing-secret.js b/server/migrations/20220922073737-webhook-signing-secret.js new file mode 100644 index 000000000..48c54617c --- /dev/null +++ b/server/migrations/20220922073737-webhook-signing-secret.js @@ -0,0 +1,14 @@ +"use strict"; + +module.exports = { + async up (queryInterface, Sequelize) { + return queryInterface.addColumn("webhook_subscriptions", "secret", { + type: Sequelize.BLOB, + allowNull: true, + }); + }, + + async down (queryInterface, Sequelize) { + return queryInterface.removeColumn("webhook_subscriptions", "secret"); + } +}; diff --git a/server/models/WebhookSubscription.ts b/server/models/WebhookSubscription.ts index 148ee7c66..2d51db9f9 100644 --- a/server/models/WebhookSubscription.ts +++ b/server/models/WebhookSubscription.ts @@ -1,4 +1,6 @@ +import crypto from "crypto"; import { bool } from "aws-sdk/clients/signer"; +import { isEmpty } from "lodash"; import { Column, Table, @@ -9,6 +11,7 @@ import { IsUrl, BeforeCreate, DefaultScope, + AllowNull, } from "sequelize-typescript"; import { SaveOptions } from "sequelize/types"; import { WebhookSubscriptionValidation } from "@shared/validations"; @@ -17,6 +20,10 @@ import { Event } from "@server/types"; import Team from "./Team"; import User from "./User"; import ParanoidModel from "./base/ParanoidModel"; +import Encrypted, { + setEncryptedColumn, + getEncryptedColumn, +} from "./decorators/Encrypted"; import Fix from "./decorators/Fix"; import Length from "./validators/Length"; @@ -51,6 +58,21 @@ class WebhookSubscription extends ParanoidModel { @Column(DataType.ARRAY(DataType.STRING)) events: string[]; + @AllowNull + @Encrypted + @Column(DataType.BLOB) + get secret() { + const val = getEncryptedColumn(this, "secret"); + // Turns out that `val` evals to `{}` instead + // of `null` even if secret's value in db is `null`. + // https://github.com/defunctzombie/sequelize-encrypted/blob/c3854e76ae4b80318c8f10f94e6c898c67659ca6/index.js#L30-L33 explains it possibly. + return isEmpty(val) ? "" : val; + } + + set secret(value: string) { + setEncryptedColumn(this, "secret", value); + } + // associations @BelongsTo(() => User, "createdById") @@ -87,12 +109,19 @@ class WebhookSubscription extends ParanoidModel { * Disables the webhook subscription * * @param options Save options - * @returns Promise + * @returns Promise */ public async disable(options?: SaveOptions) { return this.update({ enabled: false }, options); } + /** + * Determines if an event should be processed for this webhook subscription + * based on the event configuration. + * + * @param event Event to ceck + * @returns true if event is valid + */ public validForEvent = (event: Event): bool => { if (this.events.length === 1 && this.events[0] === "*") { return true; @@ -106,6 +135,28 @@ class WebhookSubscription extends ParanoidModel { return false; }; + + /** + * Calculates the signature for a webhook payload if the webhook subscription + * has an associated secret stored. + * + * @param payload The text payload of a webhook delivery + * @returns the signature as a string + */ + public signature = (payload: string) => { + if (isEmpty(this.secret)) { + return; + } + + const signTimestamp = Date.now(); + + const signature = crypto + .createHmac("sha256", this.secret) + .update(`${signTimestamp}.${payload}`) + .digest("hex"); + + return `t=${signTimestamp},s=${signature}`; + }; } export default WebhookSubscription; diff --git a/server/models/helpers/DocumentHelper.test.ts b/server/models/helpers/DocumentHelper.test.ts new file mode 100644 index 000000000..4fe08379d --- /dev/null +++ b/server/models/helpers/DocumentHelper.test.ts @@ -0,0 +1,83 @@ +import Revision from "@server/models/Revision"; +import DocumentHelper from "./DocumentHelper"; + +describe("toEmailDiff", () => { + test("toEmailDiff", () => { + const before = new Revision({ + title: "Title", + text: ` +This is a test paragraph + +- list item 1 +- list item 2 + +:::info +Content in an info block +::: + +!!This is a placeholder!! + +==this is a highlight== + +- [ ] checklist item 1 +- [ ] checklist item 2 +- [x] checklist item 3 + +same on both sides + +same on both sides + +same on both sides`, + }); + + const after = new Revision({ + title: "Title", + text: ` +This is a test paragraph + +A new paragraph + +- list item 1 + +This is a new paragraph. + +!!This is a placeholder!! + +==this is a highlight== + +- [x] checklist item 1 +- [x] checklist item 2 +- [ ] checklist item 3 +- [ ] checklist item 4 +- [x] checklist item 5 + +same on both sides + +same on both sides + +same on both sides`, + }); + + const html = DocumentHelper.toEmailDiff(before, after); + + // marks breaks in diff + expect(html).toContain("diff-context-break"); + + // changed list + expect(html).toContain("checklist item 1"); + expect(html).toContain("checklist item 5"); + + // added + expect(html).toContain("A new paragraph"); + + // Retained for context above added paragraph + expect(html).toContain("This is a test paragraph"); + + // removed + expect(html).toContain("Content in an info block"); + + // unchanged + expect(html).not.toContain("same on both sides"); + expect(html).not.toContain("this is a highlight"); + }); +}); diff --git a/server/models/helpers/DocumentHelper.tsx b/server/models/helpers/DocumentHelper.tsx index efc0688eb..3c3eda484 100644 --- a/server/models/helpers/DocumentHelper.tsx +++ b/server/models/helpers/DocumentHelper.tsx @@ -3,6 +3,7 @@ import { yDocToProsemirrorJSON, } from "@getoutline/y-prosemirror"; import { JSDOM } from "jsdom"; +import { escapeRegExp } from "lodash"; import diff from "node-htmldiff"; import { Node, DOMSerializer } from "prosemirror-model"; import * as React from "react"; @@ -18,12 +19,17 @@ import { parser, schema } from "@server/editor"; import Logger from "@server/logging/Logger"; import Document from "@server/models/Document"; import type Revision from "@server/models/Revision"; +import parseAttachmentIds from "@server/utils/parseAttachmentIds"; +import { getSignedUrl } from "@server/utils/s3"; +import Attachment from "../Attachment"; type HTMLOptions = { /** Whether to include the document title in the generated HTML (defaults to true) */ includeTitle?: boolean; /** Whether to include style tags in the generated HTML (defaults to true) */ includeStyles?: boolean; + /** Whether to include styles to center diff (defaults to true) */ + centered?: boolean; }; export default class DocumentHelper { @@ -73,11 +79,13 @@ export default class DocumentHelper { const sheet = new ServerStyleSheet(); let html, styleTags; - const Centered = styled.article` - max-width: 46em; - margin: 0 auto; - padding: 0 1em; - `; + const Centered = options?.centered + ? styled.article` + max-width: 46em; + margin: 0 auto; + padding: 0 1em; + ` + : "article"; const rtl = isRTL(document.title); const children = ( @@ -142,7 +150,7 @@ export default class DocumentHelper { } /** - * Generates a HTML diff between after documents or revisions. + * Generates a HTML diff between documents or revisions. * * @param before The before document * @param after The after document @@ -172,12 +180,133 @@ export default class DocumentHelper { // Inject the diffed content into the original document with styling and // serialize back to a string. - beforeDOM.window.document.getElementsByTagName( - "article" - )[0].innerHTML = diffedContentAsHTML; + const article = beforeDOM.window.document.querySelector("article"); + if (article) { + article.innerHTML = diffedContentAsHTML; + } return beforeDOM.serialize(); } + /** + * Generates a compact HTML diff between documents or revisions, the + * diff is reduced up to show only the parts of the document that changed and + * the immediate context. Breaks in the diff are denoted with + * "div.diff-context-break" nodes. + * + * @param before The before document + * @param after The after document + * @param options Options passed to HTML generation + * @returns The diff as a HTML string + */ + static toEmailDiff( + before: Document | Revision | null, + after: Revision, + options?: HTMLOptions + ) { + if (!before) { + return ""; + } + + const html = DocumentHelper.diff(before, after, options); + const dom = new JSDOM(html); + const doc = dom.window.document; + + const containsDiffElement = (node: Element | null) => { + return node && node.innerHTML.includes("data-operation-index"); + }; + + // We use querySelectorAll to get a static NodeList as we'll be modifying + // it as we iterate, rather than getting content.childNodes. + const contents = doc.querySelectorAll("#content > *"); + let previousNodeRemoved = false; + let previousDiffClipped = false; + + const br = doc.createElement("div"); + br.innerHTML = "…"; + br.className = "diff-context-break"; + + for (const childNode of contents) { + // If the block node contains a diff tag then we want to keep it + if (containsDiffElement(childNode as Element)) { + if (previousNodeRemoved && previousDiffClipped) { + childNode.parentElement?.insertBefore(br.cloneNode(true), childNode); + } + previousNodeRemoved = false; + previousDiffClipped = true; + + // If the block node does not contain a diff tag and the previous + // block node did not contain a diff tag then remove the previous. + } else { + if ( + childNode.nodeName === "P" && + childNode.textContent && + childNode.nextElementSibling?.nodeName === "P" && + containsDiffElement(childNode.nextElementSibling) + ) { + if (previousDiffClipped) { + childNode.parentElement?.insertBefore( + br.cloneNode(true), + childNode + ); + } + previousNodeRemoved = false; + continue; + } + if ( + childNode.nodeName === "P" && + childNode.textContent && + childNode.previousElementSibling?.nodeName === "P" && + containsDiffElement(childNode.previousElementSibling) + ) { + previousNodeRemoved = false; + continue; + } + previousNodeRemoved = true; + childNode.remove(); + } + } + + const head = doc.querySelector("head"); + const body = doc.querySelector("body"); + return `${head?.innerHTML} ${body?.innerHTML}`; + } + + /** + * Converts attachment urls in documents to signed equivalents that allow + * direct access without a session cookie + * + * @param text The text either html or markdown which contains urls to be converted + * @param teamId The team context + * @param expiresIn The time that signed urls should expire in (ms) + * @returns The replaced text + */ + static async attachmentsToSignedUrls( + text: string, + teamId: string, + expiresIn = 3000 + ) { + const attachmentIds = parseAttachmentIds(text); + await Promise.all( + attachmentIds.map(async (id) => { + const attachment = await Attachment.findOne({ + where: { + id, + teamId, + }, + }); + + if (attachment) { + const signedUrl = await getSignedUrl(attachment.key, expiresIn); + text = text.replace( + new RegExp(escapeRegExp(attachment.redirectUrl), "g"), + signedUrl + ); + } + }) + ); + return text; + } + /** * Applies the given Markdown to the document, this essentially creates a * single change in the collaborative state that makes all the edits to get diff --git a/server/presenters/document.ts b/server/presenters/document.ts index 59d9d734b..67402206b 100644 --- a/server/presenters/document.ts +++ b/server/presenters/document.ts @@ -1,35 +1,12 @@ -import { escapeRegExp } from "lodash"; import { APM } from "@server/logging/tracing"; import { Document } from "@server/models"; -import Attachment from "@server/models/Attachment"; -import parseAttachmentIds from "@server/utils/parseAttachmentIds"; -import { getSignedUrl } from "@server/utils/s3"; +import DocumentHelper from "@server/models/helpers/DocumentHelper"; import presentUser from "./user"; type Options = { isPublic?: boolean; }; -// replaces attachments.redirect urls with signed/authenticated url equivalents -async function replaceImageAttachments(text: string) { - const attachmentIds = parseAttachmentIds(text); - await Promise.all( - attachmentIds.map(async (id) => { - const attachment = await Attachment.findByPk(id); - - if (attachment) { - const signedUrl = await getSignedUrl(attachment.key, 3600); - text = text.replace( - new RegExp(escapeRegExp(attachment.redirectUrl), "g"), - signedUrl - ); - } - }) - ); - - return text; -} - async function present( document: Document, options: Options | null | undefined = {} @@ -40,7 +17,10 @@ async function present( }; await document.migrateVersion(); const text = options.isPublic - ? await replaceImageAttachments(document.text) + ? await DocumentHelper.attachmentsToSignedUrls( + document.text, + document.teamId + ) : document.text; const data: Record = { diff --git a/server/presenters/webhookSubscription.ts b/server/presenters/webhookSubscription.ts index d1cf73995..1b74c83d9 100644 --- a/server/presenters/webhookSubscription.ts +++ b/server/presenters/webhookSubscription.ts @@ -5,6 +5,7 @@ export default function present(webhook: WebhookSubscription) { id: webhook.id, name: webhook.name, url: webhook.url, + secret: webhook.secret, events: webhook.events, enabled: webhook.enabled, createdAt: webhook.createdAt, diff --git a/server/queues/processors/DebounceProcessor.ts b/server/queues/processors/DebounceProcessor.ts index 393636a54..13f2dc75b 100644 --- a/server/queues/processors/DebounceProcessor.ts +++ b/server/queues/processors/DebounceProcessor.ts @@ -18,7 +18,7 @@ export default class DebounceProcessor extends BaseProcessor { { // speed up revision creation in development, we don't have all the // time in the world. - delay: (env.ENVIRONMENT === "development" ? 1 : 5) * 60 * 1000, + delay: (env.ENVIRONMENT === "development" ? 0.5 : 5) * 60 * 1000, } ); break; diff --git a/server/queues/processors/NotificationsProcessor.test.ts b/server/queues/processors/NotificationsProcessor.test.ts index f040a57e9..582690eb9 100644 --- a/server/queues/processors/NotificationsProcessor.test.ts +++ b/server/queues/processors/NotificationsProcessor.test.ts @@ -5,6 +5,7 @@ import { Subscription, Event, Notification, + Revision, } from "@server/models"; import { buildDocument, @@ -156,6 +157,7 @@ describe("documents.publish", () => { describe("revisions.create", () => { test("should send a notification to other collaborators", async () => { const document = await buildDocument(); + const revision = await Revision.createFromDocument(document); const collaborator = await buildUser({ teamId: document.teamId }); document.collaboratorIds = [collaborator.id]; await document.save(); @@ -171,7 +173,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator.id, - modelId: document.id, + modelId: revision.id, ip, }); expect(DocumentNotificationEmail.schedule).toHaveBeenCalled(); @@ -179,6 +181,7 @@ describe("revisions.create", () => { test("should not send a notification if viewed since update", async () => { const document = await buildDocument(); + const revision = await Revision.createFromDocument(document); const collaborator = await buildUser({ teamId: document.teamId }); document.collaboratorIds = [collaborator.id]; await document.save(); @@ -196,7 +199,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator.id, - modelId: document.id, + modelId: revision.id, ip, }); expect(DocumentNotificationEmail.schedule).not.toHaveBeenCalled(); @@ -208,6 +211,7 @@ describe("revisions.create", () => { teamId: user.teamId, lastModifiedById: user.id, }); + const revision = await Revision.createFromDocument(document); await NotificationSetting.create({ userId: user.id, teamId: user.teamId, @@ -220,7 +224,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: user.id, - modelId: document.id, + modelId: revision.id, ip, }); expect(DocumentNotificationEmail.schedule).not.toHaveBeenCalled(); @@ -228,6 +232,7 @@ describe("revisions.create", () => { test("should send a notification for subscriptions, even to collaborator", async () => { const document = await buildDocument(); + const revision = await Revision.createFromDocument(document); const collaborator = await buildUser({ teamId: document.teamId }); const subscriber = await buildUser({ teamId: document.teamId }); @@ -256,7 +261,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator.id, - modelId: document.id, + modelId: revision.id, ip, }); @@ -268,6 +273,7 @@ describe("revisions.create", () => { const collaborator1 = await buildUser({ teamId: collaborator0.teamId }); const collaborator2 = await buildUser({ teamId: collaborator0.teamId }); const document = await buildDocument({ userId: collaborator0.id }); + const revision = await Revision.createFromDocument(document); await document.update({ collaboratorIds: [collaborator0.id, collaborator1.id, collaborator2.id], @@ -281,7 +287,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator0.id, - modelId: document.id, + modelId: revision.id, ip, }); @@ -312,6 +318,7 @@ describe("revisions.create", () => { teamId: collaborator0.teamId, userId: collaborator0.id, }); + const revision = await Revision.createFromDocument(document); await document.update({ collaboratorIds: [collaborator0.id, collaborator1.id, collaborator2.id], @@ -338,7 +345,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator0.id, - modelId: document.id, + modelId: revision.id, ip, }); @@ -355,6 +362,7 @@ describe("revisions.create", () => { teamId: collaborator0.teamId, userId: collaborator0.id, }); + const revision = await Revision.createFromDocument(document); await document.update({ collaboratorIds: [collaborator0.id, collaborator1.id, collaborator2.id], @@ -378,7 +386,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator0.id, - modelId: document.id, + modelId: revision.id, ip, }); @@ -406,6 +414,7 @@ describe("revisions.create", () => { const document = await buildDocument(); const collaborator = await buildUser({ teamId: document.teamId }); const subscriber = await buildUser({ teamId: document.teamId }); + const revision = await Revision.createFromDocument(document); // `subscriber` hasn't collaborated on `document`. document.collaboratorIds = [collaborator.id]; @@ -435,7 +444,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator.id, - modelId: document.id, + modelId: revision.id, ip, }); @@ -444,6 +453,7 @@ describe("revisions.create", () => { test("should not send a notification for subscriptions to collaborators if unsubscribed", async () => { const document = await buildDocument(); + const revision = await Revision.createFromDocument(document); const collaborator = await buildUser({ teamId: document.teamId }); const subscriber = await buildUser({ teamId: document.teamId }); @@ -477,7 +487,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator.id, - modelId: document.id, + modelId: revision.id, ip, }); @@ -487,6 +497,7 @@ describe("revisions.create", () => { test("should not send a notification for subscriptions to members outside of the team", async () => { const document = await buildDocument(); + const revision = await Revision.createFromDocument(document); const collaborator = await buildUser({ teamId: document.teamId }); // `subscriber` *does not* belong @@ -523,7 +534,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator.id, - modelId: document.id, + modelId: revision.id, ip, }); @@ -533,6 +544,7 @@ describe("revisions.create", () => { test("should not send a notification if viewed since update", async () => { const document = await buildDocument(); + const revision = await Revision.createFromDocument(document); const collaborator = await buildUser({ teamId: document.teamId }); document.collaboratorIds = [collaborator.id]; await document.save(); @@ -551,7 +563,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: collaborator.id, - modelId: document.id, + modelId: revision.id, ip, }); expect(DocumentNotificationEmail.schedule).not.toHaveBeenCalled(); @@ -563,6 +575,8 @@ describe("revisions.create", () => { teamId: user.teamId, lastModifiedById: user.id, }); + const revision = await Revision.createFromDocument(document); + await NotificationSetting.create({ userId: user.id, teamId: user.teamId, @@ -575,7 +589,7 @@ describe("revisions.create", () => { collectionId: document.collectionId, teamId: document.teamId, actorId: user.id, - modelId: document.id, + modelId: revision.id, ip, }); expect(DocumentNotificationEmail.schedule).not.toHaveBeenCalled(); diff --git a/server/queues/processors/NotificationsProcessor.ts b/server/queues/processors/NotificationsProcessor.ts index 1be7728bc..2f7df8c18 100644 --- a/server/queues/processors/NotificationsProcessor.ts +++ b/server/queues/processors/NotificationsProcessor.ts @@ -5,6 +5,7 @@ import subscriptionCreator from "@server/commands/subscriptionCreator"; import { sequelize } from "@server/database/sequelize"; import CollectionNotificationEmail from "@server/emails/templates/CollectionNotificationEmail"; import DocumentNotificationEmail from "@server/emails/templates/DocumentNotificationEmail"; +import env from "@server/env"; import Logger from "@server/logging/Logger"; import { View, @@ -15,7 +16,9 @@ import { NotificationSetting, Subscription, Notification, + Revision, } from "@server/models"; +import DocumentHelper from "@server/models/helpers/DocumentHelper"; import { CollectionEvent, RevisionEvent, @@ -34,9 +37,9 @@ export default class NotificationsProcessor extends BaseProcessor { async perform(event: Event) { switch (event.name) { case "documents.publish": + return this.documentPublished(event); case "revisions.create": - return this.documentUpdated(event); - + return this.revisionCreated(event); case "collections.create": return this.collectionCreated(event); @@ -44,10 +47,13 @@ export default class NotificationsProcessor extends BaseProcessor { } } - async documentUpdated(event: DocumentEvent | RevisionEvent) { + async documentPublished(event: DocumentEvent) { // never send notifications when batch importing documents - // @ts-expect-error ts-migrate(2339) FIXME: Property 'data' does not exist on type 'DocumentEv... Remove this comment to see the full error message - if (event.data?.source === "import") { + if ( + "data" in event && + "source" in event.data && + event.data.source === "import" + ) { return; } @@ -65,9 +71,7 @@ export default class NotificationsProcessor extends BaseProcessor { const recipients = await this.getDocumentNotificationRecipients( document, - event.name === "documents.publish" - ? "documents.publish" - : "documents.update" + "documents.publish" ); for (const recipient of recipients) { @@ -84,8 +88,7 @@ export default class NotificationsProcessor extends BaseProcessor { await DocumentNotificationEmail.schedule( { to: recipient.user.email, - eventName: - event.name === "documents.publish" ? "published" : "updated", + eventName: "published", documentId: document.id, teamUrl: team.url, actorName: document.updatedBy.name, @@ -98,6 +101,66 @@ export default class NotificationsProcessor extends BaseProcessor { } } + async revisionCreated(event: RevisionEvent) { + const [collection, document, revision, team] = await Promise.all([ + Collection.findByPk(event.collectionId), + Document.findByPk(event.documentId), + Revision.findByPk(event.modelId), + Team.findByPk(event.teamId), + ]); + + if (!document || !team || !revision || !collection) { + return; + } + + await this.createDocumentSubscriptions(document, event); + + const recipients = await this.getDocumentNotificationRecipients( + document, + "documents.update" + ); + + // generate the diff html for the email + const before = await revision.previous(); + let content = DocumentHelper.toEmailDiff(before, revision, { + includeTitle: false, + centered: false, + }); + content = await DocumentHelper.attachmentsToSignedUrls( + content, + event.teamId, + 86400 * 4 + ); + + for (const recipient of recipients) { + const notify = await this.shouldNotify(document, recipient.user); + + if (notify) { + const notification = await Notification.create({ + event: event.name, + userId: recipient.user.id, + actorId: document.updatedBy.id, + teamId: team.id, + documentId: document.id, + }); + + await DocumentNotificationEmail.schedule( + { + to: recipient.user.email, + eventName: "updated", + documentId: document.id, + teamUrl: team.url, + actorName: document.updatedBy.name, + collectionName: collection.name, + unsubscribeUrl: recipient.unsubscribeUrl, + content, + }, + { notificationId: notification.id } + ); + } + } + } + async collectionCreated(event: CollectionEvent) { const collection = await Collection.scope("withUser").findByPk( event.collectionId @@ -263,7 +326,18 @@ export default class NotificationsProcessor extends BaseProcessor { }); if (notification) { - return false; + if (env.ENVIRONMENT === "development") { + Logger.info( + "processor", + `would have suppressed notification to ${user.id}, but not in development` + ); + } else { + Logger.info( + "processor", + `suppressing notification to ${user.id} as recently notified` + ); + return false; + } } // If this recipient has viewed the document since the last update was made diff --git a/server/queues/tasks/DeliverWebhookTask.test.ts b/server/queues/tasks/DeliverWebhookTask.test.ts index a9ea6f0bc..f22214892 100644 --- a/server/queues/tasks/DeliverWebhookTask.test.ts +++ b/server/queues/tasks/DeliverWebhookTask.test.ts @@ -70,6 +70,33 @@ describe("DeliverWebhookTask", () => { expect(delivery.responseBody).toEqual("SUCCESS"); }); + test("should hit the subscription url with signature header", async () => { + const subscription = await buildWebhookSubscription({ + url: "http://example.com", + events: ["*"], + secret: "secret", + }); + const signedInUser = await buildUser({ teamId: subscription.teamId }); + const processor = new DeliverWebhookTask(); + + const event: UserEvent = { + name: "users.signin", + userId: signedInUser.id, + teamId: subscription.teamId, + actorId: signedInUser.id, + ip, + }; + await processor.perform({ + subscriptionId: subscription.id, + event, + }); + + const headers = fetchMock.mock.calls[0]![1]!.headers!; + + expect(fetchMock).toHaveBeenCalledTimes(1); + expect(headers["Outline-Signature"]).toMatch(/^t=[0-9]+,s=[a-z0-9]+$/); + }); + test("should hit the subscription url when the eventing model doesn't exist", async () => { const subscription = await buildWebhookSubscription({ url: "http://example.com", diff --git a/server/queues/tasks/DeliverWebhookTask.ts b/server/queues/tasks/DeliverWebhookTask.ts index 7a98f0594..49032af4e 100644 --- a/server/queues/tasks/DeliverWebhookTask.ts +++ b/server/queues/tasks/DeliverWebhookTask.ts @@ -209,12 +209,20 @@ export default class DeliverWebhookTask extends BaseTask { paranoid: false, }); + let data = null; + if (model) { + data = { + ...presentWebhookSubscription(model), + secret: undefined, + }; + } + await this.sendWebhook({ event, subscription, payload: { id: event.modelId, - model: model && presentWebhookSubscription(model), + model: data, }, }); } @@ -540,6 +548,12 @@ export default class DeliverWebhookTask extends BaseTask { env.VERSION ? `/${env.VERSION.slice(0, 7)}` : "" }`, }; + + const signature = subscription.signature(JSON.stringify(requestBody)); + if (signature) { + requestHeaders["Outline-Signature"] = signature; + } + response = await fetch(subscription.url, { method: "POST", headers: requestHeaders, diff --git a/server/routes/api/webhookSubscriptions.ts b/server/routes/api/webhookSubscriptions.ts index 71753935e..5cf7883d9 100644 --- a/server/routes/api/webhookSubscriptions.ts +++ b/server/routes/api/webhookSubscriptions.ts @@ -1,5 +1,5 @@ import Router from "koa-router"; -import { compact } from "lodash"; +import { compact, isEmpty } from "lodash"; import { ValidationError } from "@server/errors"; import auth from "@server/middlewares/authentication"; import { WebhookSubscription, Event } from "@server/models"; @@ -41,7 +41,7 @@ router.post( const { user } = ctx.state; authorize(user, "createWebhookSubscription", user.team); - const { name, url } = ctx.request.body; + const { name, url, secret } = ctx.request.body; const events: string[] = compact(ctx.request.body.events); assertPresent(name, "name is required"); assertPresent(url, "url is required"); @@ -57,6 +57,7 @@ router.post( teamId: user.teamId, url, enabled: true, + secret: isEmpty(secret) ? undefined : secret, }); const event: WebhookSubscriptionEvent = { @@ -116,7 +117,7 @@ router.post( assertUuid(id, "id is required"); const { user } = ctx.state; - const { name, url } = ctx.request.body; + const { name, url, secret } = ctx.request.body; const events: string[] = compact(ctx.request.body.events); assertPresent(name, "name is required"); assertPresent(url, "url is required"); @@ -129,7 +130,13 @@ router.post( authorize(user, "update", webhookSubscription); - await webhookSubscription.update({ name, url, events, enabled: true }); + await webhookSubscription.update({ + name, + url, + events, + enabled: true, + secret: isEmpty(secret) ? undefined : secret, + }); const event: WebhookSubscriptionEvent = { name: "webhook_subscriptions.update", diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts index 908894dd6..3d6f1adf0 100644 --- a/shared/editor/components/Styles.ts +++ b/shared/editor/components/Styles.ts @@ -1035,7 +1035,7 @@ table { } th { - background: ${props.theme.tableHeaderBackground}; + background: transparent; } td, @@ -1284,6 +1284,10 @@ del { text-decoration: strikethrough; } +del img { + opacity: .5; +} + @media print { .placeholder:before, .block-menu-trigger, diff --git a/shared/i18n/locales/da_DK/translation.json b/shared/i18n/locales/da_DK/translation.json index 8fc0312e3..e996d50a5 100644 --- a/shared/i18n/locales/da_DK/translation.json +++ b/shared/i18n/locales/da_DK/translation.json @@ -50,6 +50,7 @@ "Trash": "Trash", "Settings": "Settings", "Profile": "Profile", + "Preferences": "Preferences", "API documentation": "API documentation", "Send us feedback": "Send us feedback", "Report a bug": "Report a bug", @@ -519,7 +520,6 @@ "Toggle navigation": "Toggle navigation", "Focus search input": "Focus search input", "Open this guide": "Open this guide", - "Save document and exit": "Save document and exit", "Publish document and exit": "Publish document and exit", "Save document": "Save document", "Cancel editing": "Cancel editing", @@ -683,17 +683,19 @@ "Email address": "Email address", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.", + "Preferences saved": "Preferences saved", + "Delete account": "Delete account", + "Language": "Language", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "You may delete your account at any time, note that this is unrecoverable", "Profile saved": "Profile saved", "Profile picture updated": "Profile picture updated", "Unable to upload new profile picture": "Unable to upload new profile picture", "Photo": "Photo", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "Language", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Delete Account", - "You may delete your account at any time, note that this is unrecoverable": "You may delete your account at any time, note that this is unrecoverable", - "Delete account": "Delete account", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/de_DE/translation.json b/shared/i18n/locales/de_DE/translation.json index 7f2131e61..039f525e1 100644 --- a/shared/i18n/locales/de_DE/translation.json +++ b/shared/i18n/locales/de_DE/translation.json @@ -50,6 +50,7 @@ "Trash": "Papierkorb", "Settings": "Einstellungen", "Profile": "Profil", + "Preferences": "Preferences", "API documentation": "API Dokumentation", "Send us feedback": "Schicken Sie uns Feedback", "Report a bug": "Ein technischer Fehler melden", @@ -519,7 +520,6 @@ "Toggle navigation": "Navigation ausblenden", "Focus search input": "Fokussiere Suchergebnis", "Open this guide": "Diese Anleitung öffnen", - "Save document and exit": "Dokument speichern & schließen", "Publish document and exit": "Dokument veröffentlichen & schließen", "Save document": "Dokument speichern", "Cancel editing": "Bearbeitung abbrechen", @@ -683,17 +683,19 @@ "Email address": "E-Mail Adresse", "Your email address should be updated in your SSO provider.": "Ihre E-Mail-Adresse sollte in Ihrem SSO-Anbieter aktualisiert werden.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "Die E-Mail-Integration ist derzeit deaktiviert. Legen Sie die zugehörigen Umgebungsvariablen fest und starten Sie den Server neu, um Benachrichtigungen zu aktivieren.", + "Preferences saved": "Preferences saved", + "Delete account": "Konto löschen", + "Language": "Sprache", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Sie können Ihren Account jederzeit löschen, beachten Sie, dass dies nicht wiederhergestellt werden kann", "Profile saved": "Profil gespeichert", "Profile picture updated": "Profilbild wurde aktualisiert", "Unable to upload new profile picture": "Neues Profilbild kann nicht hochgeladen werden", "Photo": "Foto", "Choose a photo or image to represent yourself.": "Wählen Sie ein Foto oder Bild, um sich selbst darzustellen.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "Dies kann Ihr richtiger Name oder ein Spitzname sein — wie auch immer Sie durch andere Personen angesprochen werden möchten.", - "Language": "Sprache", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Bitte beachten Sie, dass Übersetzungen derzeit in einer Test Phase sind. Community-Beiträge werden über unser <2> Übersetzungsportal akzeptiert akzeptiert.", - "Delete Account": "Konto löschen", - "You may delete your account at any time, note that this is unrecoverable": "Sie können Ihren Account jederzeit löschen, beachten Sie, dass dies nicht wiederhergestellt werden kann", - "Delete account": "Konto löschen", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "Ich bin sicher", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/en_US/translation.json b/shared/i18n/locales/en_US/translation.json index 3582ba2ce..a82b5e034 100644 --- a/shared/i18n/locales/en_US/translation.json +++ b/shared/i18n/locales/en_US/translation.json @@ -619,7 +619,11 @@ "Updating": "Updating", "Provide a descriptive name for this webhook and the URL we should send a POST request to when matching events are created.": "Provide a descriptive name for this webhook and the URL we should send a POST request to when matching events are created.", "Subscribe to all events, groups, or individual events. We recommend only subscribing to the minimum amount of events that your application needs to function.": "Subscribe to all events, groups, or individual events. We recommend only subscribing to the minimum amount of events that your application needs to function.", + "A memorable identifer": "A memorable identifer", "URL": "URL", + "Secret": "Secret", + "Optional": "Optional", + "Used to sign payload": "Used to sign payload", "All events": "All events", "All {{ groupName }} events": "All {{ groupName }} events", "Delete webhook": "Delete webhook", diff --git a/shared/i18n/locales/es_ES/translation.json b/shared/i18n/locales/es_ES/translation.json index d64dbdb19..14a2cbf7b 100644 --- a/shared/i18n/locales/es_ES/translation.json +++ b/shared/i18n/locales/es_ES/translation.json @@ -50,6 +50,7 @@ "Trash": "Papelera", "Settings": "Configuración", "Profile": "Perfil", + "Preferences": "Preferences", "API documentation": "Documentación de la API", "Send us feedback": "Envíenos sus comentarios", "Report a bug": "Reportar un error", @@ -519,7 +520,6 @@ "Toggle navigation": "Abrir/cerrar navegación", "Focus search input": "Enfocar la entrada de búsqueda", "Open this guide": "Abra esta guía", - "Save document and exit": "Guardar documento y salir", "Publish document and exit": "Publicar documento y salir", "Save document": "Guardar documento", "Cancel editing": "Cancelar edición", @@ -683,17 +683,19 @@ "Email address": "Correo electrónico", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "La integración de correo electrónico está actualmente deshabilitada. Configura las variables de entorno asociadas y reinicia el servidor para habilitar las notificaciones.", + "Preferences saved": "Preferences saved", + "Delete account": "Eliminar cuenta", + "Language": "Idioma", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Puede eliminar su cuenta en cualquier momento, tenga en cuenta que esto es irréversible", "Profile saved": "Perfil guardado", "Profile picture updated": "Foto de perfil guardada", "Unable to upload new profile picture": "No se puede subir una nueva foto de perfil", "Photo": "Foto", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "Idioma", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Eliminar cuenta", - "You may delete your account at any time, note that this is unrecoverable": "Puede eliminar su cuenta en cualquier momento, tenga en cuenta que esto es irréversible", - "Delete account": "Eliminar cuenta", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/fa_IR/translation.json b/shared/i18n/locales/fa_IR/translation.json index 13a9e6729..49419de9e 100644 --- a/shared/i18n/locales/fa_IR/translation.json +++ b/shared/i18n/locales/fa_IR/translation.json @@ -50,6 +50,7 @@ "Trash": "زباله‌دان", "Settings": "تنظیمات", "Profile": "پروفایل", + "Preferences": "Preferences", "API documentation": "مستندات API", "Send us feedback": "ارسال بازخورد", "Report a bug": "گزارش مشکل", @@ -519,7 +520,6 @@ "Toggle navigation": "گزینه‌های پیمایش", "Focus search input": "انتخاب ورودی جستجو", "Open this guide": "باز کردن این راهنما", - "Save document and exit": "ذخیره سند و خروج", "Publish document and exit": "انتشار سند و خروج", "Save document": "ذخیره سند", "Cancel editing": "لغو ویرایش", @@ -683,17 +683,19 @@ "Email address": "آدرس ایمیل", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "ادغام ایمیلی غیرفعال است. لطفاً متغیرهای محیطی مربوطه را تنظیم کرده و سرور را دوباره راه‌اندازی کنید تا اعلان‌ها را فعال کنید.", + "Preferences saved": "Preferences saved", + "Delete account": "حذف حساب", + "Language": "زبان", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "همیشه می‌توانید حساب‌تان را حذف کنید، ولی توجه داشته باشید که این عملیات قابل بازگشت نیست", "Profile saved": "پروفایل ذخیره شد", "Profile picture updated": "تصویر پروفایل به‌روز شد", "Unable to upload new profile picture": "امکان بارگذاری تصویر جدید پروفایل وجود نداشت", "Photo": "عکس", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "زبان", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "حذف حساب", - "You may delete your account at any time, note that this is unrecoverable": "همیشه می‌توانید حساب‌تان را حذف کنید، ولی توجه داشته باشید که این عملیات قابل بازگشت نیست", - "Delete account": "حذف حساب", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/fr_FR/translation.json b/shared/i18n/locales/fr_FR/translation.json index 179d4d732..de88f8753 100644 --- a/shared/i18n/locales/fr_FR/translation.json +++ b/shared/i18n/locales/fr_FR/translation.json @@ -50,6 +50,7 @@ "Trash": "Corbeille", "Settings": "Paramètres", "Profile": "Profil", + "Preferences": "Préférences", "API documentation": "Documentation de l'API", "Send us feedback": "Donnez-nous votre avis", "Report a bug": "Signaler un bug", @@ -81,7 +82,7 @@ "previously edited": "modifié précédemment", "You": "Vous", "Viewers": "Lecteurs", - "I’m sure – Delete": "Je suis sûr.e – Supprimer", + "I’m sure – Delete": "Je suis sûr – Supprimer", "Deleting": "Suppression", "Are you sure about that? Deleting the {{collectionName}} collection is permanent and cannot be restored, however documents within will be moved to the trash.": "La suppression de la collection {{collectionName}} sera permanente et celle-ci ne pourra pas être restaurée. Néanmoins, les documents qu'elle contient seront déplacés vers la corbeille.", "Also, {{collectionName}} is being used as the start view – deleting it will reset the start view to the Home page.": "De plus, la collection {{collectionName}} est affichée par défaut au démarrage - sa suppression réinitialisera la vue de démarrage sur la page d'accueil.", @@ -347,14 +348,14 @@ "Get started by creating a new one!": "Commencez par en créer un nouveau !", "Create a document": "Créer un document", "Manage permissions": "Gérer les permissions", - "{{ usersCount }} users and {{ groupsCount }} groups with access": "{{ usersCount }} user and {{ groupsCount }} groups with access", - "{{ usersCount }} users and {{ groupsCount }} groups with access_plural": "{{ usersCount }} users and {{ groupsCount }} groups with access", - "{{ usersCount }} users and a group have access": "{{ usersCount }} user and a group have access", - "{{ usersCount }} users and a group have access_plural": "{{ usersCount }} users and a group have access", - "{{ usersCount }} users with access": "{{ usersCount }} user with access", - "{{ usersCount }} users with access_plural": "{{ usersCount }} users with access", - "{{ groupsCount }} groups with access": "{{ groupsCount }} group with access", - "{{ groupsCount }} groups with access_plural": "{{ groupsCount }} groups with access", + "{{ usersCount }} users and {{ groupsCount }} groups with access": "{{ usersCount }} utilisateur et {{ groupsCount }} groupes ont accès", + "{{ usersCount }} users and {{ groupsCount }} groups with access_plural": "{{ usersCount }} utilisateurs et {{ groupsCount }} groupes ont accès", + "{{ usersCount }} users and a group have access": "{{ usersCount }} utilisateur et un groupe ont accès", + "{{ usersCount }} users and a group have access_plural": "{{ usersCount }} utilisateurs et un groupe ont accès", + "{{ usersCount }} users with access": "{{ usersCount }} utilisateur a accès", + "{{ usersCount }} users with access_plural": "{{ usersCount }} utilisateurs ont accès", + "{{ groupsCount }} groups with access": "{{ groupsCount }} groupe a accès", + "{{ groupsCount }} groups with access_plural": "{{ groupsCount }} groupes ont accès", "The collection was updated": "La collection a été mise à jour", "You can edit the name and other details at any time, however doing so often might confuse your team mates.": "Vous pouvez modifier le nom et autres détails à tout moment, mais le faire souvent peut perturber les membres de votre équipe.", "Name": "Nom", @@ -510,7 +511,7 @@ "Add another": "En ajouter une autre", "Inviting": "Invitation en cours", "Send Invites": "Envoyer les invitations", - "Open command menu": "Open command menu", + "Open command menu": "Ouvrir le menu contextuel", "Edit current document": "Éditer le document courant", "Move current document": "Déplacer le document courant", "Open document history": "Afficher l'historique du document", @@ -519,7 +520,6 @@ "Toggle navigation": "Basculer la navigation", "Focus search input": "Saisie de recherche précise", "Open this guide": "Ouvrir ce guide", - "Save document and exit": "Enregistrer le document et quitter", "Publish document and exit": "Publier le document et quitter", "Save document": "Enregistrer le document", "Cancel editing": "Annuler l'édition", @@ -683,17 +683,19 @@ "Email address": "Adresse email", "Your email address should be updated in your SSO provider.": "Votre adresse e-mail doit être mise à jour auprès de votre fournisseur de SSO.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "L'intégration des e-mails est actuellement désactivée. Veuillez définir les variables d'environnement associées et redémarrer le serveur pour activer les notifications.", + "Preferences saved": "Préférences enregistrées", + "Delete account": "Supprimer compte", + "Language": "Langue", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choisissez la langue de l'interface. Les traductions de la communauté sont acceptées via notre <2>plateforme de traduction.", + "Remember previous location": "Se souvenir de l'emplacement précédent", + "Automatically return to the document you were last viewing when the app is re-opened.": "Revenir automatiquement au document consulté en dernier lors de la réouverture de l'application.", + "You may delete your account at any time, note that this is unrecoverable": "Vous pouvez supprimer votre compte à tout moment, notez que cela est irrécupérable", "Profile saved": "Profil enregistré", "Profile picture updated": "Photo de profil sauvegardée", "Unable to upload new profile picture": "Impossible d'envoyer la nouvelle photo de profil", "Photo": "Photo", "Choose a photo or image to represent yourself.": "Choisissez une photo ou une image pour vous représenter.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "Il peut s'agir de votre vrai nom ou d'un surnom - selon la façon dont vous aimeriez être désigné.", - "Language": "Langue", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Veuillez noter que les traductions sont encore en phase de développement. Toute aide est bienvenue via notre <2>portail de traduction.", - "Delete Account": "Supprimer le compte", - "You may delete your account at any time, note that this is unrecoverable": "Vous pouvez supprimer votre compte à tout moment, notez que cela est irrécupérable", - "Delete account": "Supprimer compte", "Are you sure you want to require invites?": "Êtes-vous sûr de vouloir exiger des invitations ?", "I’m sure": "Je suis sûr", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "Les nouveaux utilisateurs devront être invités pour pouvoir créer un compte. Le Rôle par défaut et les Domaines autorisés ne s'appliqueront plus.", diff --git a/shared/i18n/locales/id_ID/translation.json b/shared/i18n/locales/id_ID/translation.json index b6746f1dd..83a1e2a5c 100644 --- a/shared/i18n/locales/id_ID/translation.json +++ b/shared/i18n/locales/id_ID/translation.json @@ -1,16 +1,16 @@ { - "Open collection": "Open collection", - "New collection": "New collection", - "Create a collection": "Create a collection", + "Open collection": "Buka koleksi", + "New collection": "Koleksi baru", + "Create a collection": "Buat koleksi", "Edit": "Sunting", - "Edit collection": "Edit collection", - "Permissions": "Permissions", - "Collection permissions": "Collection permissions", - "Star": "Star", - "Unstar": "Unstar", + "Edit collection": "Sunting koleksi", + "Permissions": "Perizinan", + "Collection permissions": "Perizinan koleksi", + "Star": "Bintangi", + "Unstar": "Berhenti membintangi", "Delete IndexedDB cache": "Hapus cache IndexedDB", "IndexedDB cache deleted": "Cache IndexedDB dihapus", - "Developer": "Developer", + "Developer": "Pengembang", "Open document": "Buka dokumen", "New document": "Dokumen baru", "Subscribe": "Subscribe", @@ -32,13 +32,13 @@ "Print": "Cetak", "Print document": "Cetak dokumen", "Import document": "Impor dokumen", - "Templatize": "Templatize", - "Create template": "Create template", - "Open random document": "Open random document", + "Templatize": "Jadikan template", + "Create template": "Buat template", + "Open random document": "Buka dokumen acak", "Search documents for \"{{searchQuery}}\"": "Search documents for \"{{searchQuery}}\"", - "Move": "Move", + "Move": "Pindahkan", "Move {{ documentName }}": "Pindahkan {{ documentName }}", - "Archive": "Archive", + "Archive": "Arsipkan", "Document archived": "Dokumen diarsip", "Delete": "Hapus", "Delete {{ documentName }}": "Hapus {{ documentName }}", @@ -46,14 +46,15 @@ "Permanently delete {{ documentName }}": "Hapus {{ documentName }} secara permanen", "Home": "Beranda", "Drafts": "Draf", - "Templates": "Templates", + "Templates": "Template", "Trash": "Sampah", "Settings": "Pengaturan", "Profile": "Profil", + "Preferences": "Preferensi", "API documentation": "Dokumentasi API", - "Send us feedback": "Send us feedback", + "Send us feedback": "Kirimkan kami masukan", "Report a bug": "Laporkan bug", - "Changelog": "Changelog", + "Changelog": "Catatan perubahan", "Keyboard shortcuts": "Pintasan papan ketik", "Log out": "Keluar", "Restore revision": "Restore revision", @@ -519,7 +520,6 @@ "Toggle navigation": "Toggle navigation", "Focus search input": "Focus search input", "Open this guide": "Open this guide", - "Save document and exit": "Save document and exit", "Publish document and exit": "Publish document and exit", "Save document": "Simpan dokumen", "Cancel editing": "Batalkan penyuntingan", @@ -683,17 +683,19 @@ "Email address": "Alamat surel", "Your email address should be updated in your SSO provider.": "Alamat surel Anda harus diperbarui di penyedia SSO Anda.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.", + "Preferences saved": "Preferences saved", + "Delete account": "Hapus akun", + "Language": "Bahasa", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Anda dapat menghapus akun Anda kapan saja, namun ingat bahwa ini tidak dapat dibatalkan", "Profile saved": "Profil disimpan", "Profile picture updated": "Gambar profil diperbarui", "Unable to upload new profile picture": "Tidak dapat mengunggah gambar profil baru", "Photo": "Foto", "Choose a photo or image to represent yourself.": "Pilih sebuah foto atau gambar yang mewakili diri Anda.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "Ini bisa berupa nama asli Anda, atau nama panggilan — bagaimanapun Anda ingin orang-orang merujuk Anda.", - "Language": "Bahasa", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Hapus Akun", - "You may delete your account at any time, note that this is unrecoverable": "Anda dapat menghapus akun Anda kapan saja, namun ingat bahwa ini tidak dapat dibatalkan", - "Delete account": "Hapus akun", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/it_IT/translation.json b/shared/i18n/locales/it_IT/translation.json index 9630b4f40..67181f2d9 100644 --- a/shared/i18n/locales/it_IT/translation.json +++ b/shared/i18n/locales/it_IT/translation.json @@ -50,6 +50,7 @@ "Trash": "Cestino", "Settings": "Impostazioni", "Profile": "Profilo", + "Preferences": "Preferences", "API documentation": "Documentazione API", "Send us feedback": "Inviaci il tuo feedback", "Report a bug": "Segnala un bug", @@ -519,7 +520,6 @@ "Toggle navigation": "Toggle navigation", "Focus search input": "Focus search input", "Open this guide": "Apri questa guida", - "Save document and exit": "Save document and exit", "Publish document and exit": "Publish document and exit", "Save document": "Save document", "Cancel editing": "Annulla modifica", @@ -683,17 +683,19 @@ "Email address": "Email address", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.", + "Preferences saved": "Preferences saved", + "Delete account": "Elimina l'account", + "Language": "Lingua", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Puoi cancellare il tuo account in qualsiasi momento, tieni presente che l'eliminazione non è reversibile", "Profile saved": "Profilo salvato", "Profile picture updated": "Immagine del profilo aggiornata", "Unable to upload new profile picture": "Impossibile caricare la foto profilo", "Photo": "Foto", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "Lingua", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Elimina Account", - "You may delete your account at any time, note that this is unrecoverable": "Puoi cancellare il tuo account in qualsiasi momento, tieni presente che l'eliminazione non è reversibile", - "Delete account": "Elimina l'account", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/ja_JP/translation.json b/shared/i18n/locales/ja_JP/translation.json index 45b0b6ddb..c52e467bb 100644 --- a/shared/i18n/locales/ja_JP/translation.json +++ b/shared/i18n/locales/ja_JP/translation.json @@ -50,6 +50,7 @@ "Trash": "ゴミ箱", "Settings": "設定", "Profile": "プロフィール", + "Preferences": "Preferences", "API documentation": "API ドキュメント", "Send us feedback": "フィードバック", "Report a bug": "バグ報告", @@ -519,7 +520,6 @@ "Toggle navigation": "ナビゲーションの切り替え", "Focus search input": "検索窓にフォーカスする", "Open this guide": "ガイドを開く", - "Save document and exit": "ドキュメントを保存して終了", "Publish document and exit": "ドキュメントを公開して終了", "Save document": "ドキュメントを保存", "Cancel editing": "編集をキャンセル", @@ -683,17 +683,19 @@ "Email address": "メールアドレス", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "現在、電子メールとの連携は無効になっています。通知を有効にするためには、関連する環境変数を正しく設定し、サーバーを再起動してください。", + "Preferences saved": "Preferences saved", + "Delete account": "アカウントの削除", + "Language": "言語", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "アカウントはいつでも削除することができます。これは取り返しのつかないことです。", "Profile saved": "プロフィールを保存しました", "Profile picture updated": "プロフィール写真の更新に成功しました。", "Unable to upload new profile picture": "プロフィール写真をアップロードできません。", "Photo": "写真", "Choose a photo or image to represent yourself.": "自分を表現する写真や画像を選んでください。", "This could be your real name, or a nickname — however you’d like people to refer to you.": "本名でもいいし、ニックネームでもいい、人に呼んでもらえるような名前にしましょう。", - "Language": "言語", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "翻訳は現在、早期アクセスであることに注意してください。コミュニティからの投稿は、<2>翻訳ポータルで受け付けています。", - "Delete Account": "アカウントの終了", - "You may delete your account at any time, note that this is unrecoverable": "アカウントはいつでも削除することができます。これは取り返しのつかないことです。", - "Delete account": "アカウントの削除", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "はい、確かです", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/ko_KR/translation.json b/shared/i18n/locales/ko_KR/translation.json index 49845167a..3bdf262b8 100644 --- a/shared/i18n/locales/ko_KR/translation.json +++ b/shared/i18n/locales/ko_KR/translation.json @@ -50,6 +50,7 @@ "Trash": "휴지통", "Settings": "설정", "Profile": "사용자 정보", + "Preferences": "Preferences", "API documentation": "API 문서", "Send us feedback": "의견 보내기", "Report a bug": "버그 신고", @@ -519,7 +520,6 @@ "Toggle navigation": "네비게이션 토글", "Focus search input": "검색창에 포커스", "Open this guide": "이 가이드 열기", - "Save document and exit": "문서를 저장하고 종료", "Publish document and exit": "문서를 저장하고 나가기", "Save document": "문서 저장", "Cancel editing": "변경 취소", @@ -683,17 +683,19 @@ "Email address": "이메일 주소", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.", + "Preferences saved": "Preferences saved", + "Delete account": "계정 삭제", + "Language": "언어", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "계정을 언제든지 삭제할 수 있지만 다시 복구할 수 없습니다", "Profile saved": "프로필이 저장되었습니다", "Profile picture updated": "프로필 사진이 업데이트 됨", "Unable to upload new profile picture": "새 프로필 사진을 업로드 할 수 없습니다", "Photo": "사진", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "언어", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "계정 삭제", - "You may delete your account at any time, note that this is unrecoverable": "계정을 언제든지 삭제할 수 있지만 다시 복구할 수 없습니다", - "Delete account": "계정 삭제", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/nl_NL/translation.json b/shared/i18n/locales/nl_NL/translation.json index 0311feda3..97785360a 100644 --- a/shared/i18n/locales/nl_NL/translation.json +++ b/shared/i18n/locales/nl_NL/translation.json @@ -13,10 +13,10 @@ "Developer": "Ontwikkelaar", "Open document": "Open document", "New document": "Nieuw document", - "Subscribe": "Abonneren", - "Subscribed to document notifications": "Geabonneerd op document notificaties", + "Subscribe": "Abonneer", + "Subscribed to document notifications": "Geabonneerd op documentmeldingen", "Unsubscribe": "Afmelden", - "Unsubscribed from document notifications": "Afgemeld van document notificaties", + "Unsubscribed from document notifications": "Afgemeld van documentmeldingen", "HTML": "HTML", "Markdown": "Markdown", "Download": "Download", @@ -50,6 +50,7 @@ "Trash": "Prullenbak", "Settings": "Instellingen", "Profile": "Profiel", + "Preferences": "Voorkeuren", "API documentation": "API-documentatie", "Send us feedback": "Stuur ons feedback", "Report a bug": "Meld een bug", @@ -95,7 +96,7 @@ "Edits you make will sync once you’re online": "Bewerkingen die je maakt worden gesynchroniseerd zodra je online bent", "Submenu": "Submenu", "Collections could not be loaded, please reload the app": "Collecties konden niet worden geladen, start de app alsjeblieft opnieuw op", - "Default collection": "Standaard verzameling", + "Default collection": "Standaard collectie", "Deleted Collection": "Verwijderde Collectie", "Unpin": "Losmaken", "History": "Geschiedenis", @@ -200,7 +201,7 @@ "Previous page": "Vorige pagina", "Next page": "Volgende pagina", "Account": "Account", - "Notifications": "Notificaties", + "Notifications": "Meldingen", "API Tokens": "API tokens", "Details": "Details", "Team": "Team", @@ -361,7 +362,7 @@ "Sort": "Sorteren", "Saving": "Bezig met opslaan", "Save": "Bewaren", - "Export started. If you have notifications enabled, you will receive an email when it's complete.": "Export is begonnen. Als je notificaties aan hebt staan, zul je een email ontvangen wanneer het afgerond is.", + "Export started. If you have notifications enabled, you will receive an email when it's complete.": "Export is begonnen. Als je meldingen aan hebt staan, zul je een e-mail ontvangen wanneer het is afgerond.", "Exporting the collection {{collectionName}} may take some time.": "De collectie exporteren {{collectionName}} kan tijd kosten.", "Your documents will be a zip of folders with files in Markdown format. Please visit the Export section in Settings to get the zip.": "Uw bestanden zullen in een zip met folders en bestanden bevinden. Alsjeblieft ga naar het Export-gedeelte in de Instellingen om de zip te verkrijgen.", "Exporting": "Exporteren", @@ -519,7 +520,6 @@ "Toggle navigation": "Navigatie in-/uitschakelen", "Focus search input": "Focus op zoekinvoer", "Open this guide": "Open deze gids", - "Save document and exit": "Document opslaan en verlaten", "Publish document and exit": "Document publiceren en verlaten", "Save document": "Document opslaan", "Cancel editing": "Bewerken annuleren", @@ -683,17 +683,19 @@ "Email address": "E-mailadres", "Your email address should be updated in your SSO provider.": "Je e-mailadres moet worden bijgewerkt in je SSO-provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "De e-mailintegratie is momenteel uitgeschakeld. Stel de bijbehorende omgevingsvariabelen in en herstart de server om meldingen in te schakelen.", + "Preferences saved": "Voorkeuren opgeslagen", + "Delete account": "Verwijder account", + "Language": "Taal", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Kies de taal van de interface. Vertalingen vanuit onze community worden geaccepteerd via het <2>vertaalportaal.", + "Remember previous location": "Onthoud vorige locatie", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatisch terugkeren naar het document dat je het laatst hebt bekeken als de app opnieuw wordt geopend.", + "You may delete your account at any time, note that this is unrecoverable": "Je kan jouw account op ieder moment verwijderen. Let op: je account kan niet hersteld worden.", "Profile saved": "Wijzigingen opgeslagen", "Profile picture updated": "Profielfoto gewijzigd", "Unable to upload new profile picture": "Kan nieuwe profielfoto niet uploaden", "Photo": "Profielfoto", "Choose a photo or image to represent yourself.": "Kies een foto of afbeelding om jezelf weer te geven.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "Dit kan je echte naam zijn, of een bijnaam — hoe je ook wilt dat personen naar je verwijzen.", - "Language": "Taal", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Houd er rekening mee dat vertalingen momenteel vervroegde toegang hebben. Bijdragen van de Gemeenschap worden geaccepteerd via onze <2>vertaalportal.", - "Delete Account": "Verwijder account", - "You may delete your account at any time, note that this is unrecoverable": "Je kunt je account op elk moment verwijderen, dit kan niet worden hersteld", - "Delete account": "Account verwijderen", "Are you sure you want to require invites?": "Weet je zeker dat je deze uitnodiging wilt verwijderen?", "I’m sure": "Ik weet het zeker", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "Nieuwe gebruikers moeten eerst worden uitgenodigd om een account aan te maken. Standaard rol en Toegestane domeinen zullen niet langer van toepassing zijn.", @@ -739,8 +741,8 @@ "Trash is empty at the moment.": "Prullenbak is momenteel leeg.", "A confirmation code has been sent to your email address, please enter the code below to permanantly destroy your account.": "Een bevestigingscode is naar je e-mail adres verzonden, voer de code hieronder in om je account permanent te vernietigen.", "Note: Signing back in will cause a new account to be automatically reprovisioned.": "Opmerking: Als je je opnieuw aanmeldt, wordt er automatisch een nieuwe account aangemaakt.", - "Are you sure? Deleting your account will destroy identifying data associated with your user and cannot be undone. You will be immediately logged out of Outline and all your API tokens will be revoked.": "Weet je het zeker? Het verwijderen van je account zal de identificerende data van je gebruiker vernietigen en kan niet ongedaan worden gemaakt. U wordt onmiddellijk uitgelogd bij Outline en al uw API-tokens worden ingetrokken.", - "Delete My Account": "Mijn account verwijderen", + "Are you sure? Deleting your account will destroy identifying data associated with your user and cannot be undone. You will be immediately logged out of Outline and all your API tokens will be revoked.": "Weet je het zeker? Het verwijderen van je account zal de identificerende gegevens van je gebruiker vernietigen en kan niet ongedaan worden gemaakt. Je wordt onmiddellijk uitgelogd bij Outline en al je API-tokens worden ingetrokken.", + "Delete My Account": "Verwijder mijn account", "Profile picture": "Profielfoto", "You joined": "Je toegetreden tot", "Joined": "Lid geworden", diff --git a/shared/i18n/locales/pl_PL/translation.json b/shared/i18n/locales/pl_PL/translation.json index 6f8addddb..63846a41c 100644 --- a/shared/i18n/locales/pl_PL/translation.json +++ b/shared/i18n/locales/pl_PL/translation.json @@ -50,6 +50,7 @@ "Trash": "Kosz", "Settings": "Ustawienia", "Profile": "Profil", + "Preferences": "Preferences", "API documentation": "Dokumentacja API", "Send us feedback": "Prześlij nam swoją opinię", "Report a bug": "Zgłoś błąd", @@ -519,7 +520,6 @@ "Toggle navigation": "Włącz/wyłącz nawigację", "Focus search input": "Podświetl wyniki wyszukiwania", "Open this guide": "Otwórz ten przewodnik", - "Save document and exit": "Zapisz dokument i wyjdź", "Publish document and exit": "Opublikuj dokument i wyjdź", "Save document": "Zapisz dokument", "Cancel editing": "Anuluj edycję", @@ -683,17 +683,19 @@ "Email address": "Adres e-mail", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "Integracja e-mail jest obecnie wyłączona. Ustaw powiązane zmienne środowiskowe i uruchom ponownie serwer, aby włączyć powiadomienia.", + "Preferences saved": "Preferences saved", + "Delete account": "Usuń konto", + "Language": "Język", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Możesz usunąć swoje konto w dowolnym momencie, pamiętaj, że jest to nie do odzyskania", "Profile saved": "Profil został zapisany", "Profile picture updated": "Zaktualizowano zdjęcie profilowe", "Unable to upload new profile picture": "Nie można przesłać nowego zdjęcia profilowego", "Photo": "Zdjęcie", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "Język", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Usuń konto", - "You may delete your account at any time, note that this is unrecoverable": "Możesz usunąć swoje konto w dowolnym momencie, pamiętaj, że jest to nie do odzyskania", - "Delete account": "Usuń konto", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/pt_BR/translation.json b/shared/i18n/locales/pt_BR/translation.json index f728e3a46..ba4f6fcac 100644 --- a/shared/i18n/locales/pt_BR/translation.json +++ b/shared/i18n/locales/pt_BR/translation.json @@ -50,6 +50,7 @@ "Trash": "Lixeira", "Settings": "Configurações", "Profile": "Perfil", + "Preferences": "Preferences", "API documentation": "Documentação da API", "Send us feedback": "Envie-nos a sua opinião", "Report a bug": "Reportar erro", @@ -519,7 +520,6 @@ "Toggle navigation": "Alternar de navegação", "Focus search input": "Focar pesquisa", "Open this guide": "Abrir este guia", - "Save document and exit": "Salvar documento e sair", "Publish document and exit": "Publicar documento e sair", "Save document": "Salvar documento", "Cancel editing": "Cancelar edição", @@ -683,17 +683,19 @@ "Email address": "Endereço de Email", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "A integração de e-mail está atualmente desativada. Defina as variáveis de ambiente associadas e reinicie o servidor para ativar as notificações.", + "Preferences saved": "Preferences saved", + "Delete account": "Excluir a conta", + "Language": "Idioma", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Você pode excluir sua conta a qualquer momento, note que isso não é recuperável", "Profile saved": "Perfil salvo", "Profile picture updated": "Foto de perfil atualizada", "Unable to upload new profile picture": "Não foi possível carregar a nova imagem de perfil", "Photo": "Foto", "Choose a photo or image to represent yourself.": "Escolha uma foto ou imagem para se representar.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "Este pode ser o seu nome verdadeiro ou um apelido — como você gostaria que as pessoas se referissem a você.", - "Language": "Idioma", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Excluir a conta", - "You may delete your account at any time, note that this is unrecoverable": "Você pode excluir sua conta a qualquer momento, note que isso não é recuperável", - "Delete account": "Excluir a conta", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/pt_PT/translation.json b/shared/i18n/locales/pt_PT/translation.json index 745405dd2..464e0b3dd 100644 --- a/shared/i18n/locales/pt_PT/translation.json +++ b/shared/i18n/locales/pt_PT/translation.json @@ -50,6 +50,7 @@ "Trash": "Reciclagem", "Settings": "Configurações", "Profile": "Perfil", + "Preferences": "Preferences", "API documentation": "Documentação da API", "Send us feedback": "Envia-nos Feedback", "Report a bug": "Reportar um erro técnico", @@ -519,7 +520,6 @@ "Toggle navigation": "Toggle navigation", "Focus search input": "Focus search input", "Open this guide": "Abrir este guia", - "Save document and exit": "Save document and exit", "Publish document and exit": "Publish document and exit", "Save document": "Save document", "Cancel editing": "Cancelar edição", @@ -683,17 +683,19 @@ "Email address": "Email address", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.", + "Preferences saved": "Preferences saved", + "Delete account": "Apagar conta", + "Language": "Língua", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Pode apagar a sua conta a qualquer momento, atenção que isso é irrecuperável", "Profile saved": "Perfil guardado", "Profile picture updated": "Foto de perfil foi atualizada", "Unable to upload new profile picture": "Não é possível carregar uma nova foto de perfil", "Photo": "Foto", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "Língua", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Apagar conta", - "You may delete your account at any time, note that this is unrecoverable": "Pode apagar a sua conta a qualquer momento, atenção que isso é irrecuperável", - "Delete account": "Apagar conta", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/ru_RU/translation.json b/shared/i18n/locales/ru_RU/translation.json index c8a419d51..cacff8842 100644 --- a/shared/i18n/locales/ru_RU/translation.json +++ b/shared/i18n/locales/ru_RU/translation.json @@ -50,6 +50,7 @@ "Trash": "Корзина", "Settings": "Настройки", "Profile": "Профиль", + "Preferences": "Preferences", "API documentation": "Документация API", "Send us feedback": "Отправить отзыв", "Report a bug": "Сообщить об ошибке", @@ -519,7 +520,6 @@ "Toggle navigation": "Переключить навигацию", "Focus search input": "Сфокусироваться на строке поиска", "Open this guide": "Открыть эту инструкцию", - "Save document and exit": "Сохранить документ и выйти", "Publish document and exit": "Опубликовать документ и выйти", "Save document": "Сохранить документ", "Cancel editing": "Отменить редактирование", @@ -683,17 +683,19 @@ "Email address": "Адрес электронной почты", "Your email address should be updated in your SSO provider.": "Ваш email должен быть обновлен провайдером SSO.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "Интеграция с электронной почтой в настоящее время отключена. Установите соответствующие переменные среды и перезапустите сервер, чтобы включить уведомления.", + "Preferences saved": "Preferences saved", + "Delete account": "Удалить аккаунт", + "Language": "Язык", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Удалить аккаунт можно в любое время — но вернуть данные не получится", "Profile saved": "Профиль сохранен", "Profile picture updated": "Фото профиля обновлено", "Unable to upload new profile picture": "Упс. Ошибка при загрузке фото в профиль", "Photo": "Фото", "Choose a photo or image to represent yourself.": "Выберите фотографию или картинку, чтобы представить себя.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "Это может быть ваше настоящее имя или псевдоним — как бы вы ни хотели, чтобы люди обращались к вам.", - "Language": "Язык", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Обратите внимание, что переводы в настоящее время находятся в раннем доступе. Вы можете принять участие, используя наш <2>портал переводов.", - "Delete Account": "Удалить аккаунт", - "You may delete your account at any time, note that this is unrecoverable": "Удалить аккаунт можно в любое время — но вернуть данные не получится", - "Delete account": "Удалить аккаунт", "Are you sure you want to require invites?": "Вы уверены, что хотите требовать приглашений?", "I’m sure": "Я уверен", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "Новым пользователям нужно будет получать приглашение для создания аккаунта. Роль по умолчанию и Разрешенные домены больше не будут применяться.", diff --git a/shared/i18n/locales/sv_SE/translation.json b/shared/i18n/locales/sv_SE/translation.json index bdb268a36..d39119b89 100644 --- a/shared/i18n/locales/sv_SE/translation.json +++ b/shared/i18n/locales/sv_SE/translation.json @@ -50,6 +50,7 @@ "Trash": "Papperskorg", "Settings": "Inställningar", "Profile": "Profil", + "Preferences": "Preferences", "API documentation": "API documentation", "Send us feedback": "Send us feedback", "Report a bug": "Report a bug", @@ -519,7 +520,6 @@ "Toggle navigation": "Toggle navigation", "Focus search input": "Focus search input", "Open this guide": "Open this guide", - "Save document and exit": "Save document and exit", "Publish document and exit": "Publish document and exit", "Save document": "Save document", "Cancel editing": "Cancel editing", @@ -683,17 +683,19 @@ "Email address": "Email address", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.", + "Preferences saved": "Preferences saved", + "Delete account": "Delete account", + "Language": "Språk", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "You may delete your account at any time, note that this is unrecoverable", "Profile saved": "Profile saved", "Profile picture updated": "Profile picture updated", "Unable to upload new profile picture": "Unable to upload new profile picture", "Photo": "Foto", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "Språk", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Delete Account", - "You may delete your account at any time, note that this is unrecoverable": "You may delete your account at any time, note that this is unrecoverable", - "Delete account": "Delete account", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/th_TH/translation.json b/shared/i18n/locales/th_TH/translation.json index f4b6be685..f630b633d 100644 --- a/shared/i18n/locales/th_TH/translation.json +++ b/shared/i18n/locales/th_TH/translation.json @@ -50,6 +50,7 @@ "Trash": "ถังขยะ", "Settings": "การตั้งค่า", "Profile": "โปรไฟล์", + "Preferences": "Preferences", "API documentation": "API documentation", "Send us feedback": "ส่งคำติชมถึงเรา", "Report a bug": "รายงานข้อผิดพลาด", @@ -519,7 +520,6 @@ "Toggle navigation": "Toggle navigation", "Focus search input": "Focus search input", "Open this guide": "Open this guide", - "Save document and exit": "Save document and exit", "Publish document and exit": "Publish document and exit", "Save document": "Save document", "Cancel editing": "Cancel editing", @@ -683,17 +683,19 @@ "Email address": "Email address", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.", + "Preferences saved": "Preferences saved", + "Delete account": "Delete account", + "Language": "Language", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "You may delete your account at any time, note that this is unrecoverable", "Profile saved": "Profile saved", "Profile picture updated": "Profile picture updated", "Unable to upload new profile picture": "Unable to upload new profile picture", "Photo": "Photo", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "Language", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "Delete Account", - "You may delete your account at any time, note that this is unrecoverable": "You may delete your account at any time, note that this is unrecoverable", - "Delete account": "Delete account", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/tr_TR/translation.json b/shared/i18n/locales/tr_TR/translation.json index 9c2b1ea62..6e93e9f5b 100644 --- a/shared/i18n/locales/tr_TR/translation.json +++ b/shared/i18n/locales/tr_TR/translation.json @@ -50,6 +50,7 @@ "Trash": "Çöp", "Settings": "Ayarlar", "Profile": "Profil", + "Preferences": "Preferences", "API documentation": "API dokümantasyonu", "Send us feedback": "Geri bildirim gönder", "Report a bug": "Hata bildir", @@ -519,7 +520,6 @@ "Toggle navigation": "Gezinmeyi aç/kapat", "Focus search input": "Arama sonucuna odaklanacak", "Open this guide": "Bu kılavuzu aç", - "Save document and exit": "Belgeyi kaydet ve çık", "Publish document and exit": "Belgeyi yayınla ve çık", "Save document": "Belgeyi kaydet", "Cancel editing": "Düzenlemeyi iptal et", @@ -683,17 +683,19 @@ "Email address": "E-posta adresi", "Your email address should be updated in your SSO provider.": "E-posta adresiniz SSO sağlayıcınızda güncellenmelidir.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "E-posta entegrasyonu şu anda devre dışı. Lütfen ilişkili ortam değişkenlerini ayarlayın ve bildirimleri etkinleştirmek için sunucuyu yeniden başlatın.", + "Preferences saved": "Preferences saved", + "Delete account": "Hesabı sil", + "Language": "Dil", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Hesabınızı istediğiniz zaman silebilirsiniz, bunun kurtarılamaz olduğunu unutmayın", "Profile saved": "Profil kaydedildi", "Profile picture updated": "Profil fotoğrafı güncellendi", "Unable to upload new profile picture": "Yeni profil fotoğrafı yüklenemiyor", "Photo": "Fotoğraf", "Choose a photo or image to represent yourself.": "Kendinizi temsil edecek bir fotoğraf veya resim seçin.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "Bu, gerçek adınız veya takma adınız olabilir - ancak insanların size atıfta bulunmasını istersiniz.", - "Language": "Dil", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Lütfen çevirilerin şu anda erken erişimde olduğunu unutmayın. <2>Çeviri portalımız aracılığıyla topluluk katkıları kabul edilir.", - "Delete Account": "Hesabı sil", - "You may delete your account at any time, note that this is unrecoverable": "Hesabınızı istediğiniz zaman silebilirsiniz, bunun kurtarılamaz olduğunu unutmayın", - "Delete account": "Hesabı sil", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/vi_VN/translation.json b/shared/i18n/locales/vi_VN/translation.json index ca0796593..665040bff 100644 --- a/shared/i18n/locales/vi_VN/translation.json +++ b/shared/i18n/locales/vi_VN/translation.json @@ -50,6 +50,7 @@ "Trash": "Thùng rác", "Settings": "Cài đặt", "Profile": "Hồ sơ", + "Preferences": "Preferences", "API documentation": "Tài liệu API", "Send us feedback": "Gửi phản hồi", "Report a bug": "Báo cáo lỗi", @@ -519,7 +520,6 @@ "Toggle navigation": "Điều hướng", "Focus search input": "Tập trung đầu vào tìm kiếm", "Open this guide": "Mở hướng dẫn này", - "Save document and exit": "Lưu tài liệu và thoát", "Publish document and exit": "Đăng tải tài liệu và thoát", "Save document": "Lưu tài liệu", "Cancel editing": "Hủy chỉnh sửa", @@ -683,17 +683,19 @@ "Email address": "Địa chỉ email", "Your email address should be updated in your SSO provider.": "Địa chỉ email của bạn phải được cập nhật trong nhà cung cấp SSO của bạn.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "Tích hợp email hiện đã bị vô hiệu hóa. Vui lòng đặt các biến môi trường được liên kết và khởi động lại máy chủ để bật thông báo.", + "Preferences saved": "Preferences saved", + "Delete account": "Xoá tài khoản", + "Language": "Ngôn ngữ", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "Bạn có thể xóa tài khoản của mình bất kỳ lúc nào, lưu ý rằng điều này không thể khôi phục được", "Profile saved": "Hồ sơ đã lưu", "Profile picture updated": "Đã cập nhật ảnh hồ sơ", "Unable to upload new profile picture": "Không thể tải lên ảnh hồ sơ mới", "Photo": "Ảnh", "Choose a photo or image to represent yourself.": "Chọn một bức ảnh hoặc hình ảnh để đại diện cho chính bạn.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "Đây có thể là tên thật của bạn hoặc biệt hiệu mà bạn muốn mọi người nhắc đến mình.", - "Language": "Ngôn ngữ", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Xin lưu ý rằng các bản dịch hiện đang được truy cập sớm. Các đóng góp của cộng đồng được chấp nhận thông qua <2> cổng dịch thuật của chúng tôi.", - "Delete Account": "Xóa tài khoản", - "You may delete your account at any time, note that this is unrecoverable": "Bạn có thể xóa tài khoản của mình bất kỳ lúc nào, lưu ý rằng điều này không thể khôi phục được", - "Delete account": "Xoá tài khoản", "Are you sure you want to require invites?": "Bạn có chắc chắn muốn yêu cầu lời mời không?", "I’m sure": "Tôi chắc chắn", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "Người dùng mới trước tiên sẽ cần được mời để tạo tài khoản. Vai trò mặc định và Các miền được phép sẽ không còn áp dụng.", diff --git a/shared/i18n/locales/zh_CN/translation.json b/shared/i18n/locales/zh_CN/translation.json index 2e49ecbb8..7326a3ab6 100644 --- a/shared/i18n/locales/zh_CN/translation.json +++ b/shared/i18n/locales/zh_CN/translation.json @@ -50,6 +50,7 @@ "Trash": "回收站", "Settings": "设置", "Profile": "基本资料", + "Preferences": "Preferences", "API documentation": "API 文档", "Send us feedback": "联系我们", "Report a bug": "提交 Bug", @@ -519,7 +520,6 @@ "Toggle navigation": "切换导航", "Focus search input": "聚焦搜索结果", "Open this guide": "打开指南", - "Save document and exit": "保存文件并退出", "Publish document and exit": "发布文档并退出", "Save document": "保存文档", "Cancel editing": "取消编辑", @@ -683,17 +683,19 @@ "Email address": "电子邮件地址", "Your email address should be updated in your SSO provider.": "您的电子邮件地址应该在您的 SSO 提供商中更新。", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "电子邮件集成当前已禁用。请设置相关的环境变量并重新启动服务器以启用通知。", + "Preferences saved": "Preferences saved", + "Delete account": "删除账户", + "Language": "语言", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "您可以随时删除您的帐户，请注意删除后将无法恢复该账号", "Profile saved": "配置已保存", "Profile picture updated": "头像已更新", "Unable to upload new profile picture": "无法上传个人图片", "Photo": "图片", "Choose a photo or image to represent yourself.": "选择一张照片或图像来代表你自己。", "This could be your real name, or a nickname — however you’d like people to refer to you.": "可以选择使用真实的姓名或者网络昵称，当别人提及你的时候使用。", - "Language": "语言", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "请注意，翻译目前处于抢先体验阶段。可以通过我们的翻译门户<2>进行社区贡献.", - "Delete Account": "删除帐户", - "You may delete your account at any time, note that this is unrecoverable": "您可以随时删除您的帐户，请注意删除后将无法恢复该账号", - "Delete account": "删除账户", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "我确定", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/i18n/locales/zh_TW/translation.json b/shared/i18n/locales/zh_TW/translation.json index 3e670b025..f85e1603a 100644 --- a/shared/i18n/locales/zh_TW/translation.json +++ b/shared/i18n/locales/zh_TW/translation.json @@ -50,6 +50,7 @@ "Trash": "垃圾桶", "Settings": "設定", "Profile": "個人資料", + "Preferences": "Preferences", "API documentation": "API 文件", "Send us feedback": "回饋意見給我們", "Report a bug": "回報錯誤", @@ -519,7 +520,6 @@ "Toggle navigation": "切換導覽", "Focus search input": "Focus search input", "Open this guide": "打開這份指南", - "Save document and exit": "儲存文件並退出", "Publish document and exit": "發佈並退出", "Save document": "儲存文件", "Cancel editing": "取消編輯", @@ -683,17 +683,19 @@ "Email address": "電子郵件地址", "Your email address should be updated in your SSO provider.": "Your email address should be updated in your SSO provider.", "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "電子郵件整合目前已停用，若要啟用通知，請設定相關的環境變數並重新啟動伺服器", + "Preferences saved": "Preferences saved", + "Delete account": "刪除帳號", + "Language": "語言", + "Choose the interface language. Community translations are accepted though our <2>translation portal.": "Choose the interface language. Community translations are accepted though our <2>translation portal.", + "Remember previous location": "Remember previous location", + "Automatically return to the document you were last viewing when the app is re-opened.": "Automatically return to the document you were last viewing when the app is re-opened.", + "You may delete your account at any time, note that this is unrecoverable": "您隨時可以刪除您的使用者帳號，但此為不可回復之動作", "Profile saved": "個人資料已儲存", "Profile picture updated": "大頭貼已上傳", "Unable to upload new profile picture": "無法上傳新的大頭貼", "Photo": "照片", "Choose a photo or image to represent yourself.": "Choose a photo or image to represent yourself.", "This could be your real name, or a nickname — however you’d like people to refer to you.": "This could be your real name, or a nickname — however you’d like people to refer to you.", - "Language": "語言", - "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.": "Please note that translations are currently in early access. Community contributions are accepted though our <2>translation portal.", - "Delete Account": "刪除帳號", - "You may delete your account at any time, note that this is unrecoverable": "您隨時可以刪除您的使用者帳號，但此為不可回復之動作", - "Delete account": "刪除帳號", "Are you sure you want to require invites?": "Are you sure you want to require invites?", "I’m sure": "I’m sure", "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.": "New users will first need to be invited to create an account. Default role and Allowed domains will no longer apply.", diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts index d341b76ed..f161ddb49 100644 --- a/shared/styles/theme.ts +++ b/shared/styles/theme.ts @@ -130,7 +130,6 @@ export const light = { tableDivider: colors.smokeDark, tableSelected: colors.primary, tableSelectedBackground: "#E5F7FF", - tableHeaderBackground: colors.white, buttonNeutralBackground: colors.white, buttonNeutralText: colors.almostBlack, buttonNeutralBorder: darken(0.15, colors.white), @@ -188,7 +187,6 @@ export const dark = { tableDivider: colors.lightBlack, tableSelected: colors.primary, tableSelectedBackground: "#002333", - tableHeaderBackground: colors.almostBlack, buttonNeutralBackground: colors.almostBlack, buttonNeutralText: colors.white, buttonNeutralBorder: colors.slateDark, diff --git a/yarn.lock b/yarn.lock index 133f477d5..280ef89da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3890,16 +3890,6 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^5.0.0: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -5515,13 +5505,13 @@ concat-stream@~2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" -concurrently@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.3.0.tgz#eb45cdbc8df43da195f619aba218a980cae49184" - integrity sha512-IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA== +concurrently@^7.4.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.4.0.tgz#bb0e344964bc172673577c420db21e963f2f7368" + integrity sha512-M6AfrueDt/GEna/Vg9BqQ+93yuvzkSKmoTixnwEJkH0LlcGrRC2eCmjeG1tLLHIYfpYJABokqSGyMcXjm96AFA== dependencies: chalk "^4.1.0" - date-fns "^2.16.1" + date-fns "^2.29.1" lodash "^4.17.21" rxjs "^7.0.0" shell-quote "^1.7.3" @@ -6146,7 +6136,7 @@ datadog-metrics@^0.9.3: debug "3.1.0" dogapi "2.8.4" -date-fns@^2.16.1, date-fns@^2.25.0, date-fns@^2.28.0: +date-fns@^2.25.0, date-fns@^2.28.0, date-fns@^2.29.1: version "2.29.2" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.2.tgz#0d4b3d0f3dff0f920820a070920f0d9662c51931" integrity sha512-0VNbwmWJDS/G3ySwFSJA3ayhbURMTJLtwM2DTxf9CWondCnh6DTNlO9JgRSq6ibf4eD0lfMJNBxUdEAHHix+bA== @@ -7409,11 +7399,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -9776,11 +9761,6 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A= - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -10815,7 +10795,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.35, mime-types@~2.1.24: +mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@^2.1.35, mime-types@~2.1.24: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -10827,7 +10807,7 @@ mime@2.4.6: resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== -mime@^1.3.4, mime@^1.4.1, mime@^1.5.0: +mime@^1.3.4, mime@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== @@ -12420,10 +12400,10 @@ qs@^6.4.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687" integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ== -query-string@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.0.1.tgz#45bd149cf586aaa582dffc7ec7a8ad97dd02f75d" - integrity sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA== +query-string@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1" + integrity sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w== dependencies: decode-uri-component "^0.2.0" filter-obj "^1.1.0" @@ -13385,13 +13365,6 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" -schema-utils@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" - integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8= - dependencies: - ajv "^5.0.0" - schema-utils@^0.4.5: version "0.4.7" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" @@ -14975,14 +14948,14 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-loader@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7" - integrity sha512-h3qf9TNn53BpuXTTcpC+UehiRrl0Cv45Yr/xWayApjw6G8Bg2dGke7rIwDQ39piciWCWrC+WiqLjOh3SUp9n0Q== +url-loader@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2" + integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA== dependencies: - loader-utils "^1.0.2" - mime "^1.4.1" - schema-utils "^0.3.0" + loader-utils "^2.0.0" + mime-types "^2.1.27" + schema-utils "^3.0.0" url-parse-lax@^3.0.0: version "3.0.0"