Commit Graph

20 Commits

Author SHA1 Message Date
Viktor Fomin
77ef522ba9 Client: add translations 2023-08-16 14:41:52 +03:00
a0293fee03 added translations 2023-05-10 18:42:42 +03:00
Viktor Fomin
6c53faff01 Client: add translate 2023-04-18 14:15:34 +03:00
4cdc83d2b3 added translations 2023-03-31 18:39:27 +03:00
552ddcf579 added translations 2023-03-27 18:13:03 +03:00
2dd8cb623d Web: Updated SSO AttributeMatchingTooltip key translations 2023-01-13 17:32:47 +03:00
46b99d1f25 Removed old resources (Team titles - custom names) 2023-01-12 16:20:35 +03:00
2cb3d34ed0 edited en 2023-01-10 17:56:40 +03:00
87e515c894 Translations: Removed useless key 2022-12-28 21:52:59 +03:00
c3578d1661 Fix EnDublicatesByContentTest issues 2022-12-02 18:58:36 +03:00
Elyor Djalilov
af4bcf4c05 deleted duplicate keys 2022-11-28 23:01:07 +05:00
Elyor Djalilov
b3b6615226 deleted duplicate key 2022-11-28 22:03:20 +05:00
Elyor Djalilov
6ac2aceb64 deleted duplicate keys and was moved to the Common 2022-11-28 14:55:18 +05: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
95a41119f6 Client: move translates 2022-08-23 13:21:37 +03:00
b252732ed2 SSO: add translate 2022-08-08 13:55:23 +03:00
cf0e9e05a1 SSO: fix translate 2022-08-04 14:42:59 +03:00
c8c4395d4c SSO: fix modal style 2022-08-02 17:35:19 +03:00
03b03ed910 Merge branch 'develop' into feature/sso
# Conflicts:
#	packages/client/public/images/actions.upload.react.svg
#	packages/client/public/images/empty_screen_privacy.png
#	packages/client/public/locales/en/SingleSignOn.json
#	packages/client/public/locales/ru/SingleSignOn.json
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
#	packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
#	packages/client/src/store/SsoFormStore.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
2022-08-02 12:05:15 +03:00