Commit Graph

156 Commits

Author SHA1 Message Date
daf914604e Translation: Moved "InviteDialog:Invited" and "Settings:Disabled" keys to Common 2024-03-26 13:51:15 +04:00
7293ae5dbd Fix some translation issues 2024-03-07 20:07:06 +04:00
18fd7db7a5 Fix UselessTranslationKeysTest issues 2024-03-07 18:10:01 +04:00
39ae48c524 Fix FullEnDublicatesTest issues 2024-03-06 01:59:38 +04:00
1c6046dd04 Fix EnDublicatesByContentTest issue 2024-03-05 22:45:06 +04:00
f2db2406fa Merge branch 'bugfix/rc-2.5.0' into feature/si
# Conflicts:
#	i18next/client.babel
#	i18next/common.babel
#	i18next/editor.babel
2024-03-05 13:44:26 +04:00
bfd1a04638 Fix empty SSO label issue 2024-03-04 15:05:39 +03:00
828e159767 Merge branch 'develop' into bugfix/rc-2.5.0 2024-03-01 11:52:08 +04:00
40a8db9d4c Merge branch 'develop' into feature/editor-nextjs 2024-02-29 18:00:55 +03:00
55d54d63b2 updated it, hy 2024-02-29 15:22:55 +03:00
763870416c updated translations 2024-02-28 19:18:54 +03:00
852c960163 Move some translation keys to Common 2024-02-27 15:24:17 +04:00
e9d13a6452 Applied babelEdit auto-fixes 2024-02-22 13:22:16 +04:00
5f744636a5 Translations: move Files:CreateAndCopy to Common 2024-02-22 13:17:26 +04:00
d47aa36c85 Merge branch 'develop' into bugfix/selectors 2024-02-14 13:57:36 +03:00
3dc49cf352 Auto-refactoring of translations 2024-02-14 13:16:02 +04:00
20887d0f4b Move some error translation keys to common 2024-02-14 02:27:50 +04:00
9761a340f5 Move many translation keys to Common 2024-02-13 04:42:10 +04:00
e885c0485d Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/client/src/pages/Home/Hooks/usePublic.js
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/hy-AM/Common.json
#	public/locales/it/Common.json
#	public/locales/ja-JP/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/uk-UA/Common.json
#	public/locales/zh-CN/Common.json
2024-02-02 16:15:04 +04:00
ee2f010de3 edited oform -> PDF form 2024-02-01 16:06:21 +03:00
Akmal Isomadinov
a7f2c24393 Shared:Components:Cron Updated translation and deleted old translations 2024-01-24 18:36:12 +05:00
c051c75741 added rtl-keys 2023-12-15 14:42:38 +03:00
6862bb529f added/edited translations 2023-12-11 17:54:33 +03:00
c904de1438 added si 2023-12-05 18:29:36 +03:00
8bbe0deb53 Merge branch 'release/v2.0.0' into feature/updating_translations
# Conflicts:
#	i18next/client.babel
#	i18next/common.babel
#	packages/client/public/locales/az/Files.json
#	packages/client/public/locales/az/FormGallery.json
#	packages/client/public/locales/az/InfoPanel.json
#	packages/client/public/locales/az/JavascriptSdk.json
#	packages/client/public/locales/az/Settings.json
#	packages/client/public/locales/bg/Files.json
#	packages/client/public/locales/bg/FormGallery.json
#	packages/client/public/locales/bg/InfoPanel.json
#	packages/client/public/locales/bg/JavascriptSdk.json
#	packages/client/public/locales/bg/Settings.json
#	packages/client/public/locales/cs/Files.json
#	packages/client/public/locales/cs/FormGallery.json
#	packages/client/public/locales/cs/InfoPanel.json
#	packages/client/public/locales/cs/JavascriptSdk.json
#	packages/client/public/locales/cs/Settings.json
#	packages/client/public/locales/de/Files.json
#	packages/client/public/locales/de/FormGallery.json
#	packages/client/public/locales/de/InfoPanel.json
#	packages/client/public/locales/de/JavascriptSdk.json
#	packages/client/public/locales/de/Settings.json
#	packages/client/public/locales/el-GR/Files.json
#	packages/client/public/locales/el-GR/FormGallery.json
#	packages/client/public/locales/el-GR/InfoPanel.json
#	packages/client/public/locales/el-GR/JavascriptSdk.json
#	packages/client/public/locales/el-GR/Settings.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/es/Files.json
#	packages/client/public/locales/es/FormGallery.json
#	packages/client/public/locales/es/InfoPanel.json
#	packages/client/public/locales/es/JavascriptSdk.json
#	packages/client/public/locales/es/Settings.json
#	packages/client/public/locales/fi/Files.json
#	packages/client/public/locales/fi/FormGallery.json
#	packages/client/public/locales/fi/InfoPanel.json
#	packages/client/public/locales/fi/JavascriptSdk.json
#	packages/client/public/locales/fi/Settings.json
#	packages/client/public/locales/fr/Files.json
#	packages/client/public/locales/fr/FormGallery.json
#	packages/client/public/locales/fr/InfoPanel.json
#	packages/client/public/locales/fr/JavascriptSdk.json
#	packages/client/public/locales/fr/Settings.json
#	packages/client/public/locales/hy-AM/Files.json
#	packages/client/public/locales/hy-AM/FormGallery.json
#	packages/client/public/locales/hy-AM/InfoPanel.json
#	packages/client/public/locales/hy-AM/JavascriptSdk.json
#	packages/client/public/locales/hy-AM/Settings.json
#	packages/client/public/locales/it/Files.json
#	packages/client/public/locales/it/FormGallery.json
#	packages/client/public/locales/it/InfoPanel.json
#	packages/client/public/locales/it/JavascriptSdk.json
#	packages/client/public/locales/it/Settings.json
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el-GR/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/hy-AM/Common.json
#	public/locales/it/Common.json
2023-11-20 15:55:26 +04:00
83a670d256 Fix UselessTranslationKeysTest (removed old translations) 2023-11-20 13:16:33 +04:00
71a496d472 Update translations: az, bg, cs, de, el, es, fi, fr, hy, it 2023-11-17 16:15:11 +03:00
68733bd54c Fix UselessTranslationKeysTest (removed useless keys) 2023-11-16 13:30:07 +04:00
29bbf2c8b1 Fix UselessTranslationKeysTest (removed useless AddFilter key) 2023-11-16 13:22:03 +04:00
e9a292004a Fix EnDublicatesByContentTest (moved "Price" and "Free" keys to Common translations) 2023-11-15 14:47:32 +04:00
3a2c002d72 Fix FullEnDublicatesTest (moved "Plugins" key to Common translations) 2023-11-15 14:32:58 +04:00
Viktor Fomin
8d606c78e7 Web: delete useless 2023-09-27 14:15:47 +03:00
b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	config/appsettings.json
#	config/nlog.config
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/common/components/MoreLoginModal/index.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Core/CspSettingsHelper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-09-25 10:53:06 +03:00
8371330d3c Web: Applied new design 2023-09-22 16:39:08 +04:00
Viktor Fomin
c0d87940f0 Web: move ExpiredLink translate to Common 2023-09-20 17:35:38 +03:00
Viktor Fomin
2f6861f43f Web: add translates 2023-09-14 14:42:46 +03:00
db3f75c78b added translations 2023-09-07 18:40:17 +03:00
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
d3198671ba Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
#	packages/common/constants/index.js
2023-09-04 16:38:06 +03:00
613938b819 Web: Added Zoom login button, translates and icons 2023-09-04 16:06:55 +03:00
efdd42f8f6 Merge branch 'develop' into feature/rtl-interface-client 2023-09-01 15:30:48 +02:00
3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	packages/client/src/components/panels/SelectFileDialog/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/store/AuthStore.js
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	yarn.lock
2023-09-01 15:33:39 +03:00
19a1c80a5f edited ar language name 2023-08-30 15:39:37 +03:00
5e79ebe967 Added new language (ar-SA) 2023-08-30 12:03:34 +04:00
c18dfe8434 added new translations 2023-08-29 21:05:00 +03:00
Subhonbek
087711acc8 Merge branch 'develop' into feature/rtl-interface-client 2023-08-29 12:41:12 +03:00
Viktor Fomin
d2b1769e6f Web: add translates 2023-08-29 11:44:27 +03:00
bc6b0d9e0d Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Billing/ITariffService.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/EmailSenderSink.cs
#	common/ASC.Core.Common/Notify/JabberSenderSink.cs
#	common/ASC.Core.Common/Notify/PushSenderSink.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
#	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/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Files.jsx
#	packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/security/index.js
#	packages/client/src/pages/Profile/Section/Header/index.js
#	packages/common/store/SettingsStore.js
#	packages/components/drop-down/index.js
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/FeedController.cs
#	web/ASC.Web.Api/Api/PaymentsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Core/DnsSettings.cs
#	web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
#	web/ASC.Web.Api/GlobalUsings.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
#	yarn.lock
2023-08-28 18:53:10 +03:00
be7034b296 added ar Common.json 2023-08-28 13:27:47 +03:00
f4c9338c07 Fix bug 63646 - Added a message when reaching the limit of paid users by invitation link. 2023-08-21 13:30:49 +03:00