Commit Graph

60 Commits

Author SHA1 Message Date
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
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
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
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
28a3096a25 Web: Files: Settings: styling + new translations 2022-09-14 12:37:33 +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
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
mushka
0a2318ea59 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-05 20:53:35 +03:00
mushka
f0956da7d0 translated keys in /Files to russian (for context options) 2022-09-05 18:02:56 +03:00
89f9e10f84 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-09-02 01:24:12 +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
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
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
8ab27efaef Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-29 17:19:16 +03:00
mushka
435e15b217 added enw translation keys for dropzone 2022-08-29 13:49:43 +03:00
e3e47364e0 Merge branch 'develop' into feature/security-history-audit 2022-08-29 13:36:09 +05:00
17a557e96a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-28 00:12:05 +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
2bfa12f8b6 Web: Changed translations, deleted useless translations. 2022-08-26 17:54:50 +03:00
80e83b0b2b Web: Client: added ru translation for security history 2022-08-26 19:10:16 +05:00
ac47004401 Web: Fixed translations. 2022-08-26 10:25:56 +03:00
8998c9ee5b Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-08-26 10:21:08 +03:00
084cea375a Web: Fixed translation for module documents. 2022-08-26 10:18:54 +03:00
63ba97d982 Web: Fixed styles. 2022-08-26 08:14:44 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
1354b95534 Client: delete useless translates 2022-08-25 13:00:22 +03:00
mushka
2b936a8879 added new roomType translation in russian 2022-08-24 19:50:09 +03:00
95a41119f6 Client: move translates 2022-08-23 13:21:37 +03:00
52a008ca61 Web: Fixed translations,icons. 2022-08-22 16:16:49 +03:00
8fefd3debb Merge branch 'develop' into feature/create-room 2022-08-18 11:25:02 +03:00
b65b7c75e5 Move translates from NavMenu to Login 2022-08-16 16:26:00 +03:00
e3d7f4cee8 Web: Added translations. 2022-08-15 17:03:55 +03:00
mushka
4379a34bcf Merge branch 'develop' into feature/create-room 2022-08-15 16:01:20 +03:00
mushka
a2ef8d46b5 updated and edited translations 2022-08-15 15:49:43 +03:00
6c2b49470c WEb: Fixed after merge. 2022-08-12 13:25:29 +03:00