Commit Graph

113 Commits

Author SHA1 Message Date
4115bdc5dd Web: Files: fixed TrustedMailDescription translation 2022-10-19 16:03:59 +03:00
b99bde994e Web: Files: fixed LanguageTimeSettingsTooltip translation 2022-10-19 16:01:32 +03:00
mushka
2a52c0b251 Merge branch 'develop' into feature/room-thirdparty-update 2022-10-19 13:22:09 +03:00
mushka
9e62fc8e45 added translation for root label 2022-10-18 13:14:06 +03:00
mushka
3008e549c9 fixed some small translation issues with info panel 2022-10-18 01:55:45 +03:00
TimofeyBoyko
b3395efe50 Merge branch 'develop' into feature/portal-access-rights 2022-10-17 11:45:25 +05:00
mushka
319d842312 fixed MakeRoomPrivateLimitationsWarningDescription translate key in russian 2022-10-13 15:12:58 +03:00
3bd63b26fe Web: Added new translations. 2022-10-13 15:06:51 +03:00
TimofeyBoyko
e56b10d1e5 Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common 2022-10-13 15:35:58 +05:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
8e7bf575ed Web: Fixed translation (ru). 2022-10-06 14:17:52 +03:00
d3d4ff6639 Web: Fixed description of grace period. 2022-10-05 13:34:59 +03:00
a2fb5e4b36 Web: Changed translations for grace period. 2022-10-05 13:26:45 +03:00
c3c64d847c Web: removed useless translations. 2022-10-05 11:55:15 +03:00
11479c14ba Web: Added missing translations. 2022-10-05 11:35:40 +03:00
84c8749e4f Web: Changed translations. 2022-10-05 10:58:10 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
a5d3106907 Web: Added translation. 2022-10-04 16:52:43 +03:00
mushka
1b2dae0890 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-02 03:45:40 +03:00
mushka
6ef11ff695 fixed spelling in FilesEmptyScreenText translation key 2022-10-02 03:20:29 +03:00
mushka
6fbac45198 complete overhaul of translation kets in en & ru InfoPanel locales, changed history translations 2022-10-02 02:24:49 +03:00
mushka
af16f21d4a Merge branch 'develop' into feature/doc-space-info-panel 2022-09-26 11:00:34 +03:00
7f1d946269 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
a778e10d58 Web:Client:Delete old translation "MyEmptyContainerDescription". 2022-09-22 15:30:55 +03:00
7133d20a69 Web:Client:Delete translation "SubheadingEmptyText". 2022-09-21 18:09:35 +03:00
mushka
19cbf4bc40 updated russian InfoPanel translation keys 2022-09-20 14:08:32 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00
6b3ebed8b9 Web: Fixed bugs. 2022-09-19 11:59:47 +03:00
7dec07dc69 Web:Client:Delete old translation. 2022-09-19 11:28:05 +03:00
mushka
9c8fa64983 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-16 15:33:29 +03:00
mushka
fb0e23b2cf added some translations for history 2022-09-16 15:12:03 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
21fc46b8bc Web: Removed useless translations. 2022-09-15 15:07:26 +03:00
TimofeyBoyko
0dba384037 Merge branch 'develop' into feature/redesign-personal-filter 2022-09-15 14:29:57 +03:00
TimofeyBoyko
fe98362066 Web:Client: change translation key 'ByLastModifiedDate' to 'ByLastModified' 2022-09-15 14:07:02 +03:00
TimofeyBoyko
977dc1f7ed Web:Client: change translation key 'ByCreationDate' to 'ByCreation' 2022-09-15 14:02:53 +03:00
20fe2a3763 Web:Added values for the downgrade plan dialog from the stores. 2022-09-15 12:54:00 +03:00
c0244b5400 Web: Added plan title from the store. 2022-09-14 17:17:40 +03:00
28a3096a25 Web: Files: Settings: styling + new translations 2022-09-14 12:37:33 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +03:00
d94918a1de Merge branch 'develop' into feature/additional-resources 2022-09-13 10:52:26 +03:00
16a9dc020d Web: Files: fixed catalog-header translation, moved "Other" translation to Translations.json, added "Rooms" translation 2022-09-12 14:32:54 +03:00
377d3be960 Merge branch 'develop' into feature/additional-resources 2022-09-10 19:46:57 +03:00
8df94b6af1 i18n: Translations: fix project files + sorting 2022-09-09 18:02:39 +03:00
mushka
ab7ace5af6 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-09 13:22:36 +03:00
05c01d85e6 Web: Fix toast translations (Remove room(s) issue) 2022-09-09 11:22:04 +03:00
d016efea48 Web: Moved translations to the common. 2022-09-09 11:12:02 +03:00
TimofeyBoyko
ec0e91ee99 Merge branch 'feature/change-owner-dialog' of github.com:ONLYOFFICE/DocSpace into feature/change-owner-dialog 2022-09-08 18:36:04 +03:00
TimofeyBoyko
07c7352604 Web:Client:Locales: clone translation for ChangePortalOwner 2022-09-08 18:19:46 +03:00
5954c20c37 Web: Translations: Moved all toasts title translations to Common.json 2022-09-08 12:10:33 +03:00