Translations update from Mattermost Weblate (#25989)

* Translated using Weblate (Japanese) Currently translated at 100.0% (2572 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (5815 of 5815 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/ja/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (2571 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 99.9% (5814 of 5815 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (2572 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/zh_Hans/ * Translated using Weblate (Polish) Currently translated at 99.6% (2563 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/pl/ * Translated using Weblate (Lithuanian) Currently translated at 91.4% (5316 of 5815 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/lt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2572 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/nl/ * Translated using Weblate (Dutch) Currently translated at 99.9% (5814 of 5815 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/nl/ * Translated using Weblate (Czech) Currently translated at 74.0% (1905 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/cs/ * Translated using Weblate (Lithuanian) Currently translated at 7.4% (192 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/lt/ * Translated using Weblate (English (Australia)) Currently translated at 99.7% (2566 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/en_AU/ * Translated using Weblate (English (Australia)) Currently translated at 99.9% (5812 of 5815 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/en_AU/ * Update translation files Updated by "Remove blank strings" hook in Weblate. Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/ * Update translation files Updated by "Remove blank strings" hook in Weblate. Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/ * Translated using Weblate (German) Currently translated at 100.0% (2572 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/de/ * Translated using Weblate (Polish) Currently translated at 100.0% (2572 of 2572 strings) Translation: Mattermost/server Translate-URL: https://translate.mattermost.com/projects/mattermost/server/pl/ * Translated using Weblate (German) Currently translated at 100.0% (5815 of 5815 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/de/ * Translated using Weblate (Polish) Currently translated at 100.0% (5815 of 5815 strings) Translation: Mattermost/webapp Translate-URL: https://translate.mattermost.com/projects/mattermost/webapp/pl/ --------- Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: ThrRip <coding@thrrip.space> Co-authored-by: master7 <marcin.karkosz@rajska.info> Co-authored-by: N <normanas.zem5@gmail.com> Co-authored-by: Tom De Moor <tom@controlaltdieliet.be> Co-authored-by: SkyDusH <giris@seznam.cz> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: jprusch <rs@schaeferbarthold.de>
2024-01-22 17:38:42 +01:00
--- a/webapp/channels/src/i18n/de.json
+++ b/webapp/channels/src/i18n/de.json
@@ -406,6 +406,7 @@
  "admin.billing.subscription.viewBilling": "Zeige Rechnungen",
  "admin.billing.subscriptions.billing_summary.explore_enterprise": "Entdecke Enterprise Funktionen",
  "admin.billing.subscriptions.billing_summary.explore_enterprise.cta": "Betrachte alle Funktionen",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.approved": "Genehmigt",
  "admin.billing.subscriptions.billing_summary.lastInvoice.failed": "Fehlgeschlagen",
  "admin.billing.subscriptions.billing_summary.lastInvoice.monthlyFlatFee": "Monatliche Pauschalgebühr",
  "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Bezahlt",
@@ -525,6 +526,8 @@
  "admin.channel_settings.channel_moderation.subtitleMembers": "Verwalte die für Kanalmitglieder verfügbaren Aktionen.",
  "admin.channel_settings.channel_moderation.title": "Kanalmoderation",
  "admin.channel_settings.channel_row.configure": "Bearbeiten",
+  "admin.channel_settings.channel_row.managementMethod.group": "Gruppensynchronisierung",
+  "admin.channel_settings.channel_row.managementMethod.manual": "Manuelle Einladungen",
  "admin.channel_settings.description": "Kanaleinstellungen verwalten.",
  "admin.channel_settings.groupsPageTitle": "Kanäle in {siteName}",
  "admin.channel_settings.title": "Kanäle",
@@ -721,6 +724,7 @@
  "admin.data_retention.form.channelAndDirectMessageRetention": "Aufbewahrungsrichtlinien für Kanal- und Direktnachrichten",
  "admin.data_retention.form.days": "Tage",
  "admin.data_retention.form.fileRetention": "Datenaufbewahrung",
+  "admin.data_retention.form.hours": "Stunden",
  "admin.data_retention.form.keepForever": "Für immer behalten",
  "admin.data_retention.form.text": "Gilt für alle Teams und Kanäle, aber nicht für benutzerdefinierte Aufbewahrungsrichtlinien.",
  "admin.data_retention.form.years": "Jahre",
@@ -738,6 +742,7 @@
  "admin.data_retention.jobTimeAM": "{time} AM (UTC)",
  "admin.data_retention.jobTimePM": "{time} PM (UTC)",
  "admin.data_retention.retention_days": "{count} {count, plural, one {Tag} other {Tage}}",
+  "admin.data_retention.retention_hours": "{count} {count, plural, one {Stunde} other {Stunden}}",
  "admin.data_retention.retention_years": "{count} {count, plural, one {Jahr} other {Jahre}}",
  "admin.data_retention.settings.title": "Richtlinien für die Datenaufbewahrung",
  "admin.data_retention.title": "Datenaufbewahrungsrichtlinie",
@@ -775,6 +780,7 @@
  "admin.elasticsearch.enableSearchingTitle": "Elasticsearch für Suchanfragen aktivieren:",
  "admin.elasticsearch.ignoredPurgeIndexes": "Indizes, die beim Bereinigen übersprungen werden sollen:",
  "admin.elasticsearch.ignoredPurgeIndexesDescription": "Wenn ausgefüllt, werden diese durch Komma getrennten Indizes bei der Bereinigung ignoriert.",
+  "admin.elasticsearch.ignoredPurgeIndexesDescription.example": "Z.B.: .opendistro*,.security*",
  "admin.elasticsearch.password": "Z.B.: \"deinpasswort\"",
  "admin.elasticsearch.passwordDescription": "(Optional) Das Passwort zur Authentifizierung am Elasticsearch-Server.",
  "admin.elasticsearch.passwordTitle": "Server-Passwort:",
@@ -894,6 +900,8 @@
  "admin.experimental.allowedEmailDomain.desc": "(Optional) Wenn diese Option festgelegt ist, müssen Benutzer eine E-Mail-Endung in dieser Domäne haben, um Unterhaltungen zu verschieben. Mehrere Domänen können durch Kommas getrennt angegeben werden.",
  "admin.experimental.allowedEmailDomain.title": "Erlaubte E-Mail-Domäne",
  "admin.experimental.clientSideCertCheck.desc": "Wenn **primär**, wird die E-Mail-Adresse des Benutzers aus dem Zertifikat abgerufen, nachdem das Client-seitige Zertifikat verifiziert wurde und wird dafür verwendet, um eine Anmeldung ohne Passwort durchzuführen. Wenn **Sekundär**, wird die E-Mail-Adresse des Benutzers aus dem Zertifikat abgerufen und mit der durch den Benutzer angegebenen Adresse verglichen, nachdem das Client-seitige Zertifikat verifiziert wurde. Falls diese identisch sind, meldet sich der Benutzer mit regulär mit E-Mail/Passwort an.",
+  "admin.experimental.clientSideCertCheck.options.primary": "primär",
+  "admin.experimental.clientSideCertCheck.options.secondary": "sekundär",
  "admin.experimental.clientSideCertCheck.title": "Anmeldemethode für Client-seitige Zertifizierung:",
  "admin.experimental.clientSideCertEnable.desc": "Ermöglicht die client-seitige Zertifizierung deines Mattermost-Servers. Erfahre mehr in der <link>Dokumentation</link>.",
  "admin.experimental.clientSideCertEnable.title": "Client-seitige Zertifizierung aktivieren:",
@@ -904,6 +912,11 @@
  "admin.experimental.collapsedThreads.off": "Deaktiviert",
  "admin.experimental.collapsedThreads.title": "Unterhaltungen",
  "admin.experimental.defaultTheme.desc": "Standardmotiv einstellen, das für neuen Benutzer im System verwendet wird.",
+  "admin.experimental.defaultTheme.options.denim": "Denim",
+  "admin.experimental.defaultTheme.options.indigo": "Indigo",
+  "admin.experimental.defaultTheme.options.onyx": "Onyx",
+  "admin.experimental.defaultTheme.options.quartz": "Quarz",
+  "admin.experimental.defaultTheme.options.sapphire": "Saphir",
  "admin.experimental.defaultTheme.title": "Standardmotiv:",
  "admin.experimental.delayChannelAutocomplete.desc": "Wenn wahr wird die Autovervollständigung für Kanal-Links (z. B. ~town-square) erst nach Eingabe einer Tilde gefolgt von ein paar Buchstaben ausgelöst. Bei falsch wird die automatische Vervollständigung angezeigt, sobald der Benutzer eine Tilde eingibt.",
  "admin.experimental.delayChannelAutocomplete.title": "Verzögerung Kanal-Autovervollständigung:",
@@ -1432,6 +1445,9 @@
  "admin.log.fileTitle": "Logs in Datei schreiben: ",
  "admin.log.jsonDescription": "Wenn \"wahr\", werden geloggte Ereignisse im maschinenlesbaren JSON-Format geschrieben. Andernfalls werden diese als einfacher Text geschrieben. Das Ändern dieser Einstellung erfordert einen Server-Neustart zur Aktivierung.",
  "admin.log.levelDescription": "Diese Einstellung bestimmt auf welchem Detailgrad Lognachrichten in die Konsole geschrieben werden. ERROR: Gibt nur Fehlernachrichten aus. INFO: Gibt Fehlernachrichten und Informationen zum Start und Initialisierung aus. DEBUG: Gibt einen hohen Detailgrad für Entwickler zur Fehlersuche aus.",
+  "admin.log.levelOptions.DEBUG": "DEBUG",
+  "admin.log.levelOptions.ERROR": "ERROR",
+  "admin.log.levelOptions.INFO": "INFO",
  "admin.log.levelTitle": "Konsolen-Log-Level:",
  "admin.log.locationDescription": "Der Ort für die Log-Dateien. Falls leer, werden diese im Verzeichnis ./logs gespeichert. Bei Angabe eines Verzeichnisses muss dieses existieren und Mattermost muss Schreibberechtigungen darauf haben. Das Ändern dieser Einstellung benötigt einen Server-Neustart zur Aktivierung.",
  "admin.log.locationPlaceholder": "Einen Dateiort eingeben",
@@ -1650,7 +1666,7 @@
  "admin.permissions.permission.edit_post.name": "Eigene Nachrichten bearbeiten",
  "admin.permissions.permission.import_team.description": "Team importieren",
  "admin.permissions.permission.import_team.name": "Team importieren",
-  "admin.permissions.permission.invite_guest.description": "Lade Gäste zu Kanälen ein und sende Gästen E-Mail-Einladungen.",
+  "admin.permissions.permission.invite_guest.description": "Lade Gäste zu Teams ein und sende Gästen E-Mail-Einladungen.",
  "admin.permissions.permission.invite_guest.name": "Gäste einladen",
  "admin.permissions.permission.list_team_channels.description": "Team-Kanäle anzeigen",
  "admin.permissions.permission.list_team_channels.name": "Team-Kanäle anzeigen",
@@ -2426,10 +2442,10 @@
  "admin.systemUserDetail.title": "Benutzerkonfiguration",
  "admin.system_roles_feature_discovery.copy": "Verwende Systemrollen um ausgesuchten Benutzern Lese- und/oder Schreibzugriff auf ausgewählte Sektionen der Systemkonsole zu geben.",
  "admin.system_roles_feature_discovery.title": "Erlaube kontrollierten Zugriff auf die Systemkonsole mit Mattermost Enterprise",
-  "admin.system_users.active": "Aktiv",
+  "admin.system_users.active": "Aktiviert",
  "admin.system_users.allUsers": "Alle Benutzer",
  "admin.system_users.guest": "Gast",
-  "admin.system_users.inactive": "Inaktiv",
+  "admin.system_users.inactive": "Deaktiviert",
  "admin.system_users.list.memberSince.days": "{days} Tage",
  "admin.system_users.list.memberSince.today": "Heute",
  "admin.system_users.list.memberSince.yesterday": "Gestern",
@@ -2609,7 +2625,7 @@
  "admin.user_item.demoteToGuest": "Zu Gast herunterstufen",
  "admin.user_item.emailTitle": "**E-Mail:** {email}",
  "admin.user_item.guest": "Gast",
-  "admin.user_item.inactive": "Inaktiv",
+  "admin.user_item.inactive": "Deaktiviert",
  "admin.user_item.makeActive": "Aktivieren",
  "admin.user_item.makeInactive": "Deaktivieren",
  "admin.user_item.makeMember": "Zum Teammitglied machen",
@@ -3151,6 +3167,10 @@
  "cloud.fetch_error": "Fehler beim Abrufen der Rechnungsdaten. Bitte versuch es später noch einmal.",
  "cloud.fetch_error.retry": "Erneut versuchen",
  "cloud.invoice_pdf_preview.download": "Diese Seite für deine Unterlagen <downloadLink>runterladen</downloadLink>",
+  "cloud.renewal.andMoreItems": "+ {count} weitere Artikel",
+  "cloud.renewal.renew": "Erneuern",
+  "cloud.renewal.tobepaid": "Zu zahlen am {date}",
+  "cloud.renewal.viewInvoice": "Rechnung ansehen",
  "cloud.startTrial.modal.btn": "Starte Test",
  "cloud_annual_renewal.banner.buttonText.contactSales": "Vertrieb kontaktieren",
  "cloud_annual_renewal.banner.buttonText.renew": "Erneuern",
@@ -4659,6 +4679,7 @@
  "search_bar.searchGroupMembers": "Gruppenmitglieder suchen",
  "search_bar.search_types.files": "DATEIEN",
  "search_bar.search_types.messages": "NACHRICHTEN",
+  "search_bar.usage.searchLearn": "<a>Erfahre mehr über die Suche</a>",
  "search_bar.usage.search_type_files": "Dateien",
  "search_bar.usage.search_type_messages": "Nachrichten",
  "search_bar.usage.search_type_question": "Wonach suchen Sie?",
@@ -4761,6 +4782,7 @@
  "setting_picture.select": "Auswählen",
  "setting_picture.uploading": "Lade hoch...",
  "shared_channel_indicator.tooltip": "Geteilt mit vertrauenswürdigen Organisationen",
+  "shared_user_indicator.aria_label": "geteilter Benutzerindikator",
  "shared_user_indicator.tooltip": "Von einer vertrauenswürdigen Organisation",
  "shortcuts.browser.channel_next": "Vorwärts in Verlauf:\tAlt|Rechts",
  "shortcuts.browser.channel_next.mac": "Vorwärts in Verlauf:\t⌘|]",
@@ -5689,6 +5711,8 @@
  "user_profile.send.dm": "Nachricht",
  "user_profile.send.dm.icon": "\"Nachricht senden\"-Symbol",
  "user_profile.send.dm.yourself": "Sende dir selbst eine Nachricht",
+  "users_limits_announcement_bar.copyText": "Benutzerlimit überschritten. Kontaktiere den Administrator mit: ERROR_USER_LIMITS_EXCEEDED",
+  "users_limits_announcement_bar.ctaText": "Erfahre mehr",
  "version_bar.new": "Eine neue Version von Mattermost ist verfügbar.",
  "version_bar.refresh": "Lade die App neu",
  "view_image.loading": "Laden ",
--- a/webapp/channels/src/i18n/en_AU.json
+++ b/webapp/channels/src/i18n/en_AU.json
@@ -406,6 +406,7 @@
  "admin.billing.subscription.viewBilling": "View Billing",
  "admin.billing.subscriptions.billing_summary.explore_enterprise": "Explore Enterprise features",
  "admin.billing.subscriptions.billing_summary.explore_enterprise.cta": "View all features",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.approved": "Approved",
  "admin.billing.subscriptions.billing_summary.lastInvoice.failed": "Failed",
  "admin.billing.subscriptions.billing_summary.lastInvoice.monthlyFlatFee": "Monthly Flat Fee",
  "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Paid",
@@ -525,9 +526,14 @@
  "admin.channel_settings.channel_moderation.subtitleMembers": "Manage the actions available to channel members.",
  "admin.channel_settings.channel_moderation.title": "Channel Moderation",
  "admin.channel_settings.channel_row.configure": "Edit",
+  "admin.channel_settings.channel_row.managementMethod.group": "Group Sync",
+  "admin.channel_settings.channel_row.managementMethod.manual": "Manual Invites",
  "admin.channel_settings.description": "Manage channel settings.",
  "admin.channel_settings.groupsPageTitle": "{siteName} Channels",
  "admin.channel_settings.title": "Channels",
+  "admin.channels.filterBy.team.loading": "Loading teams",
+  "admin.channels.filterBy.team.noTeams": "No teams found",
+  "admin.channels.filterBy.team.placeholder": "Search and select teams",
  "admin.cluster.ClusterName": "Cluster Name:",
  "admin.cluster.ClusterNameDesc": "The cluster to join by name. Only nodes with the same cluster name will join together. This is to support Blue-Green deployments or staging pointing to the same database.",
  "admin.cluster.ClusterNameEx": "E.g.: 'Production' or 'Staging'",
@@ -718,6 +724,7 @@
  "admin.data_retention.form.channelAndDirectMessageRetention": "Channel & direct message retention",
  "admin.data_retention.form.days": "Days",
  "admin.data_retention.form.fileRetention": "File retention",
+  "admin.data_retention.form.hours": "Hours",
  "admin.data_retention.form.keepForever": "Keep forever",
  "admin.data_retention.form.text": "Applies to all teams and channels, but does not apply to custom retention policies.",
  "admin.data_retention.form.years": "Years",
@@ -735,6 +742,7 @@
  "admin.data_retention.jobTimeAM": "{time} AM (UTC)",
  "admin.data_retention.jobTimePM": "{time} PM (UTC)",
  "admin.data_retention.retention_days": "{count} {count, plural, one {day} other {days}}",
+  "admin.data_retention.retention_hours": "{count} {count, plural, one {hour} other {hours}}",
  "admin.data_retention.retention_years": "{count} {count, plural, one {year} other {years}}",
  "admin.data_retention.settings.title": "Data Retention Policies",
  "admin.data_retention.title": "Data Retention Policy",
@@ -772,6 +780,7 @@
  "admin.elasticsearch.enableSearchingTitle": "Enable Elasticsearch for search queries:",
  "admin.elasticsearch.ignoredPurgeIndexes": "Indexes to skip while purging:",
  "admin.elasticsearch.ignoredPurgeIndexesDescription": "When filled in, these indexes will be ignored during the purge, separated by commas.",
+  "admin.elasticsearch.ignoredPurgeIndexesDescription.example": "e.g. .opendistro*,.security*",
  "admin.elasticsearch.password": "E.g.: 'yourpassword'",
  "admin.elasticsearch.passwordDescription": "(Optional) The password to authenticate to the Elasticsearch server.",
  "admin.elasticsearch.passwordTitle": "Server Password:",
@@ -884,9 +893,15 @@
  "admin.environment.smtp.smtpUsername.title": "SMTP Server Username:",
  "admin.environment.smtp.testing": "Testing...",
  "admin.environment.webServer": "Web Server",
+  "admin.experimental.PermittedMoveThreadRoles.desc": "Choose who is allowed to move threads to other channels based on roles (other permissions below still apply).",
+  "admin.experimental.PermittedMoveThreadRoles.title": "Permitted Roles",
  "admin.experimental.allowCustomThemes.desc": "Enables the **Display > Theme > Custom Theme** section in Settings.",
  "admin.experimental.allowCustomThemes.title": "Allow Custom Themes:",
+  "admin.experimental.allowedEmailDomain.desc": "(Optional) When set, users must have an email ending in this domain to move threads. Multiple domains can be specified by separating them with commas.",
+  "admin.experimental.allowedEmailDomain.title": "Allowed Email Domain",
  "admin.experimental.clientSideCertCheck.desc": "When **primary**, after the client side certificate is verified, user’s email is retrieved from the certificate and is used to log in without a password. When **secondary**, after the client side certificate is verified, user’s email is retrieved from the certificate and matched against the one supplied by the user. If they match, the user logs in with regular email/password credentials.",
+  "admin.experimental.clientSideCertCheck.options.primary": "primary",
+  "admin.experimental.clientSideCertCheck.options.secondary": "secondary",
  "admin.experimental.clientSideCertCheck.title": "Client-Side Certification Login Method:",
  "admin.experimental.clientSideCertEnable.desc": "Enables client-side certification for your Mattermost server. See <link>documentation</link> to learn more.",
  "admin.experimental.clientSideCertEnable.title": "Enable Client-Side Certification:",
@@ -897,6 +912,11 @@
  "admin.experimental.collapsedThreads.off": "Disabled",
  "admin.experimental.collapsedThreads.title": "Collapsed Reply Threads",
  "admin.experimental.defaultTheme.desc": "Set a default theme that applies to all new users on the system.",
+  "admin.experimental.defaultTheme.options.denim": "Denim",
+  "admin.experimental.defaultTheme.options.indigo": "Indigo",
+  "admin.experimental.defaultTheme.options.onyx": "Onyx",
+  "admin.experimental.defaultTheme.options.quartz": "Quartz",
+  "admin.experimental.defaultTheme.options.sapphire": "Sapphire",
  "admin.experimental.defaultTheme.title": "Default Theme:",
  "admin.experimental.delayChannelAutocomplete.desc": "When true, the autocomplete for channel links (such as ~town-square) will only trigger after typing a tilde followed by several letters. When false, the autocomplete will appear as soon as the user types a tilde.",
  "admin.experimental.delayChannelAutocomplete.title": "Delay Channel Autocomplete:",
@@ -953,6 +973,16 @@
  "admin.experimental.linkMetadataTimeoutMilliseconds.desc": "The number of milliseconds to wait for metadata from a third-party link. Used with Post Metadata.",
  "admin.experimental.linkMetadataTimeoutMilliseconds.example": "E.g.: '5000'",
  "admin.experimental.linkMetadataTimeoutMilliseconds.title": "Link Metadata Timeout:",
+  "admin.experimental.moveThreadFromDirectMessageChannelEnable.desc": "Control whether move thread is permitted to move message threads from direct message channels or not.",
+  "admin.experimental.moveThreadFromDirectMessageChannelEnable.title": "Enable Moving Threads From Direct Message Channels",
+  "admin.experimental.moveThreadFromGroupMessageChannelEnable.desc": "Control whether move thread is permitted to move message threads from group message channels or not.",
+  "admin.experimental.moveThreadFromGroupMessageChannelEnable.title": "Enable Moving Threads From Group Message Channels",
+  "admin.experimental.moveThreadFromPrivateChannelEnable.desc": "Control whether move thread is permitted to move message threads from private channels or not.",
+  "admin.experimental.moveThreadFromPrivateChannelEnable.title": "Enable Moving Threads From Private Channels",
+  "admin.experimental.moveThreadMaxCount.desc": "The maximum number of messages in a thread that the plugin is allowed to move. Leave empty for unlimited messages.",
+  "admin.experimental.moveThreadMaxCount.title": "Max Thread Count Move Size",
+  "admin.experimental.moveThreadToAnotherTeamEnable.desc": "Control whether move thread is permitted to move message threads from one team to another or not.",
+  "admin.experimental.moveThreadToAnotherTeamEnable.title": "Enable Moving Threads To Different Teams",
  "admin.experimental.samlSettingsLoginButtonBorderColor.desc": "Specify the colour of the SAML login button border for white labelling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
  "admin.experimental.samlSettingsLoginButtonBorderColor.title": "SAML login Button Border Colour:",
  "admin.experimental.samlSettingsLoginButtonColor.desc": "Specify the colour of the SAML login button for white labelling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
@@ -1415,6 +1445,9 @@
  "admin.log.fileTitle": "Output logs to file: ",
  "admin.log.jsonDescription": "When true, logged events are written in a machine readable JSON format. Otherwise they are printed as plain text. Changing this setting requires a server restart before taking effect.",
  "admin.log.levelDescription": "This setting determines the level of detail at which log events are written to the console. ERROR: Outputs only error messages. INFO: Outputs error messages and information around startup and initialisation. DEBUG: Prints high detail for developers working on debugging issues.",
+  "admin.log.levelOptions.DEBUG": "DEBUG",
+  "admin.log.levelOptions.ERROR": "ERROR",
+  "admin.log.levelOptions.INFO": "INFO",
  "admin.log.levelTitle": "Console Log Level:",
  "admin.log.locationDescription": "The location of the log files. If blank, they are stored in the ./logs directory. The path that you set must exist and Mattermost must have write permissions in it. Changing this setting requires a server restart before taking effect.",
  "admin.log.locationPlaceholder": "Enter your file location",
@@ -1633,7 +1666,7 @@
  "admin.permissions.permission.edit_post.name": "Edit Own Posts",
  "admin.permissions.permission.import_team.description": "Import team",
  "admin.permissions.permission.import_team.name": "Import team",
-  "admin.permissions.permission.invite_guest.description": "Invite guests to channels and send guest email invites.",
+  "admin.permissions.permission.invite_guest.description": "Invite guests to teams and send guest email invites.",
  "admin.permissions.permission.invite_guest.name": "Invite guests",
  "admin.permissions.permission.list_team_channels.description": "List team channels",
  "admin.permissions.permission.list_team_channels.name": "List team channels",
@@ -2201,6 +2234,8 @@
  "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
  "admin.service.insecureTlsDesc": "When true, any outgoing HTTPS requests will accept unverified, self-signed certificates. For example, outgoing webhooks to a server with a self-signed TLS certificate, using any domain, will be allowed. Note that this makes these connections susceptible to man-in-the-middle attacks.",
  "admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
+  "admin.service.integrationRequestDesc": "The number of seconds to wait for Integration requests. That includes <slashCommands>Slash Commands</slashCommands>, <outgoingWebhooks>Outgoing Webhooks</outgoingWebhooks>, <interactiveMessages>Interactive Messages</interactiveMessages> and <interactiveDialogs>Interactive Dialogs</interactiveDialogs>.",
+  "admin.service.integrationRequestTitle": "Integration request timeout: ",
  "admin.service.internalConnectionsDesc": "A whitelist of local network addresses that can be requested by the Mattermost server on behalf of a client. Care should be used when configuring this setting to prevent unintended access to your local network. See <link>documentation</link> to learn more.",
  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
@@ -2306,6 +2341,7 @@
  "admin.sidebar.logs": "Server Logs",
  "admin.sidebar.metrics": "Performance Monitoring",
  "admin.sidebar.mfa": "MFA",
+  "admin.sidebar.move_thread": "Move thread (Beta)",
  "admin.sidebar.notices": "Notices",
  "admin.sidebar.notifications": "Notifications",
  "admin.sidebar.oauth": "OAuth 2.0",
@@ -2341,6 +2377,7 @@
  "admin.site.emoji": "Emoji",
  "admin.site.fileSharingDownloads": "File Sharing and Downloads",
  "admin.site.localization": "Localisation",
+  "admin.site.move_thread": "Move thread",
  "admin.site.notices": "Notices",
  "admin.site.posts": "Posts",
  "admin.site.public_links": "Public Links",
@@ -2405,10 +2442,13 @@
  "admin.systemUserDetail.title": "User Configuration",
  "admin.system_roles_feature_discovery.copy": "Use System Roles to give designated users read and/or write access to select sections of System Console.",
  "admin.system_roles_feature_discovery.title": "Provide controlled access to the System Console with Mattermost Enterprise",
-  "admin.system_users.active": "Active",
+  "admin.system_users.active": "Activated",
  "admin.system_users.allUsers": "All Users",
  "admin.system_users.guest": "Guest",
-  "admin.system_users.inactive": "Inactive",
+  "admin.system_users.inactive": "Deactivated",
+  "admin.system_users.list.memberSince.days": "{days} days",
+  "admin.system_users.list.memberSince.today": "Today",
+  "admin.system_users.list.memberSince.yesterday": "Yesterday",
  "admin.system_users.noTeams": "No Teams",
  "admin.system_users.revokeAllSessions": "Revoke All Sessions",
  "admin.system_users.revoke_all_sessions_button": "Revoke All Sessions",
@@ -2585,7 +2625,7 @@
  "admin.user_item.demoteToGuest": "Demote to Guest",
  "admin.user_item.emailTitle": "**Email:** {email}",
  "admin.user_item.guest": "Guest",
-  "admin.user_item.inactive": "Inactive",
+  "admin.user_item.inactive": "Deactivated",
  "admin.user_item.makeActive": "Activate",
  "admin.user_item.makeInactive": "Deactivate",
  "admin.user_item.makeMember": "Make Team Member",
@@ -2623,7 +2663,20 @@
  "admin.webserverModeTitle": "Webserver Mode:",
  "admin.webserverModeUncompressed": "Uncompressed",
  "admin.webserverModeUncompressedDescription": "The Mattermost server will serve static files uncompressed.",
+  "adminConsole.list.table.exactTime.at": "at",
+  "adminConsole.list.table.pagination.next": "Go to next page",
+  "adminConsole.list.table.pagination.previous": "Go to previous page",
+  "adminConsole.list.table.pinnedColumn": "This column is pinned",
+  "adminConsole.list.table.rowCount.label": "Show {count} rows per page",
+  "adminConsole.list.table.rowsCount.(show)rowsPerPage": "Show",
+  "adminConsole.list.table.rowsCount.10": "10",
+  "adminConsole.list.table.rowsCount.100": "100",
+  "adminConsole.list.table.rowsCount.20": "20",
+  "adminConsole.list.table.rowsCount.50": "50",
+  "adminConsole.list.table.rowsCount.show(rowsPerPage)": "rows per page",
  "admin_settings.save_unsaved_changes": "Please save unsaved changes first",
+  "air_gapped_contact_sales_modal.body": "Please follow the link below to contact sales.",
+  "air_gapped_contact_sales_modal.title": "Looks like you do not have access to the internet",
  "air_gapped_modal.close": "Close",
  "air_gapped_modal.description": "To start your trial, please visit {link} and request a trial key.",
  "air_gapped_modal.title": "Request a trial key",
@@ -2713,6 +2766,8 @@
  "app.channel.post_update_channel_purpose_message.removed": "{username} removed the channel purpose (was: {old})",
  "app.channel.post_update_channel_purpose_message.updated_from": "{username} updated the channel purpose from: {old} to: {new}",
  "app.channel.post_update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {new}",
+  "app.post.move_thread.from_another_channel": "This thread was moved from another channel",
+  "app.post.move_thread_command.direct_or_group.one_message": "A message has been moved to a Direct/Group Message\n",
  "app_bar.marketplace": "App Marketplace",
  "apps.error": "Error: {error}",
  "apps.error.command.field_missing": "Required fields missing: `{fieldName}`.",
@@ -3109,6 +3164,10 @@
  "cloud.fetch_error": "Error fetching billing data. Please try again later.",
  "cloud.fetch_error.retry": "Retry",
  "cloud.invoice_pdf_preview.download": "<downloadLink>Download</downloadLink> this page for your records",
+  "cloud.renewal.andMoreItems": "+ {count} more items",
+  "cloud.renewal.renew": "Renew",
+  "cloud.renewal.tobepaid": "To be paid on {date}",
+  "cloud.renewal.viewInvoice": "View Invoice",
  "cloud.startTrial.modal.btn": "Start trial",
  "cloud_annual_renewal.banner.buttonText.contactSales": "Contact Sales",
  "cloud_annual_renewal.banner.buttonText.renew": "Renew",
@@ -4076,6 +4135,12 @@
  "more_direct_channels.new_convo_note": "This will start a new conversation. If you're adding a lot of people, consider creating a private channel instead.",
  "more_direct_channels.new_convo_note.full": "You've reached the maximum number of people for this conversation. Consider creating a private channel instead.",
  "more_direct_channels.title": "Direct Messages",
+  "move_thread_modal.button.cancel": "Cancel",
+  "move_thread_modal.button.forward": "Move",
+  "move_thread_modal.notification.dm_or_gm": "Moving this thread changes who has access",
+  "move_thread_modal.preview.footer_message": "Originally posted in ~{channelName}",
+  "move_thread_modal.preview.title": "Message preview",
+  "move_thread_modal.title": "Move thread",
  "msg_typing.areTyping": "{users} and {last} are typing...",
  "msg_typing.isTyping": "{user} is typing...",
  "multiselect.add": "Add",
@@ -4381,6 +4446,7 @@
  "post_info.message.show_more": "Show more",
  "post_info.message.visible": "(Only visible to you)",
  "post_info.message.visible.compact": " (Only visible to you)",
+  "post_info.move_thread": "Move Thread",
  "post_info.permalink": "Copy Link",
  "post_info.pin": "Pin to Channel",
  "post_info.post_reminder.menu": "Remind",
@@ -4610,6 +4676,7 @@
  "search_bar.searchGroupMembers": "Search group members",
  "search_bar.search_types.files": "FILES",
  "search_bar.search_types.messages": "MESSAGES",
+  "search_bar.usage.searchLearn": "<a>Learn about search</a>",
  "search_bar.usage.search_type_files": "Files",
  "search_bar.usage.search_type_messages": "Messages",
  "search_bar.usage.search_type_question": "What are you searching for?",
@@ -4648,6 +4715,7 @@
  "search_list_option.on": "Messages on a date",
  "search_list_option.phrases": "Messages with phrases",
  "search_results.channel-files-header": "Recent files",
+  "sectionNotice.dismiss": "Dismiss notice",
  "select_team.icon": "Select Team Icon",
  "select_team.join.icon": "Join Team Icon",
  "select_team.private.icon": "Private Team",
@@ -4711,6 +4779,7 @@
  "setting_picture.select": "Select",
  "setting_picture.uploading": "Uploading...",
  "shared_channel_indicator.tooltip": "Shared with trusted organisations",
+  "shared_user_indicator.aria_label": "shared user indicator",
  "shared_user_indicator.tooltip": "From a trusted organisation",
  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
@@ -5456,6 +5525,7 @@
  "user.settings.notifications.threads.desktop": "Thread reply notifications",
  "user.settings.notifications.threads.push": "Thread reply notifications",
  "user.settings.notifications.title": "Notification Settings",
+  "user.settings.plugins.title": "{pluginName} Settings",
  "user.settings.profile.icon": "Profile Settings Icon",
  "user.settings.push_notification.allActivity": "For all activity",
  "user.settings.push_notification.allActivityAway": "For all activity when away or offline",
@@ -5586,6 +5656,7 @@
  "userGuideHelp.mattermostUserGuide": "Mattermost user guide",
  "userGuideHelp.reportAProblem": "Report a problem",
  "userGuideHelp.trainingResources": "Training resources",
+  "userSettingsModal.pluginPreferences.header": "PLUGIN PREFERENCES",
  "user_group_popover.close": "Close",
  "user_group_popover.memberCount": "{member_count} {member_count, plural, one {Member} other {Members}}",
  "user_group_popover.openGroupModal": "View full group info",
@@ -5637,6 +5708,8 @@
  "user_profile.send.dm": "Message",
  "user_profile.send.dm.icon": "Send Message Icon",
  "user_profile.send.dm.yourself": "Send yourself a message",
+  "users_limits_announcement_bar.copyText": "User limits exceeded. Contact administrator with: ERROR_USER_LIMITS_EXCEEDED",
+  "users_limits_announcement_bar.ctaText": "Learn More",
  "version_bar.new": "A new version of Mattermost is available.",
  "version_bar.refresh": "Refresh the app now",
  "view_image.loading": "Loading ",
--- a/webapp/channels/src/i18n/ja.json
+++ b/webapp/channels/src/i18n/ja.json
@@ -406,6 +406,7 @@
  "admin.billing.subscription.viewBilling": "請求を確認する",
  "admin.billing.subscriptions.billing_summary.explore_enterprise": "Enterprise版の機能を確認する",
  "admin.billing.subscriptions.billing_summary.explore_enterprise.cta": "全ての機能を確認する",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.approved": "承認済み",
  "admin.billing.subscriptions.billing_summary.lastInvoice.failed": "失敗",
  "admin.billing.subscriptions.billing_summary.lastInvoice.monthlyFlatFee": "月間定額料金",
  "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "支払い済",
@@ -525,6 +526,8 @@
  "admin.channel_settings.channel_moderation.subtitleMembers": "チャンネルメンバが利用できるアクションを管理する。",
  "admin.channel_settings.channel_moderation.title": "チャンネルモデレーション",
  "admin.channel_settings.channel_row.configure": "編集する",
+  "admin.channel_settings.channel_row.managementMethod.group": "グループ同期",
+  "admin.channel_settings.channel_row.managementMethod.manual": "手動で招待する",
  "admin.channel_settings.description": "チャンネル設定を管理する。",
  "admin.channel_settings.groupsPageTitle": "{siteName} チャンネル",
  "admin.channel_settings.title": "チャンネル",
@@ -721,6 +724,7 @@
  "admin.data_retention.form.channelAndDirectMessageRetention": "チャンネルとダイレクトメッセージの保持",
  "admin.data_retention.form.days": "日数",
  "admin.data_retention.form.fileRetention": "ファイル保持期間",
+  "admin.data_retention.form.hours": "時間",
  "admin.data_retention.form.keepForever": "いつまでも",
  "admin.data_retention.form.text": "すべてのチームとチャネルに適用されますが、カスタム保持ポリシーには適用されません。",
  "admin.data_retention.form.years": "年数",
@@ -738,6 +742,7 @@
  "admin.data_retention.jobTimeAM": "{time} AM (UTC)",
  "admin.data_retention.jobTimePM": "{time} PM (UTC)",
  "admin.data_retention.retention_days": "{count} {count, plural, one {日} other {日}}",
+  "admin.data_retention.retention_hours": "{count} {count, plural, one {時間} other {時間}}",
  "admin.data_retention.retention_years": "{count} {count, plural, one {年} other {年}}",
  "admin.data_retention.settings.title": "データ保持ポリシー",
  "admin.data_retention.title": "データ保持ポリシー",
@@ -775,6 +780,7 @@
  "admin.elasticsearch.enableSearchingTitle": "Elasticsearchの検索クエリを有効にする:",
  "admin.elasticsearch.ignoredPurgeIndexes": "パージ中にスキップするインデックス：",
  "admin.elasticsearch.ignoredPurgeIndexesDescription": "カンマ区切りでインデックスを入力すると、指定されたインデックスは破棄処理の対象外となります。",
+  "admin.elasticsearch.ignoredPurgeIndexesDescription.example": "例: .opendistro*,.security*",
  "admin.elasticsearch.password": "例: \"yourpassword\"",
  "admin.elasticsearch.passwordDescription": "(オプション) Elasticsearchサーバーを認証するためのパスワード。",
  "admin.elasticsearch.passwordTitle": "サーバーパスワード:",
@@ -894,6 +900,8 @@
  "admin.experimental.allowedEmailDomain.desc": "(オプション) 設定すると、このドメインで終わる電子メールを持っているユーザーのみがスレッドを移動できるようになります。カンマ区切りで複数のドメインを指定できます。",
  "admin.experimental.allowedEmailDomain.title": "許可された電子メールドメイン",
  "admin.experimental.clientSideCertCheck.desc": "**プライマリ**の場合、クライアント証明書が検証された後、ユーザーの電子メールアドレスが証明書から取得され、パスワード無しのログインに使用されます。**セカンダリ**の場合、クライアント証明書が検証された後、ユーザーの電子メールアドレスが証明書から取得され、ユーザーから提供された電子メールアドレスとの一致確認が行われます。一致する場合、通常の電子メールアドレス/パスワード認証によるログインが行われます。",
+  "admin.experimental.clientSideCertCheck.options.primary": "プライマリ",
+  "admin.experimental.clientSideCertCheck.options.secondary": "セカンダリ",
  "admin.experimental.clientSideCertCheck.title": "クライアント証明書ログイン方法:",
  "admin.experimental.clientSideCertEnable.desc": "Mattermostサーバーに対するクライアント証明書を有効にします。詳しくは<link>説明文書</link>を参照してください。",
  "admin.experimental.clientSideCertEnable.title": "クライアント証明書を有効にする:",
@@ -904,6 +912,11 @@
  "admin.experimental.collapsedThreads.off": "無効",
  "admin.experimental.collapsedThreads.title": "返信スレッドの折りたたみ:",
  "admin.experimental.defaultTheme.desc": "すべての新規ユーザーに適用されるデフォルトテーマを設定します。",
+  "admin.experimental.defaultTheme.options.denim": "Denim",
+  "admin.experimental.defaultTheme.options.indigo": "Indigo",
+  "admin.experimental.defaultTheme.options.onyx": "Onyx",
+  "admin.experimental.defaultTheme.options.quartz": "Quartz",
+  "admin.experimental.defaultTheme.options.sapphire": "Sappire",
  "admin.experimental.defaultTheme.title": "デフォルトテーマ:",
  "admin.experimental.delayChannelAutocomplete.desc": "有効な場合、チャンネルリンク(~town-square など)の自動補完は、チルダに続いて何文字かを入力した後でのみ起動します。無効な場合、ユーザーがチルダを入力するとすぐに自動補完が表示されます。",
  "admin.experimental.delayChannelAutocomplete.title": "チャンネル自動補完の遅延:",
@@ -1432,6 +1445,9 @@
  "admin.log.fileTitle": "ログをファイルに出力する: ",
  "admin.log.jsonDescription": "有効な場合、マシンが読み取り可能なJSON形式でイベントログが書き出されます。無効な場合はプレーンテキスト形式で書き出されます。この設定を有効にするにはサーバーを再起動する必要があります。",
  "admin.log.levelDescription": "この設定は、どのログイベントをコンソールに出力するか決定します。ERROR: エラーメッセージのみを出力する。INFO: エラーと起動と初期化の情報を出力する。DEBUG: 問題をデバッグする開発者向けの詳細を出力する。",
+  "admin.log.levelOptions.DEBUG": "DEBUG",
+  "admin.log.levelOptions.ERROR": "ERROR",
+  "admin.log.levelOptions.INFO": "INFO",
  "admin.log.levelTitle": "コンソールログレベル:",
  "admin.log.locationDescription": "ログファイルの場所です。空欄の場合、./logs ディレクトリに保存されます。設定するパスは存在するファイルパスでなければならず、Mattermostがそのパスへの書き込み権限を持っている必要があります。この設定を有効にするにはサーバーを再起動する必要があります。",
  "admin.log.locationPlaceholder": "ファイルの場所を入力してください",
@@ -1650,7 +1666,7 @@
  "admin.permissions.permission.edit_post.name": "自分の投稿の編集",
  "admin.permissions.permission.import_team.description": "チームのインポート",
  "admin.permissions.permission.import_team.name": "チームのインポート",
-  "admin.permissions.permission.invite_guest.description": "チャンネルへゲストを招待し、ゲストへ招待電子メールを送信する。",
+  "admin.permissions.permission.invite_guest.description": "チームへゲストを招待し、ゲストへ招待電子メールを送信する。",
  "admin.permissions.permission.invite_guest.name": "ゲストを招待する",
  "admin.permissions.permission.list_team_channels.description": "チームのチャンネル一覧",
  "admin.permissions.permission.list_team_channels.name": "チームのチャンネル一覧",
@@ -2426,10 +2442,10 @@
  "admin.systemUserDetail.title": "ユーザー設定",
  "admin.system_roles_feature_discovery.copy": "システムロールは、指定したユーザーにシステムコンソールの特定のセクションに対する読み取りおよび書き込みのアクセス権を与えるために使用します。",
  "admin.system_roles_feature_discovery.title": "Mattermost Enterpriseでシステムコンソールへの制御されたアクセスを提供する",
-  "admin.system_users.active": "有効",
+  "admin.system_users.active": "Activated",
  "admin.system_users.allUsers": "全てのユーザー",
  "admin.system_users.guest": "ゲスト",
-  "admin.system_users.inactive": "無効化済み",
+  "admin.system_users.inactive": "Deactivated",
  "admin.system_users.list.memberSince.days": "{days} 日",
  "admin.system_users.list.memberSince.today": "本日",
  "admin.system_users.list.memberSince.yesterday": "昨日",
@@ -2609,7 +2625,7 @@
  "admin.user_item.demoteToGuest": "ゲストアカウントに降格する",
  "admin.user_item.emailTitle": "**電子メールアドレス:** {email}",
  "admin.user_item.guest": "ゲスト",
-  "admin.user_item.inactive": "無効化済み",
+  "admin.user_item.inactive": "Deactivated",
  "admin.user_item.makeActive": "有効にする",
  "admin.user_item.makeInactive": "無効にする",
  "admin.user_item.makeMember": "メンバーにする",
@@ -3151,6 +3167,10 @@
  "cloud.fetch_error": "請求データの取得中にエラーが発生しました。後でもう一度試してみてください。",
  "cloud.fetch_error.retry": "再試行",
  "cloud.invoice_pdf_preview.download": "記録用にこのページを<downloadLink>ダウンロードする</downloadLink>",
+  "cloud.renewal.andMoreItems": "+ {count} 項目",
+  "cloud.renewal.renew": "更新",
+  "cloud.renewal.tobepaid": "支払日 {date}",
+  "cloud.renewal.viewInvoice": "請求書を見る",
  "cloud.startTrial.modal.btn": "トライアル開始",
  "cloud_annual_renewal.banner.buttonText.contactSales": "営業に問い合わせる",
  "cloud_annual_renewal.banner.buttonText.renew": "更新",
@@ -4659,6 +4679,7 @@
  "search_bar.searchGroupMembers": "グループメンバー検索",
  "search_bar.search_types.files": "FILES",
  "search_bar.search_types.messages": "MESSAGES",
+  "search_bar.usage.searchLearn": "<a>検索について</a>",
  "search_bar.usage.search_type_files": "ファイル",
  "search_bar.usage.search_type_messages": "メッセージ",
  "search_bar.usage.search_type_question": "何をお探しですか?",
@@ -4761,6 +4782,7 @@
  "setting_picture.select": "選択",
  "setting_picture.uploading": "アップロードしています...",
  "shared_channel_indicator.tooltip": "信頼できる組織との共有",
+  "shared_user_indicator.aria_label": "共有ユーザー表示",
  "shared_user_indicator.tooltip": "信頼できる組織から",
  "shortcuts.browser.channel_next": "履歴の次へ:\tAlt|Right",
  "shortcuts.browser.channel_next.mac": "履歴の次へ:\t⌘|]",
@@ -5689,6 +5711,8 @@
  "user_profile.send.dm": "メッセージ",
  "user_profile.send.dm.icon": "メッセージ送信アイコン",
  "user_profile.send.dm.yourself": "自分にメッセーを送る",
+  "users_limits_announcement_bar.copyText": "ユーザー制限を超えました。次のキーワードと共に管理者に連絡してください: ERROR_USER_LIMITS_EXCEEDED",
+  "users_limits_announcement_bar.ctaText": "詳しく",
  "version_bar.new": "新しいバージョンのMattermostが利用可能です。",
  "version_bar.refresh": "今すぐアプリを更新する",
  "view_image.loading": "読み込み中です ",
--- a/webapp/channels/src/i18n/lt.json
+++ b/webapp/channels/src/i18n/lt.json
@@ -178,6 +178,7 @@
  "add_outgoing_webhook.displayName": "Pavadinimas",
  "add_outgoing_webhook.displayName.help": "Nurodykite žiniatinklio kablio nustatymų puslapio pavadinimą. Pavadinime gali būti iki 64 simbolių.",
  "add_outgoing_webhook.doneHelp": "Išeinantis žiniatinklio kablio nustatytas. Šis prieigos raktas bus išsiųstas išeinančiame naudingajame krovinyje. Naudokite jį norėdami patvirtinti, kad užklausa gauta iš Jūsų Mattermost komandos (išsamesnė informacija adresu<link> Siunčiami žiniatinklio kabliukai</link> ).",
+  "add_outgoing_webhook.header": "Siunčiami žiniatinklio \"kabliai\"",
  "add_outgoing_webhook.icon_url": "Profilio nuotrauka",
  "add_outgoing_webhook.icon_url.help": "Įveskite .png arba .jpg failo URL, kad šis integravimas būtų naudojamas kaip profilio nuotrauka skelbiant. Failas turi būti ne mažesnis kaip 128 x 128 pikseliai. Jei paliekama tuščia, naudojama profilio nuotrauka, kurią nurodė webhook kūrėjas.",
  "add_outgoing_webhook.save": "Išsaugoti",
--- a/webapp/channels/src/i18n/nl.json
+++ b/webapp/channels/src/i18n/nl.json
@@ -406,6 +406,7 @@
  "admin.billing.subscription.viewBilling": "Facturatie bekijken",
  "admin.billing.subscriptions.billing_summary.explore_enterprise": "Ontdek de Enterprise-functies",
  "admin.billing.subscriptions.billing_summary.explore_enterprise.cta": "Bekijk alle functies",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.approved": "Goedgekeurd",
  "admin.billing.subscriptions.billing_summary.lastInvoice.failed": "Mislukt",
  "admin.billing.subscriptions.billing_summary.lastInvoice.monthlyFlatFee": "Maandelijkse vaste vergoeding",
  "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Betaald",
@@ -525,6 +526,8 @@
  "admin.channel_settings.channel_moderation.subtitleMembers": "De acties beheren die beschikbaar zijn voor de kanaalleden.",
  "admin.channel_settings.channel_moderation.title": "Kanaalmoderatie",
  "admin.channel_settings.channel_row.configure": "Bewerken",
+  "admin.channel_settings.channel_row.managementMethod.group": "Groepssynchronisatie",
+  "admin.channel_settings.channel_row.managementMethod.manual": "Handmatig uitgenodigd",
  "admin.channel_settings.description": "Beheer kanaalinstellingen.",
  "admin.channel_settings.groupsPageTitle": "{siteName} Kanalen",
  "admin.channel_settings.title": "Kanalen",
@@ -721,6 +724,7 @@
  "admin.data_retention.form.channelAndDirectMessageRetention": "Bewaring van kanaal- en direchte berichten",
  "admin.data_retention.form.days": "Dagen",
  "admin.data_retention.form.fileRetention": "Bewaring van bestanden",
+  "admin.data_retention.form.hours": "Uren",
  "admin.data_retention.form.keepForever": "Voor altijd bewaren",
  "admin.data_retention.form.text": "Geldt voor alle teams en kanalen, maar is niet van toepassing op aangepast bewaringsbeleid.",
  "admin.data_retention.form.years": "Jaren",
@@ -738,6 +742,7 @@
  "admin.data_retention.jobTimeAM": "{time} AM (UTC)",
  "admin.data_retention.jobTimePM": "{time} PM (UTC)",
  "admin.data_retention.retention_days": "{count} {count, plural, one {dag} other {dagen}}",
+  "admin.data_retention.retention_hours": "{count} {count, plural, one {uur} other {uren}}",
  "admin.data_retention.retention_years": "{count} {count, plural, one {jaar} other {jaren}}",
  "admin.data_retention.settings.title": "Beleid inzake gegevensbewaring",
  "admin.data_retention.title": "Gegevensbewaarbeleid",
@@ -775,6 +780,7 @@
  "admin.elasticsearch.enableSearchingTitle": "Elasticsearch inschakelen voor zoekquery's:",
  "admin.elasticsearch.ignoredPurgeIndexes": "Indexen die moeten worden overgeslagen tijdens het opschonen:",
  "admin.elasticsearch.ignoredPurgeIndexesDescription": "Als dit ingevuld is, worden deze indexen genegeerd tijdens het opschonen gescheiden door komma's.",
+  "admin.elasticsearch.ignoredPurgeIndexesDescription.example": "Bijv.: .opendistro*,.security*",
  "admin.elasticsearch.password": "Bijv.: \"jewachtwoord\"",
  "admin.elasticsearch.passwordDescription": "(Optioneel) Het wachtwoord om aan te melden bij de Elasticsearch-server.",
  "admin.elasticsearch.passwordTitle": "Server Wachtwoord:",
@@ -894,6 +900,8 @@
  "admin.experimental.allowedEmailDomain.desc": "(Optioneel) Als dit is ingesteld, moeten gebruikers een e-mailadres in dit domein hebben om draadjes te kunnen verplaatsen. Meerdere domeinen kunnen worden opgegeven door ze te scheiden met komma's.",
  "admin.experimental.allowedEmailDomain.title": "Toegestaan e-maildomein",
  "admin.experimental.clientSideCertCheck.desc": "Wanneer ** primair**, nadat het clientcertificaat is geverifieerd, wordt de e-mail van de gebruiker opgehaald uit het certificaat en wordt dit gebruikt om zonder wachtwoord aan te melden. Wanneer ** secondary**, nadat het clientcertificaat is geverifieerd, wordt de e-mail van de gebruiker opgehaald uit het certificaat en vergeleken met de e-mail die door de gebruiker is geleverd. Als deze overeenkomen, meldt de gebruiker zich aan met gewone e-mail-en wachtwoordgegevens.",
+  "admin.experimental.clientSideCertCheck.options.primary": "primair",
+  "admin.experimental.clientSideCertCheck.options.secondary": "secundair",
  "admin.experimental.clientSideCertCheck.title": "Aanmeldingsmethode Voor Clientcertificering:",
  "admin.experimental.clientSideCertEnable.desc": "Hiermee schakel je client-side certificaten voor jouw Mattermost server in. Zie <link>documentatie</link> om meer te weten.",
  "admin.experimental.clientSideCertEnable.title": "Client-side-certificering inschakelen:",
@@ -904,6 +912,11 @@
  "admin.experimental.collapsedThreads.off": "Uitgeschakeld",
  "admin.experimental.collapsedThreads.title": "Ingeklapte antwoorddraadjes",
  "admin.experimental.defaultTheme.desc": "Stel een standaardthema in dat van toepassing is op alle nieuwe gebruikers op het systeem.",
+  "admin.experimental.defaultTheme.options.denim": "Jeans",
+  "admin.experimental.defaultTheme.options.indigo": "Indigo",
+  "admin.experimental.defaultTheme.options.onyx": "Onyx",
+  "admin.experimental.defaultTheme.options.quartz": "Kwarts",
+  "admin.experimental.defaultTheme.options.sapphire": "Saffier",
  "admin.experimental.defaultTheme.title": "Standaardthema:",
  "admin.experimental.delayChannelAutocomplete.desc": "Indien ingeschakeld, zal de autoaanvulling voor kanaallinks (zoals ~town-square) alleen geactiveerd worden na het intypen van een tilde gevolgd door een paar letters. Indien niet ingeschakeld verschijnt de autoaanvulling zodra de gebruiker een tilde intikt.",
  "admin.experimental.delayChannelAutocomplete.title": "Vertragen autoaanvullen van kanalen:",
@@ -1432,6 +1445,9 @@
  "admin.log.fileTitle": "Log naar bestand: ",
  "admin.log.jsonDescription": "Als dit waar is, worden vastgelegde events weggeschreven in een door een machine leesbare JSON-indeling. Anders worden ze afgedrukt als platte tekst. Als u deze instelling wijzigt, moet u eerst een herstart van de server uitvoeren.",
  "admin.log.levelDescription": "Deze instelling bepaalt de mate van detail waarin log berichten naar het logboekbestand geschreven worden. FOUT: Geeft alleen maar foutmeldingen. INFO: Geeft de fout berichten en informatie rond het opstarten en initialisatie. DEBUG: Afdrukken van hoge mate van detail voor ontwikkelaars die werken aan het debuggen van problemen.",
+  "admin.log.levelOptions.DEBUG": "DEBUG",
+  "admin.log.levelOptions.ERROR": "ERROR",
+  "admin.log.levelOptions.INFO": "INFO",
  "admin.log.levelTitle": "Console Log Level:",
  "admin.log.locationDescription": "De locatie van de logboekbestanden. Als dit veld leeg is, worden deze opgeslagen in de directory ./logs. Het pad dat u instelt moet bestaan en Mattermost moet schrijfrechten hebben. Als u deze instelling wijzigt, moet u eerst een herstart van de server uitvoeren.",
  "admin.log.locationPlaceholder": "Voer uw bestand locatie in",
@@ -1650,7 +1666,7 @@
  "admin.permissions.permission.edit_post.name": "Eigen Berichten Bewerken",
  "admin.permissions.permission.import_team.description": "Importeer team",
  "admin.permissions.permission.import_team.name": "Importeer team",
-  "admin.permissions.permission.invite_guest.description": "Nodig gasten uit naar kanalen en stuur gastuitnodigingen per e-mail.",
+  "admin.permissions.permission.invite_guest.description": "Nodig gasten uit naar teams en verstuur gastuitnodigingen per e-mail.",
  "admin.permissions.permission.invite_guest.name": "Gasten uitnodigen",
  "admin.permissions.permission.list_team_channels.description": "Lijst teamkanalen",
  "admin.permissions.permission.list_team_channels.name": "Lijst teamkanalen",
@@ -2426,10 +2442,10 @@
  "admin.systemUserDetail.title": "Gebruikersconfiguratie",
  "admin.system_roles_feature_discovery.copy": "Gebruik systeemrollen om aangewezen gebruikers lees- en/of schrijftoegang te geven tot bepaalde delen van de systeemconsole.",
  "admin.system_roles_feature_discovery.title": "Zorg voor gecontroleerde toegang tot de systeemconsole met Mattermost Enterprise",
-  "admin.system_users.active": "Actief",
+  "admin.system_users.active": "Geactiveerd",
  "admin.system_users.allUsers": "Alle gebruikers",
  "admin.system_users.guest": "Gastgebruiker",
-  "admin.system_users.inactive": "Inactief",
+  "admin.system_users.inactive": "Gedeactiveerd",
  "admin.system_users.list.memberSince.days": "{days} dagen",
  "admin.system_users.list.memberSince.today": "Vandaag",
  "admin.system_users.list.memberSince.yesterday": "Gisteren",
@@ -2609,7 +2625,7 @@
  "admin.user_item.demoteToGuest": "Verlagen naar gast",
  "admin.user_item.emailTitle": "**E-mail:** {email}",
  "admin.user_item.guest": "Gastgebruiker",
-  "admin.user_item.inactive": "Inactief",
+  "admin.user_item.inactive": "Gedeactiveerd",
  "admin.user_item.makeActive": "Activeren",
  "admin.user_item.makeInactive": "Deactiveren",
  "admin.user_item.makeMember": "Maak teamlid",
@@ -3151,6 +3167,10 @@
  "cloud.fetch_error": "Fout bij het ophalen van facturatiegegevens. Probeer het later nog eens.",
  "cloud.fetch_error.retry": "Opnieuw proberen",
  "cloud.invoice_pdf_preview.download": "<downloadLink>Download</downloadLink> deze pagina voor jouw administratie",
+  "cloud.renewal.andMoreItems": "+ {count} andere items",
+  "cloud.renewal.renew": "Vernieuwen",
+  "cloud.renewal.tobepaid": "Te betalen op {date}",
+  "cloud.renewal.viewInvoice": "Factuur bekijken",
  "cloud.startTrial.modal.btn": "Start de proefperiode",
  "cloud_annual_renewal.banner.buttonText.contactSales": "Contacteer de verkoopsafdeling",
  "cloud_annual_renewal.banner.buttonText.renew": "Vernieuwen",
@@ -4659,6 +4679,7 @@
  "search_bar.searchGroupMembers": "Groepsleden zoeken",
  "search_bar.search_types.files": "BESTANDEN",
  "search_bar.search_types.messages": "BERICHTEN",
+  "search_bar.usage.searchLearn": "<a>Meer informatie over zoeken</a>",
  "search_bar.usage.search_type_files": "Bestanden",
  "search_bar.usage.search_type_messages": "Berichten",
  "search_bar.usage.search_type_question": "Waar ben je naar op zoek?",
@@ -4761,6 +4782,7 @@
  "setting_picture.select": "Selecteer",
  "setting_picture.uploading": "Bezig met uploaden...",
  "shared_channel_indicator.tooltip": "Gedeeld met vertrouwde organisaties",
+  "shared_user_indicator.aria_label": "gedeelde gebruikersindicator",
  "shared_user_indicator.tooltip": "Van een vertrouwde organisatie",
  "shortcuts.browser.channel_next": "Vooruit in de geschiedenis:\tAlt|Rechts",
  "shortcuts.browser.channel_next.mac": "Vooruit in de geschiedenis:\t⌘|]",
@@ -5689,6 +5711,8 @@
  "user_profile.send.dm": "Bericht",
  "user_profile.send.dm.icon": "Bericht Verzenden Pictogram",
  "user_profile.send.dm.yourself": "Stuur jezelf een bericht",
+  "users_limits_announcement_bar.copyText": "Gebruikerslimieten overschreden. Neem contact op met beheerder met: ERROR_USER_LIMITS_EXCEEDED",
+  "users_limits_announcement_bar.ctaText": "Meer informatie",
  "version_bar.new": "Een nieuwe versie van Mattermost is beschikbaar.",
  "version_bar.refresh": "De app nu vernieuwen",
  "view_image.loading": "Bezig met laden ",
--- a/webapp/channels/src/i18n/pl.json
+++ b/webapp/channels/src/i18n/pl.json
@@ -406,6 +406,7 @@
  "admin.billing.subscription.viewBilling": "Wyświetl rozliczenia",
  "admin.billing.subscriptions.billing_summary.explore_enterprise": "Poznaj funkcje Enterprise",
  "admin.billing.subscriptions.billing_summary.explore_enterprise.cta": "Wyświetl wszystkie funkcje",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.approved": "Zatwierdzony",
  "admin.billing.subscriptions.billing_summary.lastInvoice.failed": "Błąd",
  "admin.billing.subscriptions.billing_summary.lastInvoice.monthlyFlatFee": "Miesięczna opłata ryczałtowa",
  "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "Płatne",
@@ -525,6 +526,8 @@
  "admin.channel_settings.channel_moderation.subtitleMembers": "Zarządzaj działaniami dostępnymi dla członków kanału.",
  "admin.channel_settings.channel_moderation.title": "Moderacja Kanału",
  "admin.channel_settings.channel_row.configure": "Edytuj",
+  "admin.channel_settings.channel_row.managementMethod.group": "Synchronizacja Grup",
+  "admin.channel_settings.channel_row.managementMethod.manual": "Zaproszenia Ręczne",
  "admin.channel_settings.description": "Zarządzanie ustawieniami kanałów.",
  "admin.channel_settings.groupsPageTitle": "{siteName} Kanały",
  "admin.channel_settings.title": "Kanały",
@@ -721,6 +724,7 @@
  "admin.data_retention.form.channelAndDirectMessageRetention": "Przechowywanie kanału i wiadomości bezpośrednich",
  "admin.data_retention.form.days": "Dni",
  "admin.data_retention.form.fileRetention": "Przechowywanie plików",
+  "admin.data_retention.form.hours": "Godziny",
  "admin.data_retention.form.keepForever": "Zachowaj na zawsze",
  "admin.data_retention.form.text": "Dotyczy wszystkich zespołów i kanałów, ale nie ma zastosowania do niestandardowych zasad przechowywania.",
  "admin.data_retention.form.years": "Lata",
@@ -738,6 +742,7 @@
  "admin.data_retention.jobTimeAM": "{time} AM (UTC)",
  "admin.data_retention.jobTimePM": "{time} PM (UTC)",
  "admin.data_retention.retention_days": "{count} {count, plural, one {dzień} other {dni}}",
+  "admin.data_retention.retention_hours": "{count} {count, plural, one {godzina} other {godziny}}",
  "admin.data_retention.retention_years": "{count} {count, plural, one {rok} other {lata}}",
  "admin.data_retention.settings.title": "Zasady przechowywania danych",
  "admin.data_retention.title": "Polityka Retencji Danych",
@@ -775,6 +780,7 @@
  "admin.elasticsearch.enableSearchingTitle": "Włącz Elasticsearch dla zapytań wyszukiwania:",
  "admin.elasticsearch.ignoredPurgeIndexes": "Indeksy do pominięcia podczas oczyszczania:",
  "admin.elasticsearch.ignoredPurgeIndexesDescription": "Po wypełnieniu indeksy te będą ignorowane podczas czyszczenia, oddzielone przecinkami.",
+  "admin.elasticsearch.ignoredPurgeIndexesDescription.example": "Na przykład: .opendistro*, .security*",
  "admin.elasticsearch.password": "E.g.: \"twojehasło\"",
  "admin.elasticsearch.passwordDescription": "(Opcjonalnie) Hasło do autentyfikacji z serwerem Elasticsearch.",
  "admin.elasticsearch.passwordTitle": "Hasło Serwera:",
@@ -894,6 +900,8 @@
  "admin.experimental.allowedEmailDomain.desc": "(Opcjonalnie) Po ustawieniu użytkownicy muszą mieć adres e-mail kończący się w tej domenie, aby przenosić wątki. Można określić wiele domen, oddzielając je przecinkami.",
  "admin.experimental.allowedEmailDomain.title": "Dozwolona domena e-mail",
  "admin.experimental.clientSideCertCheck.desc": "Jeśli wybrano opcję **główny**, po weryfikacji certyfikatu po stronie klienta, adres E-Mail użytkownika zostanie pobrany z certyfikatu oraz zostanie użyty do zalogowania bez hasła. Jeśli wybrano opcję **podrzędny** to, po weryfikacji certyfikatu po stronie klienta, adres E-Mail zostanie pobrany z certyfikatu i ponownie sprawdzony z certyfikatem podanym przez użytkownika. Jeśli te będą się zgadzały, to użytkowników zaloguje się standardowymi danymi uwierzytelniającymi czyli E-Mail/Hasło.",
+  "admin.experimental.clientSideCertCheck.options.primary": "podstawowy",
+  "admin.experimental.clientSideCertCheck.options.secondary": "drugorzędny",
  "admin.experimental.clientSideCertCheck.title": "Metoda logowania po stronie klienta:",
  "admin.experimental.clientSideCertEnable.desc": "Włącza certyfikację po stronie klienta na twoim serwerze Mattermost. Przejrzyj <link>documentation</link> aby dowiedzieć się więcej.",
  "admin.experimental.clientSideCertEnable.title": "Włączyć certyfikację po stronie klienta:",
@@ -904,6 +912,11 @@
  "admin.experimental.collapsedThreads.off": "Wyłączone",
  "admin.experimental.collapsedThreads.title": "Zawijanie Odpowiedzi w Wątkach",
  "admin.experimental.defaultTheme.desc": "Ustaw domyślny motyw, który będzie ustawiony wszystkim nowym użytkownikom w systemie.",
+  "admin.experimental.defaultTheme.options.denim": "Denim",
+  "admin.experimental.defaultTheme.options.indigo": "Indygo",
+  "admin.experimental.defaultTheme.options.onyx": "Onyks",
+  "admin.experimental.defaultTheme.options.quartz": "Kwarc",
+  "admin.experimental.defaultTheme.options.sapphire": "Szafir",
  "admin.experimental.defaultTheme.title": "Domyślny motyw:",
  "admin.experimental.delayChannelAutocomplete.desc": "Gdy wartość ta jest prawdziwa, autouzupełnianie linków do kanałów (takich jak ~town-square) będzie uruchamiane tylko po wpisaniu tyldy, po której następuje kilka liter. Gdy fałsz, autouzupełnianie pojawi się, gdy tylko użytkownik wpisze tyldę.",
  "admin.experimental.delayChannelAutocomplete.title": "Opóźnienie Autouzupełniania Kanałów:",
@@ -1432,6 +1445,9 @@
  "admin.log.fileTitle": "Wypisuje logi do pliku: ",
  "admin.log.jsonDescription": "Jeśli włączone, zalogowane wydarzenia będą zapisane w czytelnym maszynowym formacie JSON. W innym przypadku będą one zapisywane jako czysty tekst. Zmiana tego ustawienia wymaga restartu serwera przed uzyskaniem oczekiwanego efektu.",
  "admin.log.levelDescription": "To ustawienia określa poziom szczegółów logów jakie są zapisywane do konsoli. ERROR: Wypisuje tylko wiadomości błędów. INFO: Wypisuje wiadomości błędów oraz informacji dotyczące uruchamiania i inicjalizacji. DEBUG: Wypisuje dużo szczegółów dla deweloperów pracujących nad debugowaniem problemów.",
+  "admin.log.levelOptions.DEBUG": "DEBUGUJ",
+  "admin.log.levelOptions.ERROR": "BŁĄD",
+  "admin.log.levelOptions.INFO": "INFO",
  "admin.log.levelTitle": "Poziom logowania konsoli:",
  "admin.log.locationDescription": "Lokalizacja plików dziennika. Jeśli pusto, są przechowywane w katalogu ./logs. Ustawiona ścieżka musi istnieć oraz Mattermost musi mieć w niej uprawnienia do zapisu. Zmiana tego ustawienia wymaga ponownego uruchomienia serwera, zanim zacznie obowiązywać.",
  "admin.log.locationPlaceholder": "Wprowadź lokalizacje pliku",
@@ -1650,7 +1666,7 @@
  "admin.permissions.permission.edit_post.name": "Edytowanie własnych postów",
  "admin.permissions.permission.import_team.description": "Importuj zespół",
  "admin.permissions.permission.import_team.name": "Importuj zespół",
-  "admin.permissions.permission.invite_guest.description": "Zaproś gości na kanały i wyślij do nich e-mail z zaproszeniem.",
+  "admin.permissions.permission.invite_guest.description": "Zapraszaj gości do zespołów i wysyłaj im zaproszenia e-mail.",
  "admin.permissions.permission.invite_guest.name": "Zaproś gości",
  "admin.permissions.permission.list_team_channels.description": "Pokaż kanały zespołu",
  "admin.permissions.permission.list_team_channels.name": "Pokaż kanały zespołu",
@@ -2426,10 +2442,10 @@
  "admin.systemUserDetail.title": "Konfiguracja użytkownika",
  "admin.system_roles_feature_discovery.copy": "Użyj Ról Systemowych, aby przyznać wyznaczonym użytkownikom dostęp do odczytu i/lub zapisu w wybranych sekcjach Konsoli Systemowej.",
  "admin.system_roles_feature_discovery.title": "Zapewnienie kontrolowanego dostępu do konsoli systemowej za pomocą Mattermost Enterprise",
-  "admin.system_users.active": "Aktywuj",
+  "admin.system_users.active": "Aktywowany",
  "admin.system_users.allUsers": "Wszyscy Użytkownicy",
  "admin.system_users.guest": "Gość",
-  "admin.system_users.inactive": "Nieaktywny",
+  "admin.system_users.inactive": "Dezaktywowany",
  "admin.system_users.list.memberSince.days": "{days} dni",
  "admin.system_users.list.memberSince.today": "Dzisiaj",
  "admin.system_users.list.memberSince.yesterday": "Wczoraj",
@@ -2609,7 +2625,7 @@
  "admin.user_item.demoteToGuest": "Obniż do gościa",
  "admin.user_item.emailTitle": "**Email:** {email}",
  "admin.user_item.guest": "Gość",
-  "admin.user_item.inactive": "Nieaktywny",
+  "admin.user_item.inactive": "Dezaktywowany",
  "admin.user_item.makeActive": "Aktywuj",
  "admin.user_item.makeInactive": "Dezaktywuj",
  "admin.user_item.makeMember": "Uczyń członkiem zespołu",
@@ -3151,6 +3167,10 @@
  "cloud.fetch_error": "Błąd pobierania danych rozliczeniowych. Proszę spróbować ponownie później.",
  "cloud.fetch_error.retry": "Ponów",
  "cloud.invoice_pdf_preview.download": "<downloadLink>Pobierz</downloadLink> tę stronę dla swoich potrzeb",
+  "cloud.renewal.andMoreItems": "+ {count} więcej pozycji",
+  "cloud.renewal.renew": "Odnów",
+  "cloud.renewal.tobepaid": "Do zapłaty w dniu {date}",
+  "cloud.renewal.viewInvoice": "Wyświetl Fakturę",
  "cloud.startTrial.modal.btn": "Rozpoczęcie wersji trial",
  "cloud_annual_renewal.banner.buttonText.contactSales": "Kontakt ze Sprzedażą",
  "cloud_annual_renewal.banner.buttonText.renew": "Odnów",
@@ -4659,6 +4679,7 @@
  "search_bar.searchGroupMembers": "Wyszukaj członków grupy",
  "search_bar.search_types.files": "PLIKI",
  "search_bar.search_types.messages": "WIADOMOŚCI",
+  "search_bar.usage.searchLearn": "<a>Dowiedz się więcej o wyszukiwaniu</a>",
  "search_bar.usage.search_type_files": "Pliki",
  "search_bar.usage.search_type_messages": "Wiadomości",
  "search_bar.usage.search_type_question": "Czego szukasz?",
@@ -4761,6 +4782,7 @@
  "setting_picture.select": "Wybierz",
  "setting_picture.uploading": "Wysyłanie..",
  "shared_channel_indicator.tooltip": "Udostępnione zaufanym organizacjom",
+  "shared_user_indicator.aria_label": "wskaźnik współdzielonego użytkownika",
  "shared_user_indicator.tooltip": "Od zaufanej organizacji",
  "shortcuts.browser.channel_next": "Później w historii:\tAlt|Right",
  "shortcuts.browser.channel_next.mac": "Później w historii:\t⌘|]",
@@ -5689,6 +5711,8 @@
  "user_profile.send.dm": "Wiadomość",
  "user_profile.send.dm.icon": "Ikona Wysyłki Wiadomości",
  "user_profile.send.dm.yourself": "Wyślij wiadomość do siebie",
+  "users_limits_announcement_bar.copyText": "Limity użytkowników przekroczone. Skontaktuj się z administratorem: ERROR_USER_LIMITS_EXCEEDED",
+  "users_limits_announcement_bar.ctaText": "Dowiedz się Więcej",
  "version_bar.new": "Nowa wersja Mattermost jest dostępna.",
  "version_bar.refresh": "Odśwież teraz aplikację",
  "view_image.loading": "Wczytywanie ",
--- a/webapp/channels/src/i18n/zh-CN.json
+++ b/webapp/channels/src/i18n/zh-CN.json
@@ -406,6 +406,7 @@
  "admin.billing.subscription.viewBilling": "查看帐单",
  "admin.billing.subscriptions.billing_summary.explore_enterprise": "探索企业版功能",
  "admin.billing.subscriptions.billing_summary.explore_enterprise.cta": "查看所有功能",
+  "admin.billing.subscriptions.billing_summary.lastInvoice.approved": "已批准",
  "admin.billing.subscriptions.billing_summary.lastInvoice.failed": "失败",
  "admin.billing.subscriptions.billing_summary.lastInvoice.monthlyFlatFee": "每月固定费用",
  "admin.billing.subscriptions.billing_summary.lastInvoice.paid": "已支付",
@@ -525,9 +526,14 @@
  "admin.channel_settings.channel_moderation.subtitleMembers": "管理频道成员可使用的操作。",
  "admin.channel_settings.channel_moderation.title": "频道管理",
  "admin.channel_settings.channel_row.configure": "编辑",
+  "admin.channel_settings.channel_row.managementMethod.group": "群组同步",
+  "admin.channel_settings.channel_row.managementMethod.manual": "手动邀请",
  "admin.channel_settings.description": "管理频道设定。",
  "admin.channel_settings.groupsPageTitle": "{siteName} 频道",
  "admin.channel_settings.title": "频道",
+  "admin.channels.filterBy.team.loading": "加载团队中",
+  "admin.channels.filterBy.team.noTeams": "未找到团队",
+  "admin.channels.filterBy.team.placeholder": "搜索并选择团队",
  "admin.cluster.ClusterName": "机群名：",
  "admin.cluster.ClusterNameDesc": "根据名称加入机群。只有拥有同样的机群名的节点会互相加入。此功能用于支持蓝率部署或使用相同数据库预备环境。",
  "admin.cluster.ClusterNameEx": "例如：”Production”或“Staging”",
@@ -718,6 +724,7 @@
  "admin.data_retention.form.channelAndDirectMessageRetention": "频道与私信消息保留",
  "admin.data_retention.form.days": "天",
  "admin.data_retention.form.fileRetention": "文件保留",
+  "admin.data_retention.form.hours": "小时",
  "admin.data_retention.form.keepForever": "永久保留",
  "admin.data_retention.form.text": "适用于所有团队和频道，但不适用于自定义保留策略。",
  "admin.data_retention.form.years": "年",
@@ -735,6 +742,7 @@
  "admin.data_retention.jobTimeAM": "{time} 上午 (UTC)",
  "admin.data_retention.jobTimePM": "{time} 下午 (UTC)",
  "admin.data_retention.retention_days": "{count} 天",
+  "admin.data_retention.retention_hours": "{count} 小时",
  "admin.data_retention.retention_years": "{count} 年",
  "admin.data_retention.settings.title": "数据保留政策",
  "admin.data_retention.title": "数据保留政策",
@@ -772,6 +780,7 @@
  "admin.elasticsearch.enableSearchingTitle": "开启 Elasticsearch 搜索查询：",
  "admin.elasticsearch.ignoredPurgeIndexes": "在清除过程中要跳过的索引：",
  "admin.elasticsearch.ignoredPurgeIndexesDescription": "填写后，在清除过程中将忽略这些索引，用逗号分隔。",
+  "admin.elasticsearch.ignoredPurgeIndexesDescription.example": "例如：.opendistro*,.security*",
  "admin.elasticsearch.password": "例如：”yourpassword”",
  "admin.elasticsearch.passwordDescription": "(可选) Elasticsearch 服务器验证密码。",
  "admin.elasticsearch.passwordTitle": "服务器密码：",
@@ -891,6 +900,8 @@
  "admin.experimental.allowedEmailDomain.desc": "(可选) 设定后，用户的邮箱必须以此域名结尾才能移动话题。可以使用逗号分隔以指定多个域名。",
  "admin.experimental.allowedEmailDomain.title": "允许的邮箱域名",
  "admin.experimental.clientSideCertCheck.desc": "当为**主要**时，在客户端证书验证后，证书中的邮件地址将用于登录而无需密码。当为**次要**时，在客户端证书验证后，证书中的邮件地址将用于匹配用户提供的邮件地址。如果匹配，用户将可使用邮箱地址/密码登录。",
+  "admin.experimental.clientSideCertCheck.options.primary": "主要",
+  "admin.experimental.clientSideCertCheck.options.secondary": "次要",
  "admin.experimental.clientSideCertCheck.title": "客户端证书登录方式：",
  "admin.experimental.clientSideCertEnable.desc": "为您的 Mattermost 服务器启用客户端证书。查看<link>文档</link>以了解更多。",
  "admin.experimental.clientSideCertEnable.title": "开启客户端证书：",
@@ -901,6 +912,11 @@
  "admin.experimental.collapsedThreads.off": "停用",
  "admin.experimental.collapsedThreads.title": "折叠回复话题",
  "admin.experimental.defaultTheme.desc": "设定新用户的默认主题。",
+  "admin.experimental.defaultTheme.options.denim": "牛仔蓝",
+  "admin.experimental.defaultTheme.options.indigo": "星夜蓝",
+  "admin.experimental.defaultTheme.options.onyx": "玛瑙黑",
+  "admin.experimental.defaultTheme.options.quartz": "石英白",
+  "admin.experimental.defaultTheme.options.sapphire": "宝石蓝",
  "admin.experimental.defaultTheme.title": "默认主题：",
  "admin.experimental.delayChannelAutocomplete.desc": "当设置为启用时，频道链接的自动补全功能（例如~town-square）将会在输入波浪符和几个字母后触发。当设置为停用时，用户输入波浪符后，自动补全将立即启动。",
  "admin.experimental.delayChannelAutocomplete.title": "频道自动补全延迟时间：",
@@ -980,7 +996,7 @@
  "admin.experimental.timeBetweenUserTypingUpdatesMilliseconds.title": "用户输入超时：",
  "admin.experimental.useChannelInEmailNotifications.desc": "当设为是时，频道和团队名将显示在邮件通知标题。在服务器只有一个团队时很有用。当设为否时，只有团队名显示在邮件通知标题。",
  "admin.experimental.useChannelInEmailNotifications.title": "在邮件通知中使用频道名：",
-  "admin.experimental.userStatusAwayTimeout.desc": "此设定指定用户无活动后切换状态为”离开”的秒数。",
+  "admin.experimental.userStatusAwayTimeout.desc": "此设置指定用户离开 Mattermost 后，状态切换为“离开”前的秒数。",
  "admin.experimental.userStatusAwayTimeout.example": "例如“300”",
  "admin.experimental.userStatusAwayTimeout.title": "用户离开状态超时：",
  "admin.false": "否",
@@ -1429,6 +1445,9 @@
  "admin.log.fileTitle": "日志输出到文件： ",
  "admin.log.jsonDescription": "当设为是时，记录的事件将以电脑可读的 JSON 格式写入。否则它们将使用纯文本。更改此设定需要重启服务器。",
  "admin.log.levelDescription": "此设置确定将日志事件写入控制台的详细程度。 ERROR：仅输出错误消息。 INFO：输出有关启动和初始化的错误消息和信息。 DEBUG：为处理调试问题的开发人员输出高细节。",
+  "admin.log.levelOptions.DEBUG": "调试",
+  "admin.log.levelOptions.ERROR": "错误",
+  "admin.log.levelOptions.INFO": "信息",
  "admin.log.levelTitle": "控制台日志级别：",
  "admin.log.locationDescription": "日志文件的路径。如果留空，它们将会储存到 ./logs 目录。您设定的路径必须存在并且 Mattermost 拥有写入权限。更改此设定需要重启服务器。",
  "admin.log.locationPlaceholder": "输入您的文件位置",
@@ -3147,6 +3166,10 @@
  "cloud.fetch_error": "获取计费数据时出错。请稍后重试。",
  "cloud.fetch_error.retry": "重试",
  "cloud.invoice_pdf_preview.download": "<downloadLink>下载</downloadLink>此页面以备记录",
+  "cloud.renewal.andMoreItems": "+ {count} 个其他项目",
+  "cloud.renewal.renew": "续订",
+  "cloud.renewal.tobepaid": "{date} 付款",
+  "cloud.renewal.viewInvoice": "查看帐单",
  "cloud.startTrial.modal.btn": "开始试用",
  "cloud_annual_renewal.banner.buttonText.contactSales": "联系销售",
  "cloud_annual_renewal.banner.buttonText.renew": "续订",
@@ -3162,7 +3185,7 @@
  "cloud_billing.nudge_to_paid.learn_more": "升级",
  "cloud_billing.nudge_to_paid.title": "升级到付费计划以保留您的工作区",
  "cloud_billing.nudge_to_paid.view_plans": "查看计划",
-  "cloud_billing_history_modal.title": "发票",
+  "cloud_billing_history_modal.title": "帐单",
  "cloud_delinquency.banner.buttonText": "立即更新计费信息",
  "cloud_delinquency.cc_modal.card.reactivate": "重新激活",
  "cloud_delinquency.cc_modal.card.totalOwed": "总欠款",
@@ -3470,7 +3493,7 @@
  "emoji_skin.medium_dark_skin_tone": "中等深肤色",
  "emoji_skin.medium_light_skin_tone": "中等浅肤色",
  "emoji_skin.medium_skin_tone": "中等肤色",
-  "emoji_skin_item.emoji_aria_label": "{skinName}表情符",
+  "emoji_skin_item.emoji_aria_label": "{skinName} 表情符",
  "error.channelNotFound.guest_link": "返回",
  "error.channelNotFound.link": "回到{defaultChannelName}",
  "error.channel_not_found.message": "您请求的频道为私有或不存在。请联系管理员以添加到频道。",
@@ -4085,7 +4108,7 @@
  "modal.manual_status.title_offline": "您的状态已设置为“离线”",
  "modal.manual_status.title_ooo": "您的状态已设置为“离开办公室”",
  "more.details": "更多详情",
-  "more_channels.channel_purpose": "频道信息：成员指示器：已加入，成员数 {memberCount}，目的：{channelPurpose}",
+  "more_channels.channel_purpose": "频道信息：成员标识：已加入，成员数 {memberCount}，目的：{channelPurpose}",
  "more_channels.count": "{count} 个结果",
  "more_channels.count_one": "1 个结果",
  "more_channels.count_zero": "0 个结果",
@@ -4094,7 +4117,7 @@
  "more_channels.hide_joined_checked": "隐藏已加入的频道复选框，已选中",
  "more_channels.hide_joined_not_checked": "隐藏已加入的频道复选框，未选中",
  "more_channels.joined": "已加入",
-  "more_channels.membership_indicator": "成员指示器：已加入",
+  "more_channels.membership_indicator": "成员标识：已加入",
  "more_channels.next": "下一页",
  "more_channels.noArchived": "无已归档频道",
  "more_channels.noChannels": "没有频道",
@@ -4655,6 +4678,7 @@
  "search_bar.searchGroupMembers": "搜索群组成员",
  "search_bar.search_types.files": "文件",
  "search_bar.search_types.messages": "消息",
+  "search_bar.usage.searchLearn": "<a>了解搜索</a>",
  "search_bar.usage.search_type_files": "文件",
  "search_bar.usage.search_type_messages": "消息",
  "search_bar.usage.search_type_question": "您在寻找什么？",
@@ -4701,7 +4725,7 @@
  "self_hosted_expansion.contact_support": "联系客服",
  "self_hosted_expansion.expand_success": "您已成功更新许可证席位数量",
  "self_hosted_expansion.expansion_modal.title": "提供您的付款详情",
-  "self_hosted_expansion.license_applied": "许可证已自动应用于您的 Mattermost 实例。您的更新发票将在系统控制台的 <billing>计费部分</billing> 中显示。",
+  "self_hosted_expansion.license_applied": "许可证已自动应用于您的 Mattermost 实例。您的新帐单将在系统控制台的<billing>计费部分</billing>中显示。",
  "self_hosted_expansion.paymentFailed": "付款失败。请重试或联系客服。",
  "self_hosted_expansion.try_again": "重试",
  "self_hosted_expansion_rhs_card_add_new_seats": "添加新席位",
@@ -4757,6 +4781,7 @@
  "setting_picture.select": "选择",
  "setting_picture.uploading": "上传中…",
  "shared_channel_indicator.tooltip": "与受信任的组织共享",
+  "shared_user_indicator.aria_label": "共享用户标识",
  "shared_user_indicator.tooltip": "来自受信任的组织",
  "shortcuts.browser.channel_next": "历史记录中前进：\tAlt|Right",
  "shortcuts.browser.channel_next.mac": "历史记录中前进：\t⌘|]",
@@ -5267,7 +5292,7 @@
  "user.settings.advance.title": "高级设置",
  "user.settings.advance.unreadScrollPositionDesc": "选择在查看未读频道时的滚动位置。查看后，频道将标记为已读。",
  "user.settings.advance.unreadScrollPositionTitle": "查看未读频道时的滚动位置",
-  "user.settings.custom_theme.awayIndicator": "离开显示",
+  "user.settings.custom_theme.awayIndicator": "离开标识",
  "user.settings.custom_theme.buttonBg": "按钮 BG",
  "user.settings.custom_theme.buttonColor": "文本按钮",
  "user.settings.custom_theme.centerChannelBg": "中间栏 BG",
@@ -5277,7 +5302,7 @@
  "user.settings.custom_theme.copied": "✔ 已复制",
  "user.settings.custom_theme.copyPaste": "复制和粘贴分享主题颜色:",
  "user.settings.custom_theme.copyThemeColors": "复制主题颜色",
-  "user.settings.custom_theme.dndIndicator": "请勿打扰提示",
+  "user.settings.custom_theme.dndIndicator": "请勿打扰标识",
  "user.settings.custom_theme.errorTextColor": "错误文字颜色",
  "user.settings.custom_theme.linkButtonTitle": "链接已经按钮样式",
  "user.settings.custom_theme.linkColor": "链接颜色",
@@ -5286,7 +5311,7 @@
  "user.settings.custom_theme.mentionHighlightBg": "提及高亮 BG",
  "user.settings.custom_theme.mentionHighlightLink": "被提及高亮链接",
  "user.settings.custom_theme.newMessageSeparator": "新消息分隔符",
-  "user.settings.custom_theme.onlineIndicator": "在线显示",
+  "user.settings.custom_theme.onlineIndicator": "在线标识",
  "user.settings.custom_theme.sidebarBg": "侧边栏 BG",
  "user.settings.custom_theme.sidebarHeaderBg": "侧边栏标题背景",
  "user.settings.custom_theme.sidebarHeaderTextColor": "侧边栏标题文字",
@@ -5685,6 +5710,8 @@
  "user_profile.send.dm": "发送消息",
  "user_profile.send.dm.icon": "发送消息图标",
  "user_profile.send.dm.yourself": "向自己发送一条消息",
+  "users_limits_announcement_bar.copyText": "已达到用户上线。请联系管理员并附上：ERROR_USER_LIMITS_EXCEEDED",
+  "users_limits_announcement_bar.ctaText": "了解更多",
  "version_bar.new": "Mattermost 有新的版本可用。",
  "version_bar.refresh": "立刻刷新应用",
  "view_image.loading": "加载中 ",