From 6ba89696ee240ed9dd6ea64e309399d70e40ac9e Mon Sep 17 00:00:00 2001 From: John Coffey Date: Tue, 15 Sep 2026 11:35:33 -0700 Subject: [PATCH] Spell license the US way --- FEATURES.md | 2 +- NOTICE | 24 +++++++++---------- README.md | 2 +- server/src/config.ts | 2 +- web/src/lib/adminDirectory.ts | 2 +- web/src/locales/de.ts | 4 ++-- web/src/locales/es.ts | 4 ++-- web/src/locales/fr.ts | 4 ++-- web/src/locales/ja.ts | 4 ++-- web/src/locales/nl.ts | 4 ++-- web/src/locales/pt-BR.ts | 4 ++-- web/src/locales/ru.ts | 4 ++-- web/src/locales/uk.ts | 4 ++-- web/src/locales/zh-Hans.ts | 4 ++-- web/src/views/admin/TenantsAdmin.tsx | 2 +- web/src/views/settings/AppearanceSettings.tsx | 2 +- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/FEATURES.md b/FEATURES.md index c250e5a..bd4c5c2 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -1067,7 +1067,7 @@ Every one has both halves, so the top-bar toggle only ever changes the side and never the colours. Accent colours still sit on top of any of them. The ten borrowed palettes are the work of their own projects and are used -under the MIT licence — see [NOTICE](NOTICE). Only the published colour values +under the MIT license — see [NOTICE](NOTICE). Only the published colour values are used, taken from each project's own repository; the values as fetched are recorded in `.palette-sources/palettes-upstream.md`. diff --git a/NOTICE b/NOTICE index 6edaa5e..1cb2153 100644 --- a/NOTICE +++ b/NOTICE @@ -6,7 +6,7 @@ other people that ships inside it and the terms it comes under. ## Colour palettes Ten of the palettes offered in Settings › Appearance are the work of their own -projects and are used under the MIT licence. Only the published colour values +projects and are used under the MIT license. Only the published colour values are used — no code, and nothing from anyone else's reimplementation of them. The values as fetched from each project are recorded in `.palette-sources/palettes-upstream.md`, and the shades between them are @@ -16,66 +16,66 @@ not meet the contrast ihasmail claims. ### Dracula and Alucard Copyright (c) 2016 Dracula Theme — https://github.com/dracula/dracula-theme -Licensed under the MIT licence. "Dracula" is the dark variant and "Alucard" the +Licensed under the MIT license. "Dracula" is the dark variant and "Alucard" the light one; both are published in that repository's own "Color Palette (OSS)" section. ### Gruvbox Copyright (c) 2018 Pavel Pertsev — https://github.com/morhetz/gruvbox -Licensed under the MIT licence. +Licensed under the MIT license. ### Rosé Pine Copyright (c) 2021 Rosé Pine — https://github.com/rose-pine/rose-pine-theme -Licensed under the MIT licence. The light variant is "Dawn". +Licensed under the MIT license. The light variant is "Dawn". ### Tokyo Night Copyright (c) 2019 enkia — https://github.com/enkia/tokyo-night-vscode-theme -Licensed under the MIT licence. The light variant is "Day". +Licensed under the MIT license. The light variant is "Day". ### Catppuccin Copyright (c) 2021 Catppuccin — https://github.com/catppuccin/palette -Licensed under the MIT licence. "Mocha" is the dark variant and "Latte" the +Licensed under the MIT license. "Mocha" is the dark variant and "Latte" the light one; both are published in that repository's palette.json. ### Solarized Copyright (c) 2011 Ethan Schoonover — https://github.com/altercation/solarized -Licensed under the MIT licence. Light and dark are both original to it, and +Licensed under the MIT license. Light and dark are both original to it, and share one set of accent values by design. ### Ayu Copyright (c) Konstantin Pschera — https://github.com/ayu-theme/ayu-colors -Licensed under the MIT licence. The two signature accent colours come from the +Licensed under the MIT license. The two signature accent colours come from the same author's ayu-theme/vscode-ayu, also MIT. ### Kanagawa Copyright (c) 2021 Tommaso Laurenzi — https://github.com/rebelot/kanagawa.nvim -Licensed under the MIT licence. "Wave" is the dark variant and "Lotus" the +Licensed under the MIT license. "Wave" is the dark variant and "Lotus" the light one. The theme takes its name from Hokusai's print. ### Everforest Copyright (c) 2019 Sainnhe Park — https://github.com/sainnhe/everforest -Licensed under the MIT licence. The medium-contrast variant of each mode is +Licensed under the MIT license. The medium-contrast variant of each mode is the one used here. ### Primer Copyright (c) GitHub, Inc. — https://github.com/primer/primitives -Licensed under the MIT licence, which covers the colour values. "GitHub" and +Licensed under the MIT license, which covers the colour values. "GitHub" and the Invertocat logo are trademarks of GitHub, Inc.; this palette is named "Primer" after the design system and is neither affiliated with nor endorsed by GitHub. --- -The MIT licence, under which all ten are used: +The MIT license, under which all ten are used: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/README.md b/README.md index 11af239..0518088 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@

- Licence: AGPL-3.0-or-later + License: AGPL-3.0-or-later Requires Stalwart 0.16 or newer; tested against 0.16.22 Documentation: docs.ihasmail.org by Coffey Labs diff --git a/server/src/config.ts b/server/src/config.ts index 1bd9281..5823c5a 100644 --- a/server/src/config.ts +++ b/server/src/config.ts @@ -311,7 +311,7 @@ export const config = { * Say that an Enterprise-only section is Enterprise-only even on an * Enterprise server. Off, as a real installation wants it; the public demo * turns it on, because it reports Enterprise to show those sections and - * should not suggest they come without the licence. + * should not suggest they come without the license. */ showEnterpriseNotices: bool("SHOW_ENTERPRISE_NOTICES", false), appSecret, diff --git a/web/src/lib/adminDirectory.ts b/web/src/lib/adminDirectory.ts index a11a311..e952ac0 100644 --- a/web/src/lib/adminDirectory.ts +++ b/web/src/lib/adminDirectory.ts @@ -272,7 +272,7 @@ export function describeDirectoryError(err: unknown, object: DirectoryObject = " return object === "role" ? t("You can't give a role permissions your own role doesn't have.") : t("You can't give an account permissions your own role doesn't have."); } if (/external directory/i.test(description)) return t("This account signs in through an external directory, so its password can't be set here."); - if (/licen[cs]ed account limit/i.test(description)) return t("The server's licence allows no more accounts."); + if (/licen[cs]ed account limit/i.test(description)) return t("The server's license allows no more accounts."); return t("The mail server refused this. Your role may not allow it."); case "primaryKeyViolation": return object === "domain" diff --git a/web/src/locales/de.ts b/web/src/locales/de.ts index 60fccfd..c03c31c 100644 --- a/web/src/locales/de.ts +++ b/web/src/locales/de.ts @@ -122,7 +122,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "Der Mailserver konnte die Anfrage nicht ausführen ({code}).", "You can't give an account permissions your own role doesn't have.": "Sie können einem Konto keine Berechtigungen geben, die Ihre eigene Rolle nicht hat.", "This account signs in through an external directory, so its password can't be set here.": "Dieses Konto meldet sich über ein externes Verzeichnis an, daher kann sein Passwort hier nicht festgelegt werden.", - "The server's licence allows no more accounts.": "Die Lizenz des Servers erlaubt keine weiteren Konten.", + "The server's license allows no more accounts.": "Die Lizenz des Servers erlaubt keine weiteren Konten.", "That domain name is already in use on this server, as a domain or another domain's other name.": "Dieser Domainname wird auf diesem Server bereits verwendet – als Domain oder als weiterer Name einer anderen Domain.", "Your organisation has reached the number of domains it is allowed.": "Ihre Organisation hat die Anzahl der erlaubten Domains erreicht.", "That is more than the mail server accepts in one change.": "Das ist mehr, als der Mailserver in einer Änderung annimmt.", @@ -1482,7 +1482,7 @@ export const catalog: Catalog = { "Counts people rather than headers, so one address in To and nine in Cc is a message to ten. Catches a reply-all onto a long thread.": "Zählt Personen statt Kopfzeilen: eine Adresse in An und neun in Cc ergeben eine Nachricht an zehn. Erfasst ein Allen-Antworten auf einen langen Thread.", "Date received": "Empfangsdatum", "Date sent": "Sendedatum", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Paletten, die nach einem anderen Projekt benannt sind, stammen von diesem Projekt und werden unter dessen eigener Lizenz verwendet; die Abstufungen zwischen den veröffentlichten Farben sind abgeleitet, und jede davon wird auf Kontrast geprüft. Die Akzentfarbe unten gilt weiterhin über jeder von ihnen.", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Paletten, die nach einem anderen Projekt benannt sind, stammen von diesem Projekt und werden unter dessen eigener Lizenz verwendet; die Abstufungen zwischen den veröffentlichten Farben sind abgeleitet, und jede davon wird auf Kontrast geprüft. Die Akzentfarbe unten gilt weiterhin über jeder von ihnen.", "Earlier": "Früher", "Every folder": "Jeder Ordner", "Everyone addressed will receive this.": "Alle Adressierten erhalten dies.", diff --git a/web/src/locales/es.ts b/web/src/locales/es.ts index 0015cca..2aa4f1b 100644 --- a/web/src/locales/es.ts +++ b/web/src/locales/es.ts @@ -114,7 +114,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "El servidor de correo no pudo completar la solicitud ({code}).", "You can't give an account permissions your own role doesn't have.": "No puede dar a una cuenta permisos que su propio rol no tiene.", "This account signs in through an external directory, so its password can't be set here.": "Esta cuenta inicia sesión mediante un directorio externo, así que su contraseña no se puede establecer aquí.", - "The server's licence allows no more accounts.": "La licencia del servidor no permite más cuentas.", + "The server's license allows no more accounts.": "La licencia del servidor no permite más cuentas.", "That domain name is already in use on this server, as a domain or another domain's other name.": "Ese nombre de dominio ya está en uso en este servidor, como dominio o como otro nombre de otro dominio.", "Your organisation has reached the number of domains it is allowed.": "Su organización ha alcanzado el número de dominios permitido.", "That is more than the mail server accepts in one change.": "Eso supera lo que el servidor de correo acepta en un solo cambio.", @@ -1438,7 +1438,7 @@ export const catalog: Catalog = { "Date received": "Fecha de recepción", "Date sent": "Fecha de envío", "Day view": "Vista de día", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Las paletas que llevan el nombre de otro proyecto son obra de ese proyecto y se usan bajo su propia licencia; los tonos intermedios entre sus colores publicados son derivados, y cada uno se comprueba para el contraste. El color de acento de abajo sigue aplicándose sobre cualquiera de ellas.", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Las paletas que llevan el nombre de otro proyecto son obra de ese proyecto y se usan bajo su propia licencia; los tonos intermedios entre sus colores publicados son derivados, y cada uno se comprueba para el contraste. El color de acento de abajo sigue aplicándose sobre cualquiera de ellas.", "Earlier": "Antes", "Every folder": "Todas las carpetas", "Everyone addressed will receive this.": "Todos los destinatarios lo recibirán.", diff --git a/web/src/locales/fr.ts b/web/src/locales/fr.ts index 0dfc0b6..4dd50d7 100644 --- a/web/src/locales/fr.ts +++ b/web/src/locales/fr.ts @@ -119,7 +119,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "Le serveur de messagerie n’a pas pu traiter la demande ({code}).", "You can't give an account permissions your own role doesn't have.": "Vous ne pouvez pas donner à un compte des autorisations que votre propre rôle n’a pas.", "This account signs in through an external directory, so its password can't be set here.": "Ce compte se connecte via un annuaire externe, son mot de passe ne peut donc pas être défini ici.", - "The server's licence allows no more accounts.": "La licence du serveur ne permet pas de comptes supplémentaires.", + "The server's license allows no more accounts.": "La license du serveur ne permet pas de comptes supplémentaires.", "That domain name is already in use on this server, as a domain or another domain's other name.": "Ce nom de domaine est déjà utilisé sur ce serveur, comme domaine ou comme autre nom d’un autre domaine.", "Your organisation has reached the number of domains it is allowed.": "Votre organisation a atteint le nombre de domaines autorisé.", "That is more than the mail server accepts in one change.": "C’est plus que ce que le serveur de messagerie accepte en une seule modification.", @@ -1443,7 +1443,7 @@ export const catalog: Catalog = { "Date received": "Date de réception", "Date sent": "Date d'envoi", "Day view": "Vue jour", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Les palettes portant le nom d'un autre projet sont l'œuvre de ce projet et sont utilisées sous sa propre licence ; les nuances intermédiaires entre leurs couleurs publiées sont dérivées, et chacune est vérifiée pour le contraste. La couleur d'accentuation ci-dessous s'applique toujours par-dessus n'importe laquelle d'entre elles.", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Les palettes portant le nom d'un autre projet sont l'œuvre de ce projet et sont utilisées sous sa propre license ; les nuances intermédiaires entre leurs couleurs publiées sont dérivées, et chacune est vérifiée pour le contraste. La couleur d'accentuation ci-dessous s'applique toujours par-dessus n'importe laquelle d'entre elles.", "Earlier": "Plus tôt", "Every folder": "Tous les dossiers", "Everyone addressed will receive this.": "Tous les destinataires le recevront.", diff --git a/web/src/locales/ja.ts b/web/src/locales/ja.ts index 0422f3e..6865c7a 100644 --- a/web/src/locales/ja.ts +++ b/web/src/locales/ja.ts @@ -113,7 +113,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "メールサーバーはリクエストを実行できませんでした（{code}）。", "You can't give an account permissions your own role doesn't have.": "自分のロールにない権限をアカウントに付与することはできません。", "This account signs in through an external directory, so its password can't be set here.": "このアカウントは外部ディレクトリでサインインするため、ここではパスワードを設定できません。", - "The server's licence allows no more accounts.": "サーバーのライセンスでは、これ以上アカウントを追加できません。", + "The server's license allows no more accounts.": "サーバーのライセンスでは、これ以上アカウントを追加できません。", "That domain name is already in use on this server, as a domain or another domain's other name.": "このドメイン名は、ドメインまたは別のドメインの別名としてこのサーバーで既に使われています。", "Your organisation has reached the number of domains it is allowed.": "組織で許可されているドメイン数の上限に達しました。", "That is more than the mail server accepts in one change.": "メールサーバーが一度の変更で受け付けられる量を超えています。", @@ -1446,7 +1446,7 @@ export const catalog: Catalog = { "Date received": "受信日時", "Date sent": "送信日時", "Day view": "日表示", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "他のプロジェクトの名前が付いたパレットは、そのプロジェクトの成果物であり、そのプロジェクト自身のライセンスのもとで使用しています。公開されている色の中間の階調は派生させたもので、いずれもコントラストを検証しています。下のアクセントカラーは、どのパレットの上にも適用されます。", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "他のプロジェクトの名前が付いたパレットは、そのプロジェクトの成果物であり、そのプロジェクト自身のライセンスのもとで使用しています。公開されている色の中間の階調は派生させたもので、いずれもコントラストを検証しています。下のアクセントカラーは、どのパレットの上にも適用されます。", "Earlier": "これより前", "Every folder": "すべてのフォルダー", "Everyone addressed will receive this.": "宛先の全員がこれを受け取ります。", diff --git a/web/src/locales/nl.ts b/web/src/locales/nl.ts index ee6f6d3..eb60afc 100644 --- a/web/src/locales/nl.ts +++ b/web/src/locales/nl.ts @@ -110,7 +110,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "De mailserver kon het verzoek niet uitvoeren ({code}).", "You can't give an account permissions your own role doesn't have.": "U kunt een account geen rechten geven die uw eigen rol niet heeft.", "This account signs in through an external directory, so its password can't be set here.": "Dit account logt in via een externe adreslijst, dus het wachtwoord kan hier niet worden ingesteld.", - "The server's licence allows no more accounts.": "De licentie van de server staat geen extra accounts toe.", + "The server's license allows no more accounts.": "De licentie van de server staat geen extra accounts toe.", "That domain name is already in use on this server, as a domain or another domain's other name.": "Die domeinnaam is op deze server al in gebruik, als domein of als andere naam van een ander domein.", "Your organisation has reached the number of domains it is allowed.": "Uw organisatie heeft het toegestane aantal domeinen bereikt.", "That is more than the mail server accepts in one change.": "Dat is meer dan de mailserver in één wijziging accepteert.", @@ -1434,7 +1434,7 @@ export const catalog: Catalog = { "Date received": "Ontvangstdatum", "Date sent": "Verzenddatum", "Day view": "Dagweergave", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Paletten die naar een ander project zijn genoemd, zijn het werk van dat project en worden gebruikt onder de eigen licentie daarvan; de tinten tussen de gepubliceerde kleuren zijn afgeleid en elk daarvan wordt op contrast gecontroleerd. De accentkleur hieronder geldt nog steeds over elk ervan.", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Paletten die naar een ander project zijn genoemd, zijn het werk van dat project en worden gebruikt onder de eigen licentie daarvan; de tinten tussen de gepubliceerde kleuren zijn afgeleid en elk daarvan wordt op contrast gecontroleerd. De accentkleur hieronder geldt nog steeds over elk ervan.", "Earlier": "Eerder", "Every folder": "Elke map", "Everyone addressed will receive this.": "Iedereen die is geadresseerd ontvangt dit.", diff --git a/web/src/locales/pt-BR.ts b/web/src/locales/pt-BR.ts index 9b7cbc3..450af15 100644 --- a/web/src/locales/pt-BR.ts +++ b/web/src/locales/pt-BR.ts @@ -117,7 +117,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "O servidor de e-mail não conseguiu executar a solicitação ({code}).", "You can't give an account permissions your own role doesn't have.": "Você não pode dar a uma conta permissões que sua própria função não tem.", "This account signs in through an external directory, so its password can't be set here.": "Esta conta entra por meio de um diretório externo, então a senha dela não pode ser definida aqui.", - "The server's licence allows no more accounts.": "A licença do servidor não permite mais contas.", + "The server's license allows no more accounts.": "A licença do servidor não permite mais contas.", "That domain name is already in use on this server, as a domain or another domain's other name.": "Esse nome de domínio já está em uso neste servidor, como domínio ou como outro nome de outro domínio.", "Your organisation has reached the number of domains it is allowed.": "Sua organização atingiu o número de domínios permitido.", "That is more than the mail server accepts in one change.": "Isso é mais do que o servidor de e-mail aceita em uma única alteração.", @@ -1441,7 +1441,7 @@ export const catalog: Catalog = { "Date received": "Data de recebimento", "Date sent": "Data de envio", "Day view": "Visualização de dia", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "As paletas que levam o nome de outro projeto são obra desse projeto e são usadas sob a licença dele; os tons entre as cores publicadas são derivados, e cada um é verificado quanto ao contraste. A cor de destaque abaixo continua se aplicando sobre qualquer uma delas.", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "As paletas que levam o nome de outro projeto são obra desse projeto e são usadas sob a licença dele; os tons entre as cores publicadas são derivados, e cada um é verificado quanto ao contraste. A cor de destaque abaixo continua se aplicando sobre qualquer uma delas.", "Earlier": "Antes", "Every folder": "Todas as pastas", "Everyone addressed will receive this.": "Todos os destinatários receberão isto.", diff --git a/web/src/locales/ru.ts b/web/src/locales/ru.ts index 6e5fe5c..47ecfa3 100644 --- a/web/src/locales/ru.ts +++ b/web/src/locales/ru.ts @@ -116,7 +116,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "Почтовый сервер не смог выполнить запрос ({code}).", "You can't give an account permissions your own role doesn't have.": "Нельзя дать учётной записи разрешения, которых нет у вашей роли.", "This account signs in through an external directory, so its password can't be set here.": "Эта учётная запись входит через внешний каталог, поэтому её пароль нельзя задать здесь.", - "The server's licence allows no more accounts.": "Лицензия сервера не допускает новых учётных записей.", + "The server's license allows no more accounts.": "Лицензия сервера не допускает новых учётных записей.", "That domain name is already in use on this server, as a domain or another domain's other name.": "Это имя домена уже используется на сервере — как домен или как другое имя другого домена.", "Your organisation has reached the number of domains it is allowed.": "Ваша организация достигла допустимого числа доменов.", "That is more than the mail server accepts in one change.": "Это больше, чем почтовый сервер принимает за одно изменение.", @@ -1440,7 +1440,7 @@ export const catalog: Catalog = { "Date received": "Дата получения", "Date sent": "Дата отправки", "Day view": "День", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Палитры, названные в честь другого проекта, созданы этим проектом и используются по его собственной лицензии; оттенки между опубликованными цветами выводятся расчётом, и каждый из них проверяется на контраст. Акцентный цвет ниже по-прежнему применяется поверх любой из них.", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Палитры, названные в честь другого проекта, созданы этим проектом и используются по его собственной лицензии; оттенки между опубликованными цветами выводятся расчётом, и каждый из них проверяется на контраст. Акцентный цвет ниже по-прежнему применяется поверх любой из них.", "Earlier": "Раньше", "Every folder": "Все папки", "Everyone addressed will receive this.": "Это получат все указанные адресаты.", diff --git a/web/src/locales/uk.ts b/web/src/locales/uk.ts index 34515d7..beedd8b 100644 --- a/web/src/locales/uk.ts +++ b/web/src/locales/uk.ts @@ -110,7 +110,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "Поштовий сервер не зміг виконати запит ({code}).", "You can't give an account permissions your own role doesn't have.": "Не можна надати обліковому запису дозволи, яких немає у вашої ролі.", "This account signs in through an external directory, so its password can't be set here.": "Цей обліковий запис входить через зовнішній каталог, тому його пароль не можна задати тут.", - "The server's licence allows no more accounts.": "Ліцензія сервера не дозволяє нових облікових записів.", + "The server's license allows no more accounts.": "Ліцензія сервера не дозволяє нових облікових записів.", "That domain name is already in use on this server, as a domain or another domain's other name.": "Це ім'я домену вже використовується на сервері — як домен або як інше ім'я іншого домену.", "Your organisation has reached the number of domains it is allowed.": "Ваша організація досягла дозволеної кількості доменів.", "That is more than the mail server accepts in one change.": "Це більше, ніж поштовий сервер приймає за одну зміну.", @@ -1434,7 +1434,7 @@ export const catalog: Catalog = { "Date received": "Дата отримання", "Date sent": "Дата надсилання", "Day view": "День", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Палітри, названі на честь іншого проєкту, є роботою цього проєкту й використовуються за його власною ліцензією; відтінки між опублікованими кольорами обчислюються, і кожен із них перевіряється на контраст. Акцентний колір нижче й надалі застосовується поверх будь-якої з них.", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "Палітри, названі на честь іншого проєкту, є роботою цього проєкту й використовуються за його власною ліцензією; відтінки між опублікованими кольорами обчислюються, і кожен із них перевіряється на контраст. Акцентний колір нижче й надалі застосовується поверх будь-якої з них.", "Earlier": "Раніше", "Every folder": "Усі теки", "Everyone addressed will receive this.": "Це отримають усі зазначені адресати.", diff --git a/web/src/locales/zh-Hans.ts b/web/src/locales/zh-Hans.ts index 2d7423a..ad2d9cb 100644 --- a/web/src/locales/zh-Hans.ts +++ b/web/src/locales/zh-Hans.ts @@ -112,7 +112,7 @@ export const catalog: Catalog = { "The mail server could not carry out the request ({code}).": "邮件服务器无法执行该请求（{code}）。", "You can't give an account permissions your own role doesn't have.": "您不能授予账户您自己的角色所没有的权限。", "This account signs in through an external directory, so its password can't be set here.": "该账户通过外部目录登录，因此无法在此设置其密码。", - "The server's licence allows no more accounts.": "服务器许可证不允许再添加账户。", + "The server's license allows no more accounts.": "服务器许可证不允许再添加账户。", "That domain name is already in use on this server, as a domain or another domain's other name.": "该域名已在此服务器上被使用，可能是一个域名，也可能是另一个域名的其他名称。", "Your organisation has reached the number of domains it is allowed.": "您的组织已达到允许的域名数量上限。", "That is more than the mail server accepts in one change.": "这超出了邮件服务器单次更改可接受的范围。", @@ -1445,7 +1445,7 @@ export const catalog: Catalog = { "Date received": "接收日期", "Date sent": "发送日期", "Day view": "日视图", - "Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "以其他项目命名的配色方案是该项目的作品，按其自身的许可证使用；已发布颜色之间的过渡色是推导得出的，并且每一种都经过对比度检查。下方的强调色仍会应用于其中任何一种配色方案。", + "Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.": "以其他项目命名的配色方案是该项目的作品，按其自身的许可证使用；已发布颜色之间的过渡色是推导得出的，并且每一种都经过对比度检查。下方的强调色仍会应用于其中任何一种配色方案。", "Earlier": "更早", "Every folder": "所有文件夹", "Everyone addressed will receive this.": "所有收件人都会收到此邮件。", diff --git a/web/src/views/admin/TenantsAdmin.tsx b/web/src/views/admin/TenantsAdmin.tsx index dcaa6bb..0a76088 100644 --- a/web/src/views/admin/TenantsAdmin.tsx +++ b/web/src/views/admin/TenantsAdmin.tsx @@ -24,7 +24,7 @@ const PAGE_SIZE = 50; * beyond an ordinary user's permissions, so there is nothing worth creating or * listing. On Enterprise the notice is left out, unless the installation asks * for it (SHOW_ENTERPRISE_NOTICES), as the public demo does so as not to - * suggest tenants come without the licence. + * suggest tenants come without the license. */ export function TenantsAdmin({ selectedId }: { selectedId?: string }) { const edition = useSession((s) => s.session?.ihasmail?.server?.edition ?? null); diff --git a/web/src/views/settings/AppearanceSettings.tsx b/web/src/views/settings/AppearanceSettings.tsx index a9cea41..9d4745d 100644 --- a/web/src/views/settings/AppearanceSettings.tsx +++ b/web/src/views/settings/AppearanceSettings.tsx @@ -107,7 +107,7 @@ export function AppearanceSettings() { })}

- {translate("Palettes named after another project are that project's work, used under its own licence; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.")} + {translate("Palettes named after another project are that project's work, used under its own license; the shades between their published colours are derived, and every one is checked for contrast. The accent colour below still applies over any of them.")}