Commit Graph

538 Commits

Author SHA1 Message Date
Elyor Djalilov
6a686e5224 Merge branch 'release/rc-v1.2.0' into feature/dialog-create-file
# Conflicts:
#	public/locales/en/Common.json
2023-01-12 18:40:04 +05:00
46b99d1f25 Removed old resources (Team titles - custom names) 2023-01-12 16:20:35 +03:00
c2ceab129a Merge branch 'release/rc-v1.2.0' into feature/edit-en 2023-01-11 10:57:10 +03:00
0b64d4223c Web: Default document names have been moved to 'Common' file. 2023-01-10 15:26:57 +03:00
Elyor Djalilov
cfe043502b added toggle in common settings 2023-01-09 13:45:02 +05:00
Elyor Djalilov
5592a155c8 added toggle when creating a file 2023-01-09 13:00:04 +05:00
6526b1463d edited en 2022-12-30 14:56:53 +03:00
6252f85dbb Translations: Fix paths + keys sorting 2022-12-28 21:43:25 +03:00
9aad0214a3 Translations: Added rus translations (by Google) 2022-12-28 21:42:28 +03:00
1266d817f8 Translations: Removed auto-generated files 2022-12-23 19:39:15 +03:00
018288d50b Update common.babel and applied sorting 2022-12-23 19:09:17 +03:00
c3578d1661 Fix EnDublicatesByContentTest issues 2022-12-02 18:58:36 +03:00
d683aa65b3 Fix all UselessTranslationKeysTest issues 2022-12-02 18:33:25 +03:00
80273d8392 Fix NotFoundKeysTest issues 2022-12-01 18:55:05 +03:00
b0a8c93054 Merge branch 'develop' into feature/new-docspace-translations 2022-12-01 18:43:19 +03:00
Timofey Boyko
04e0d9bf2b Merge branch 'develop' into feature/accounts-room-list 2022-12-01 11:53:22 +03:00
Elyor Djalilov
7e06c67e00 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
2022-11-30 23:07:13 +05:00
Elyor Djalilov
b69c737c9d key was moved to the Common 2022-11-30 22:58:33 +05:00
Elyor Djalilov
a944200dac key was moved to the Common 2022-11-30 22:46:35 +05:00
Elyor Djalilov
ad5fc420b4 unused key removed 2022-11-30 19:57:19 +05:00
Elyor Djalilov
668c65972a unused key removed 2022-11-30 19:55:27 +05:00
Elyor Djalilov
b07d64bf50 unused key removed 2022-11-30 19:55:00 +05:00
Elyor Djalilov
6b08016970 unused key removed 2022-11-30 19:52:26 +05:00
Elyor Djalilov
ca437e87f1 unused key removed 2022-11-30 19:49:10 +05:00
Elyor Djalilov
96ffde2d3e unused key removed 2022-11-30 19:47:27 +05:00
Elyor Djalilov
47eff7bd20 unused key removed 2022-11-30 19:42:50 +05:00
Elyor Djalilov
4fd7987274 unused key removed 2022-11-30 19:40:27 +05:00
Elyor Djalilov
9ee52588bd unused key removed 2022-11-30 19:37:05 +05:00
Elyor Djalilov
84c70aa0e4 unused key removed 2022-11-30 19:34:58 +05:00
Elyor Djalilov
bc6a4b445f unused key removed 2022-11-30 19:33:04 +05:00
Timofey Boyko
d2f62168b8 Add new translation key 'Member' 2022-11-30 17:32:29 +03:00
Mushka Nikita
c6b4a076b6 moved new translation keys to Common 2022-11-30 13:00:30 +03:00
Elyor Djalilov
26d210c8d7 not found keys fixed 2022-11-29 15:32:36 +05:00
Elyor Djalilov
e4b077f69b key was moved to the Common 2022-11-29 00:39:03 +05:00
Elyor Djalilov
2e44a446af not translated toasts fixed 2022-11-28 23:52:29 +05:00
Elyor Djalilov
89fe900387 deleted duplicate keys 2022-11-28 22:54:54 +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
b924f1582d deleted duplicate keys and was moved to the Common 2022-11-28 15:37:10 +05:00
Elyor Djalilov
3c637dbaa2 deleted duplicate keys and was moved to the Common 2022-11-28 15:19:44 +05:00
Elyor Djalilov
6ac2aceb64 deleted duplicate keys and was moved to the Common 2022-11-28 14:55:18 +05:00
Elyor Djalilov
c628368e9b deleted duplicate keys 2022-11-28 13:26:08 +05:00
Elyor Djalilov
fc59726fe1 empty value keys fixed and deleted duplicate keys 2022-11-28 11:46:04 +05:00
Elyor Djalilov
b3ce916889 empty value keys fixed 2022-11-26 15:01:16 +05:00
Elyor Djalilov
a54463de2a empty value keys fixed 2022-11-26 14:28:36 +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
TimofeyBoyko
67425e8001 Web:Client: rename SureWant to WantToContinue 2022-11-10 16:20:57 +03:00
TimofeyBoyko
7fa1fddf79 Web:Client: fix translation keys 2022-11-10 15:54:53 +03:00
bfadb09322 Fix some issues of NotFoundKeysTest 2022-10-27 18:27:21 +03:00
Elyor Djalilov
42471135ba Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
2022-10-25 13:41:42 +05:00
9c99f3a53f Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-19 19:41:39 +03:00
Elyor Djalilov
d819128bdb Web:Client:ActiveSessions: added translations 2022-10-19 18:30:22 +05:00
TimofeyBoyko
e56b10d1e5 Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common 2022-10-13 15:35:58 +05:00
6d78f37729 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-11 16:05:49 +03:00
f013c74475 Web: Added additional units for measuring the amount of information, added verification. 2022-10-11 10:58:10 +03:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
60b9ed3dd1 Web:Add translation "ReconnectStorage". 2022-10-10 19:13:01 +03:00
TimofeyBoyko
09dbd9d088 Web: move translation key 'AdvancedFilter' from Files to Common 2022-10-10 13:53:24 +05: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
1f5384dc0c Web: Common: added hide menu translation 2022-09-26 12:37:21 +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
a642d42bcc Client: fix translations 2022-09-21 16:16:19 +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
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
TimofeyBoyko
0dba384037 Merge branch 'develop' into feature/redesign-personal-filter 2022-09-15 14:29:57 +03:00
20fe2a3763 Web:Added values for the downgrade plan dialog from the stores. 2022-09-15 12:54:00 +03:00
TimofeyBoyko
11ba9f379c Merge branch 'develop' into feature/redesign-personal-filter 2022-09-14 16:35:18 +03:00
28a3096a25 Web: Files: Settings: styling + new translations 2022-09-14 12:37:33 +03:00
f3412fa2f8 Merge branch 'develop' into feature/redisign-files-settings 2022-09-14 11:20:37 +03:00
8030f66036 Web: Fix translations 2022-09-13 17:23:52 +03:00
TimofeyBoyko
42d6b3e7d3 Web: add new translation keys 2022-09-13 13:47:40 +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
d016efea48 Web: Moved translations to the common. 2022-09-09 11:12:02 +03:00
5954c20c37 Web: Translations: Moved all toasts title translations to Common.json 2022-09-08 12:10:33 +03:00
ced1ef8c8f Web: Translations: Renamed key Culture_en to Culture_en-GB 2022-09-06 12:52:19 +03:00
0e0fe15e1d Web: Translations: Renamed some Culture_ keys 2022-09-06 11:28:25 +03:00
46f0ed08f1 Web: Renamed locale folders 2022-09-06 11:23:00 +03:00
7b623c4e30 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/common/store/AuthStore.js
#	packages/components/slider/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +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
89f9e10f84 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-09-02 01:24:12 +03:00
a9338edd81 Web: Transferring translations to a common file 2022-08-31 15:22:48 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
547c1782f1 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
# Conflicts:
#	packages/client/public/locales/en/Settings.json
#	packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
2022-08-30 12:34:48 +03: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
8ab27efaef Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-29 17:19:16 +03:00
TimofeyBoyko
937d99249e Merge branch 'develop' into feature/accounts-list 2022-08-29 09:47:42 +03:00
17a557e96a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-28 00:12:05 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
8ecddf3d8a Web: add translates 2022-08-25 19:24:32 +03:00
TimofeyBoyko
5dc51e2c32 Web:Client:PortalPlugins: add translation keys 2022-08-23 14:35:51 +03:00
76e9125e86 Web:Client:Added translations "Color","Preview","Standard". 2022-08-18 12:01:44 +03:00
TimofeyBoyko
d371d865a8 Web: add new translation key 'Room' 2022-08-17 11:06:44 +03:00
TimofeyBoyko
17ffdff16f Web:Public: add new translation key 'Invite' for en locale 2022-08-16 18:45:11 +03:00
TimofeyBoyko
f5e6f97f52 Web:Public: add new translation key 'Paid' for en locale 2022-08-16 18:34:27 +03:00
mushka
4379a34bcf Merge branch 'develop' into feature/create-room 2022-08-15 16:01:20 +03:00
mushka
f2112365b8 Merge branch 'develop' into feature/create-room 2022-08-01 09:59:21 +03:00
mushka
d9fb015eb5 added Tags and NoTags keys to Common translation 2022-07-26 20:34:05 +03:00
0e0cc87aba Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2022-07-26 19:02:17 +03:00
Artem Tarasov
eb352fd860 Web: Client/public: Moved PreparePortalTitle key from PreporationPortal.json to Common.json. 2022-07-25 17:54:51 +03:00
3fd8aa98fb Web: fix merge 2022-07-22 19:19:03 +03:00
44c65ee52c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
#	web/ASC.Web.Client/src/store/index.js
2022-07-22 19:04:35 +03:00
4ce9acce3d Merge branch 'develop' into feature/sso
# Conflicts:
#	products/ASC.Files/Server/DocStore
2022-07-22 17:23:36 +03:00
831bdc578f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	packages/asc-web-common/components/Article/styled-article.js
#	products/ASC.Files/Client/src/Files.jsx
2022-07-21 14:22:28 +03:00
TimofeyBoyko
5a4e9f5ad1 Web: fix OtherLabel translation key 2022-07-20 15:12:51 +03:00
472ed56a05 Web: add locales 2022-07-20 12:27:04 +03:00
cf1b168dd6 Web: move locales to Common 2022-07-20 12:22:38 +03:00
TimofeyBoyko
3f8502ab8b Web:Files: add new translation keys for rooms 2022-07-19 18:39:44 +03:00
e5f56f6855 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-07 18:12:26 +03:00
ed45bb0118 Fix Bug 57978 - Client.Clouds. Rename button 'Delete third-party' to 'Disconnect' 2022-07-05 16:58:05 +03:00
fb09f62881 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 11:39:38 +03:00
0f901bf6e3 added hy-AM 2022-07-04 11:38:57 +03:00
b54e47a10e Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-01 13:37:47 +03:00
33e2b2eccd Web: move SelectFile translate to Common 2022-06-28 17:19:40 +03:00
9408a5a296 Web: Files: Added and applied new "ErrorInternalServer" translation key to Common.json 2022-06-23 15:34:52 +03:00
b5eb6420b0 Revert "Web: moved Error404Text translation to common"
This reverts commit 687951c921.
2022-06-23 15:15:49 +03:00
687951c921 Web: moved Error404Text translation to common 2022-06-20 17:49:59 +03:00
7ddb0506c9 Web: Files: moved Hotkeys translation, added button to open hotkeys 2022-06-10 11:30:57 +03:00
28d6380022 update lo 2022-06-02 17:04:12 +03:00
b59f5de9a7 edit translations 2022-06-02 13:21:57 +03:00
caefff72c4 Web: Return translations. 2022-06-01 18:35:30 +03:00
6c04530f20 Web: Files: Delete useless translation. 2022-06-01 16:19:59 +03:00
219366b3f6 Web: Moved translations to Common. 2022-06-01 15:56:50 +03:00
78ae5b38d2 edit translations 2022-05-31 18:37:22 +03:00
9e1a2e3cb8 Edit culture names in Common.json 2022-05-30 15:20:08 +03:00
6248fe1981 edit translations 2022-05-27 14:08:52 +03:00
b907c456bb edit translations 2022-05-26 19:22:02 +03:00
1642deb34c edit translations 2022-05-26 13:17:14 +03:00
130a7d01d6 edit translations 2022-05-25 17:52:26 +03:00
3982d38a5b edit translations 2022-05-24 16:01:46 +03:00
3e373c1e14 edit translations 2022-05-24 14:56:08 +03:00
8d3921eae9 Web: Translations: Removed keys: TitleDocuments, TitleSubfolders, More (UselessTranslationKeysTest issues fix) 2022-05-23 20:25:42 +03:00
8c5a4cc14c edit ru 2022-05-23 18:21:55 +03:00
a2991c008c edit translations (SpellCheck) 2022-05-23 18:06:43 +03:00
9903f4c439 update cs, edit translations (spellCheck) 2022-05-23 10:55:02 +03:00
9d1af6d3da update translations 2022-05-22 00:38:14 +03:00
6bc4035313 update translations 2022-05-21 15:25:14 +03:00
197c09e4b3 Web: add Content translate 2022-05-20 16:39:41 +03:00
e3c441c7bd Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-20 15:57:43 +03:00
ab5f692dfc Web: Client: Locales: En: Added "Editing" key 2022-05-20 15:56:31 +03:00
53dbf47c9d Web: add Attention translate 2022-05-20 15:54:21 +03:00
cb0879da10 update, edit translations 2022-05-20 13:48:47 +03:00
811f8cdb8b edit vi (common) 2022-05-19 23:41:44 +03:00
4541fa82d1 update translations (web, people) 2022-05-19 23:35:37 +03:00
9c6d1ae5df update translations (Login, ConvertPasswordDialog) 2022-05-19 20:56:48 +03:00
f5c09d94b7 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	i18next/files.babel
2022-05-19 18:56:47 +03:00
424c4bb082 Update translations (common, files) 2022-05-19 18:36:49 +03:00
15f4fb324e update it, edit fr 2022-05-19 14:34:56 +03:00
128021653d Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	products/ASC.Files/Client/public/locales/bg/ConnectDialog.json
#	products/ASC.Files/Client/public/locales/ro/Article.json
#	products/ASC.Files/Client/public/locales/ro/FormGallery.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/InfoPanel.json
#	products/ASC.Files/Client/public/locales/ro/SelectFolder.json
#	products/ASC.Files/Client/public/locales/ro/Settings.json
#	products/ASC.Files/Client/public/locales/ro/Translations.json
2022-05-18 20:18:32 +03:00
b2f6ce39f7 Update translations (common, files) 2022-05-18 19:54:25 +03:00
9fb495817d update translations 2022-05-18 18:25:31 +03:00
5f4d8b3b4c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 12:58:24 +03:00
9180fbe42e update ko 2022-05-18 12:58:02 +03:00
90d4a68946 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/sl/Settings.json
2022-05-18 10:09:44 +03:00
9c824a0bfa Update translation - sl 2022-05-18 09:59:02 +03:00
f6098aea20 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/ro/Settings.json
2022-05-17 19:57:22 +03:00
f1130c51d9 update ro 2022-05-17 19:54:47 +03:00
f466fd2fe4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 18:17:17 +03:00
dad9016695 Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix) 2022-05-17 18:17:11 +03:00
2b804d5ef8 edit es, fr, zh-CN, ja, de, ru 2022-05-17 17:20:59 +03:00
2ed7b96dd9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 16:43:15 +03:00
cc9d934b13 update de, edit en (Confirm) 2022-05-17 16:42:54 +03:00
43da9f3949 Update translation - fi 2022-05-17 15:35:03 +03:00
be3362dbc3 update ja, edit fr, es, zh-CN (Settings) 2022-05-17 12:56:56 +03:00
606f0bca2a update es (Home), add zh 2022-05-16 21:05:58 +03:00
4264a0da16 update fr 2022-05-16 17:04:04 +03:00
5915c6e23e update es 2022-05-16 12:51:04 +03:00
93a53092d6 Web: Translations: Fix UselessTranslationKeysTest issues 2022-05-13 19:33:16 +03:00
b3e1014a71 Web: Translations: Fix ParseJsonTest issues 2022-05-13 14:29:56 +03:00
fc846860f9 Web: Translations: Moved "AddUsers" key from "Files,People" to "Common" (test issue fix) 2022-05-12 14:18:16 +03:00
b2474c409d Web: Translations: Moved "Common" key from "Studio" to "Common" and removed useless "Documents" key (test issue fix) 2022-05-11 19:03:33 +03:00
ca0eb26067 Web: Removed already existing translation key from common (test issue fix) 2022-05-11 17:58:44 +03:00
58b7c5f678 Web: Translations: Moved "Location" key from "People" to "Common": (test issue fix) 2022-05-11 17:40:23 +03:00
b0450cf55b Web: Translations: Moved "Comments" key from "People" to "Common": (test issue fix) 2022-05-11 17:25:10 +03:00
781b0eb3e4 Web: Translations: Moved "Info" key from "studio" to "Common": (test issue fix) 2022-05-11 17:11:52 +03:00
4ae8a10f7f Web: Translations: Moved "AccessRights" key from "studio" to "Common": (test issue fix) 2022-05-11 16:51:37 +03:00
7b391e1cef Web: added filter translation 2022-05-05 20:26:09 +05:00
f86afee2d5 Web: move t key from People to Common 2022-04-25 21:39:46 +03:00
78944a490e Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme 2022-04-21 18:55:41 +03:00
Timofey Boyko
216ae27b25 Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme 2022-04-20 18:04:57 +03:00
e8c46ba42c Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2022-04-19 14:04:10 +03:00
47ffc849a5 Merge branch 'feature/virtual-rooms-1.2' into feature/connected-clouds-redesign 2022-04-18 15:05:23 +03:00
Timofey Boyko
ca9e132a67 Web: remove key 'DarkMode' in EU and RU locales 2022-04-18 12:37:08 +03:00
6dbf77317d Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-18 10:32:31 +03:00
b9a6c618bc Web: Moved Connect translation, added new translations 2022-04-15 16:39:57 +03:00
165a5979a3 Web: Files: Added new translations. 2022-04-13 16:02:27 +03:00
35950126cb Web: Files: Added new translations. 2022-04-13 15:14:37 +03:00
90bf5a7dc2 Web: Files: added info panel for OFORMsGallery 2022-04-07 16:52:16 +03:00
c51741bf94 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-05 10:35:53 +03:00
45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
#	public/locales/de/Common.json
2022-04-04 19:34:51 +03:00
f04d679df4 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-04 18:25:32 +03:00
Timofey Boyko
d812df9332 Web: add new key 'DarkMode' for EU and RU locales 2022-04-04 13:31:55 +03:00
8c782a7903 Web: Files: added OFORMs gallery 2022-03-31 16:10:16 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
6b84d183b8 Web: add translates 2022-03-17 12:41:57 +03:00
89b2f94469 Web: add missed translate for de 2022-03-16 11:19:44 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
a7199bd3d4 Web: sort locales by key 2022-03-10 23:50:43 +03:00
3bbf82d918 add new lines 2022-03-09 19:07:24 +03:00
b71c2eabc5 Web:Added translation for "Title" for locales en, pt-BR, ru, de, fr, it. 2022-03-09 12:03:01 +03:00
ee446c8e67 Web: moved translates to Common 2022-03-09 11:04:12 +03:00
7ffaee6efc Web: moved translates to Common 2022-03-05 14:27:59 +03:00
Timofey Boyko
65ccfb896f Web:Files: add new key 'sorting' 2022-03-04 10:20:10 +03:00
7907016bde Web: fix after merge 2022-02-22 13:55:49 +03:00
32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	public/locales/de/Common.json
2022-02-22 13:53:00 +03:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
743d0566a3 edit de (common) 2022-02-17 12:34:35 +03:00
3229019aad Web: move LoginButton key to Common 2022-02-10 18:01:40 +03:00
817a155642 Web: move ShowMore to Common translate 2022-02-08 22:34:21 +03:00
9068af695d Web: add sso translate 2022-02-03 01:09:51 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
34441d6335 Web: Moved some translations from Files to COMMON for asc-web-components 2022-01-21 11:49:16 +03:00
ab931e40ef edit bg, az 2021-12-23 11:23:25 +03:00
93cbab055c edit lo 2021-12-16 15:59:02 +03:00
30860f041a add new keys ro, lo, edit keys az 2021-12-15 13:56:30 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
8538b55dfc Web: Turned on all languages 2021-12-09 21:45:10 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00
f0e1ba5716 edit pl 2021-12-07 16:36:09 +03:00
25472623c5 edit ja Common 2021-12-07 11:48:32 +03:00
e6fe4cd1c0 edit az 2021-12-07 11:15:37 +03:00
4565d32979 add vi 2021-12-07 10:38:31 +03:00
58bdddd486 add pt_PT 2021-12-06 18:23:10 +03:00
8378850d92 add uk 2021-12-06 17:30:16 +03:00
1d659a6841 add az 2021-12-06 17:09:53 +03:00
4ac6064578 add 'Save as oform' 2021-12-06 11:03:52 +03:00
01b46993e3 Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-02 18:52:10 +03:00
857c8f91d3 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-02 18:51:52 +03:00
3f114a58d7 Web: Locales: Changed translation "Make form" to "Save as oform" 2021-12-02 18:51:04 +03:00
ed4aca1773 add pl 2021-12-02 15:56:04 +03:00
9ec247e59c update pt-BR 2021-12-01 18:18:05 +03:00
571400092c add el, bg 2021-12-01 17:41:40 +03:00
db20e966e2 update translations 2021-11-30 11:58:46 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +03:00
50f985a374 update translations 2021-11-29 12:12:38 +03:00
22efc180de Web: Added translation for make form action 2021-11-26 17:36:55 +03:00
3bee202d41 Web: Files: Replaced translation on common. 2021-11-22 14:23:45 +03:00
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
839d81f356 Web: Files: Added "Fill in the form" context menu action from ".ofrom" files 2021-11-19 13:25:09 +03:00
adbb316dd2 Web: moved "Owner" translation to Common 2021-11-15 18:33:32 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
1c8f091dce Web: Fix DublicatesByContentTest translation issues 2021-11-12 20:12:33 +03:00
551c623541 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
#	packages/asc-web-components/campaigns-banner/index.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-09-08 14:36:10 +03:00
350f24cf56 Web: Client: Common: Fixed PasswordLimitLength translation key for SK locale 2021-09-08 11:12:22 +03:00
24e13fb79d Web: deleted campaigns locales 2021-09-07 12:47:53 +03:00
4f30eb9a2a Web: removed duplicate translations from Common.json 2021-08-27 11:09:19 +03:00