Commit Graph

105 Commits

Author SHA1 Message Date
8df94b6af1 i18n: Translations: fix project files + sorting 2022-09-09 18:02:39 +03:00
05c01d85e6 Web: Fix toast translations (Remove room(s) issue) 2022-09-09 11:22:04 +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
eaea59943c Web:Client:ChangePortalOwner: add new translation key 'ChooseFromList' 2022-09-08 18:23:57 +03:00
TimofeyBoyko
07c7352604 Web:Client:Locales: clone translation for ChangePortalOwner 2022-09-08 18:19:46 +03:00
TimofeyBoyko
1b3fbb3129 Web:Client:ChangePortalOwnerDialog: split translation key 'OwnerRights' 2022-09-08 16:55:00 +03:00
97bd153ec5
Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 16:29:09 +03:00
TimofeyBoyko
8334d4e3e6 Web:Client:ChangePortalOwnerdialog: fix translation key 2022-09-08 16:14:48 +03:00
TimofeyBoyko
4c27fb0c02 Web:Client:ChangePortalOwnerDialog: fix translation 2022-09-08 15:14:48 +03:00
TimofeyBoyko
41873e3c69 Web:Client:ChangePortalOwnerDialog: fix translation keys and theme 2022-09-08 14:45:52 +03:00
TimofeyBoyko
0aba1e4a95 Web:Client:Locales: add new translation keys for change portal owner 2022-09-08 14:01:09 +03:00
5954c20c37 Web: Translations: Moved all toasts title translations to Common.json 2022-09-08 12:10:33 +03:00
TimofeyBoyko
ac496bfe9e Merge branch 'develop' into feature/selector 2022-09-07 15:06:24 +03:00
TimofeyBoyko
d8a6315417 Web:Client:Locales: fix RoomSelector translation key 2022-09-07 13:33:19 +03:00
f66c0bb91f Web: Client: Renamed locale folders 2022-09-06 13:18:35 +03:00
TimofeyBoyko
6c632497f9 Merge branch 'develop' into feature/selector 2022-09-05 20:33:29 +03:00
TimofeyBoyko
f5030ea73d Web:Locales:RoomSelector: add new translation keys 2022-09-05 19:51:50 +03:00
661d39e5a6 Web: Locales: PeopleSelector: Added new translation keys 2022-09-05 18:17:17 +03:00
2a4fa1862f
Merge branch 'develop' into feature/dns-settings 2022-09-05 16:31:17 +03:00
TimofeyBoyko
a0df5d9a80 Web:Client: delete useless 2022-09-05 12:22:21 +03:00
TimofeyBoyko
41012a2919 Web:Client: add transltaion keys for user selector 2022-09-02 16:03:34 +03:00
e84ba1ff80 Merge branch 'develop' into feature/dns-settings 2022-09-02 13:05:58 +03:00
3d5447bfa2 Web:Added translations for dns. 2022-09-02 12:37:00 +03:00
8ce30932a3
Merge branch 'develop' into feature/login-ssr 2022-09-02 10:10:26 +03:00
Tatiana Lopaeva
f6d2c6e5b4
Merge branch 'develop' into feature/edit-ThirdPartyResourceDescription 2022-09-01 11:50:46 +03:00
8de4c5ee34 edited ThirdPartyResourceDescription zh-CN 2022-09-01 11:04:03 +03:00
Artem Tarasov
a845244ee0 Merge branch 'develop' into feature/login-ssr 2022-09-01 01:51:29 +03:00
47f4c557b4 edited key: ThirdPartyResourceDescription 2022-08-31 17:22:23 +03:00
Artem Tarasov
4ac1eb4c5c Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/Badges.js
#	packages/client/src/components/IndicatorLoader/index.js
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
#	packages/client/src/pages/About/AboutContent.js
#	packages/client/src/pages/Confirm/sub-components/activateEmail.js
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
#	packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
#	packages/client/src/store/TargetUserStore.js
#	packages/common/components/ColorTheme/ColorTheme.js
#	packages/common/components/FilterInput/sub-components/FilterBlockItem.js
#	packages/common/components/FilterInput/sub-components/FilterButton.js
#	packages/common/components/FloatingButton/FloatingButton.js
#	packages/common/components/Navigation/sub-components/item.js
#	packages/common/store/AuthStore.js
#	packages/components/badge/index.js
#	packages/components/button/index.js
#	packages/components/calendar/index.js
#	packages/components/catalog-item/index.js
#	packages/components/combobox/sub-components/combo-button.js
#	packages/components/input-block/index.js
#	packages/components/main-button/index.js
#	packages/components/submenu/index.js
#	packages/components/tabs-container/index.js
#	packages/components/text-input/text-input.js
#	packages/components/textarea/index.js
#	packages/components/toggle-button/index.js
#	packages/login/src/Login.jsx
2022-08-31 16:25:55 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
TimofeyBoyko
938d354ae9 Web:Accounts: fix translation for info panel 2022-08-31 10:12:03 +03:00
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
778b27ed5c
Merge branch 'develop' into feature/security-history-audit 2022-08-30 12:55:38 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05:00
dc3ba67fea Web: Client: added DownloadReportBtn ru translation 2022-08-30 11:53:06 +05:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
TimofeyBoyko
2c3dd7276d Merge branch 'develop' into feature/accounts-list 2022-08-29 18:22:45 +03:00
mushka
435e15b217 added enw translation keys for dropzone 2022-08-29 13:49:43 +03:00
mushka
3807afb3ea added missing translation key 2022-08-29 13:40:08 +03:00
TimofeyBoyko
fa26f74d96 Web:Client: change locales for context menu options of users 2022-08-29 12:22:19 +03:00
e3e47364e0 Merge branch 'develop' into feature/security-history-audit 2022-08-29 13:36:09 +05:00
TimofeyBoyko
937d99249e Merge branch 'develop' into feature/accounts-list 2022-08-29 09:47:42 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
Artem Tarasov
0a3ebbc436 Web: Login: translations for InvalidError moved to login 2022-08-27 01:48:29 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
a9b8a64e61 Web: Added translation for rooms module. 2022-08-26 18:59:28 +03:00
2bfa12f8b6 Web: Changed translations, deleted useless translations. 2022-08-26 17:54:50 +03:00
fc0bcdf4b4 Web: Client: added zh-CN translation for security history 2022-08-26 19:11:42 +05:00
0741b1b3f4 Web: Client: added vi translation for security history 2022-08-26 19:11:26 +05:00
4832ef4b81 Web: Client: added uk translation for security history 2022-08-26 19:11:11 +05:00