Commit Graph

38 Commits

Author SHA1 Message Date
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
Mushka Nikita
00d44aad43 added russian translation to erasure functionality 2023-03-03 14:21:17 +03:00
ca2906ebee Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +03:00
25f8ca42ca Web: Added translations. 2023-02-07 16:27:01 +03:00
Elyor Djalilov
3722ae1a77 Fix Bug 61037 - Rooms.Localization. Incorrect message about moving rooms to the archive in Russian localization 2023-02-06 21:23:32 +05:00
DmitrySychugov
b3d04ccd59 Web: Client: added media error ru translation 2023-02-06 19:50:55 +05:00
68adfe1138 Web: Added enable/disable notifications to the context menu. 2023-02-06 16:55:19 +03:00
Elyor Djalilov
2514de24a0 Web:Client: Fix translate 2023-02-01 17:10:23 +05:00
c65009c1b1 Removed old common folder resources (CommonEmptyContainerDescription) 2023-01-10 18:43:54 +03:00
f952c7474f Removed old empty screen resources (SharedEmptyContainerDescription) 2023-01-10 18:40:57 +03:00
0b64d4223c Web: Default document names have been moved to 'Common' file. 2023-01-10 15:26:57 +03:00
77829e4545 Translations: Fix EnDublicatesByContentTest issues 2022-12-28 22:27:47 +03:00
9aad0214a3 Translations: Added rus translations (by Google) 2022-12-28 21:42:28 +03:00
81ff746f38 Update client.babel and applied sorting 2022-12-23 19:08:01 +03:00
Elyor Djalilov
37e15bb90b unused key removed 2022-11-30 15:12:40 +05:00
Elyor Djalilov
eb21deff5c unused key removed 2022-11-30 15:10:05 +05:00
Elyor Djalilov
f7ef99c00d unused key removed 2022-11-30 15:08:06 +05:00
Elyor Djalilov
1a5ecc1f5a unused key removed 2022-11-30 15:07:02 +05:00
Elyor Djalilov
04db0e8f0a deleted duplicate key and was moved to the Common 2022-11-28 22:46:57 +05:00
Elyor Djalilov
23109e30c2 deleted duplicate keys and was moved to the Common 2022-11-28 22:19:57 +05:00
Elyor Djalilov
d88331c704 deleted duplicate keys 2022-11-28 21:41:21 +05:00
Elyor Djalilov
34954cd9e0 Fix bad merge 2022-11-25 17:51:13 +05:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
3175554fed Web: Files: added create, delete, move to archive room hotkeys 2022-11-08 17:34:32 +03:00
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
mushka
1b2dae0890 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-02 03:45:40 +03:00
mushka
af16f21d4a Merge branch 'develop' into feature/doc-space-info-panel 2022-09-26 11:00:34 +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
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
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
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
mushka
f0956da7d0 translated keys in /Files to russian (for context options) 2022-09-05 18:02:56 +03:00
mushka
2b936a8879 added new roomType translation in russian 2022-08-24 19:50:09 +03:00
c956d8b696 Web: Merged 'Files' module with 'Client' and fixed paths 2022-07-24 19:57:03 +03:00