560e57947f
11 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
| 665dc98870 | added translations | |||
| a5640c4628 | Add translations for multiple languages | |||
| d1a1c9b477 |
Merge branch 'develop' into bugfix/standalone
# Conflicts: # packages/client/public/locales/ar-SA/PaymentsEnterprise.json # packages/client/public/locales/az/PaymentsEnterprise.json # packages/client/public/locales/bg/PaymentsEnterprise.json # packages/client/public/locales/cs/PaymentsEnterprise.json # packages/client/public/locales/de/PaymentsEnterprise.json # packages/client/public/locales/el-GR/PaymentsEnterprise.json # packages/client/public/locales/en/PaymentsEnterprise.json # packages/client/public/locales/es/PaymentsEnterprise.json # packages/client/public/locales/fi/PaymentsEnterprise.json # packages/client/public/locales/fr/PaymentsEnterprise.json # packages/client/public/locales/hy-AM/PaymentsEnterprise.json # packages/client/public/locales/it/PaymentsEnterprise.json # packages/client/public/locales/ja-JP/PaymentsEnterprise.json # packages/client/public/locales/ko-KR/PaymentsEnterprise.json # packages/client/public/locales/lo-LA/PaymentsEnterprise.json # packages/client/public/locales/lv/PaymentsEnterprise.json # packages/client/public/locales/nl/PaymentsEnterprise.json # packages/client/public/locales/pl/PaymentsEnterprise.json # packages/client/public/locales/pt-BR/PaymentsEnterprise.json # packages/client/public/locales/pt/PaymentsEnterprise.json # packages/client/public/locales/ro/PaymentsEnterprise.json # packages/client/public/locales/ru/PaymentsEnterprise.json # packages/client/public/locales/si/PaymentsEnterprise.json # packages/client/public/locales/sk/PaymentsEnterprise.json # packages/client/public/locales/sl/PaymentsEnterprise.json # packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json # packages/client/public/locales/tr/PaymentsEnterprise.json # packages/client/public/locales/uk-UA/PaymentsEnterprise.json # packages/client/public/locales/vi/PaymentsEnterprise.json |
|||
| 55c9942146 | Renaming portalName value. | |||
| bfaee1b571 | Added interpolation for UpgradeToProBannerInstructionHeader key. | |||
| 775a7be56d | Added interpolation for ActivateTariffDescr key. | |||
| afd65f3afa | Changed translations. | |||
| 97f1c13bcf | Fixed translations. | |||
| 081d98353c | Added interpolation for 'UpgradeToProBannerInstructionHeader' key. | |||
| 878d9d70d2 | Added interpolation for 'ActivateTariffDescr' key. | |||
| ab472b0148 |
Merge branch 'master' into develop
# Conflicts: # .gitignore # build/install/docker/Dockerfile.dev # build/install/docker/build.dev.yml # build/install/docker/docspace.dev.yml # build/install/win/DocSpace.aip # common/ASC.ActiveDirectory/Base/DbHelper.cs # common/ASC.Api.Core/Model/EmployeeDto.cs # common/ASC.Core.Common/Billing/ITariffService.cs # common/ASC.Core.Common/Billing/License/LicenseReader.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/HostedSolution.cs # common/ASC.Core.Common/Messaging/MessagesContext.cs # common/ASC.Core.Common/Tenants/TenantCookieSettings.cs # common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs # common/ASC.Data.Storage/IQuotaController.cs # common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs # common/ASC.Data.Storage/S3/S3Storage.cs # common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj # common/Tools/ASC.Migration.Runner/ASC.Migration.Runner.csproj # common/Tools/ASC.Migration.Runner/GlobalUsings.cs # common/Tools/ASC.Migration.Runner/MigrationRunner.cs # common/Tools/ASC.Migration.Runner/Program.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs # common/Tools/ASC.Migrations.Core/Models/ConfigurationInfo.cs # common/Tools/ASC.Migrations.Core/Utils/DbContextActivator.cs # common/services/ASC.ClearEvents/Services/ClearEventsService.cs # common/services/ASC.ElasticSearch/Core/SearchSettings.cs # common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs # config/nginx/onlyoffice.conf # migrations/mysql/ASC.Migrations.MySql.csproj # migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.Designer.cs # migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.cs # migrations/mysql/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs # migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.Designer.cs # migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.cs # migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs # migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs # migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs # migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/mysql/SaaS/CustomDbContext/20221019144350_CustomDbContextMigrate.Designer.cs # migrations/mysql/SaaS/CustomDbContext/20221019144350_CustomDbContextMigrate.cs # migrations/mysql/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs # migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.Designer.cs # migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.cs # migrations/mysql/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs # migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs # migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs # migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.Designer.cs # migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.cs # migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs # migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.Designer.cs # migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.cs # migrations/mysql/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs # migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.Designer.cs # migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.cs # migrations/mysql/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs # migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.Designer.cs # migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.cs # migrations/mysql/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs # migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.Designer.cs # migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.cs # migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs # migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.Designer.cs # migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.cs # migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs # migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs # migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs # migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.Designer.cs # migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.cs # migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.Designer.cs # migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.cs # migrations/mysql/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs # migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.Designer.cs # migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.cs # migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs # migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.Designer.cs # migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.cs # migrations/mysql/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs # migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs # migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs # migrations/mysql/SaaS/UserDbContext/UserDbContextModelSnapshot.cs # migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.Designer.cs # migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.cs # migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs # migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.Designer.cs # migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.cs # migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs # migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs # migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs # migrations/postgre/ASC.Migrations.PostgreSql.csproj # migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.Designer.cs # migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.cs # migrations/postgre/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs # migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.Designer.cs # migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.cs # migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs # migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs # migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs # migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.Designer.cs # migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.cs # migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs # migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.Designer.cs # migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.cs # migrations/postgre/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs # migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs # migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs # migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.Designer.cs # migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.cs # migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs # migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.Designer.cs # migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.cs # migrations/postgre/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs # migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.Designer.cs # migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.cs # migrations/postgre/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs # migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.Designer.cs # migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.cs # migrations/postgre/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs # migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.Designer.cs # migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.cs # migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs # migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.Designer.cs # migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.cs # migrations/postgre/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs # migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.Designer.cs # migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.cs # migrations/postgre/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs # migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.Designer.cs # migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.cs # migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs # migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs # migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs # migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs # migrations/postgre/SaaS/UserDbContext/UserDbContextModelSnapshot.cs # migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.Designer.cs # migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.cs # migrations/postgre/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs # migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.Designer.cs # migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.cs # migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs # packages/client/src/Shell.jsx # packages/client/src/components/Article/Body/Items.js # packages/client/src/components/Article/Body/index.js # packages/client/src/components/EmptyContainer/RoomNoAccessContainer.js # packages/client/src/components/EmptyContainer/RootFolderContainer.js # packages/client/src/components/panels/InvitePanel/index.js # packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js # packages/client/src/components/panels/InvitePanel/sub-components/Item.js # packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js # packages/client/src/components/panels/SelectFileDialog/AsideView.js # packages/client/src/components/panels/SelectFileDialog/index.js # packages/client/src/components/panels/SelectFolderDialog/index.js # packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js # packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js # packages/client/src/components/panels/SelectionPanel/StyledSelectionPanel.js # packages/client/src/pages/Accounts.jsx # packages/client/src/pages/AccountsHome/index.js # packages/client/src/pages/Confirm/index.js # packages/client/src/pages/Confirm/sub-components/removePortal.js # packages/client/src/pages/Errors/520/index.js # packages/client/src/pages/Files.jsx # packages/client/src/pages/Home/Section/AccountsBody/TableView/TableContainer.js # packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js # packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js # packages/client/src/pages/Home/Section/Filter/index.js # packages/client/src/pages/Home/Section/Header/index.js # packages/client/src/pages/Home/Section/SettingsBody/index.js # packages/client/src/pages/Home/index.js # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js # packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js # packages/client/src/pages/PortalSettings/categories/common/sub-components/common-tooltips.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js # packages/client/src/pages/PortalSettings/categories/data-management/index.js # packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js # packages/client/src/pages/PortalSettings/categories/developer-tools/index.js # packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/FieldMapping.js # packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/IdpSettings.js # packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/ProviderMetadata.js # packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js # packages/client/src/pages/PortalSettings/categories/payments/index.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js # packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js # packages/client/src/pages/PortalSettings/index.js # packages/client/src/pages/PortalSettings/utils/settingsTree.js # packages/client/src/pages/Profile/Section/Body/sub-components/interface-theme/index.js # packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js # packages/client/src/pages/VersionHistory/Section/Body/StyledVersionHistory.js # packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js # packages/client/src/pages/Wizard/index.js # packages/client/src/store/AccountsContextOptionsStore.js # packages/client/src/store/FilesActionsStore.js # packages/client/src/store/FilesStore.js # packages/common/components/Article/index.js # packages/common/components/Article/sub-components/article-alerts.js # packages/common/components/Article/sub-components/article-header.js # packages/common/components/FilterInput/sub-components/FilterBlock.js # packages/common/components/Loaders/index.js # packages/common/components/MediaViewer/sub-components/ImageViewer/ImageViewer.props.ts # packages/common/components/MediaViewer/sub-components/ImageViewer/index.tsx # packages/common/components/PrivateRoute/index.js # packages/common/store/SettingsStore.js # packages/common/store/UserStore.js # packages/common/utils/index.ts # packages/components/file-input/index.js # packages/components/selector/StyledSelector.js # packages/components/selector/index.tsx # packages/components/selector/sub-components/Body/index.tsx # packages/components/slider/styled-slider.js # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs # products/ASC.Files/Core/Core/Security/FileSecurity.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs # products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Core/Utils/FileConverter.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/SettingsController.cs # products/ASC.Files/Service/Cleanup/Worker.cs # products/ASC.People/Server/Api/UserController.cs # public/scripts/api.js # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/PaymentsController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/LicenseController.cs # web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/Api/Settings/TfaappController.cs # web/ASC.Web.Api/Api/SmtpSettingsController.cs # web/ASC.Web.Api/Core/SmtpOperation.cs # web/ASC.Web.Core/CookiesManager.cs # yarn.lock |
