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
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
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
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
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
8d3921eae9
Web: Translations: Removed keys: TitleDocuments, TitleSubfolders, More (UselessTranslationKeysTest issues fix)
2022-05-23 20:25:42 +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
b2f6ce39f7
Update translations (common, files)
2022-05-18 19:54:25 +03:00
dad9016695
Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix)
2022-05-17 18:17:11 +03:00
93a53092d6
Web: Translations: Fix UselessTranslationKeysTest issues
2022-05-13 19:33:16 +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
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
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
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
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
8538b55dfc
Web: Turned on all languages
2021-12-09 21:45:10 +03:00
3f114a58d7
Web: Locales: Changed translation "Make form" to "Save as oform"
2021-12-02 18:51:04 +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
1c8f091dce
Web: Fix DublicatesByContentTest translation issues
2021-11-12 20:12:33 +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
e6efbb45b1
Web: People: added new translations, moved translations to Common.json
2021-07-29 16:09:56 +03:00
2abbd580c2
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-07-28 16:53:23 +03:00
445c7ae43f
Web: Files: added cell type
2021-07-27 13:51:56 +03:00
2c8756dee3
Web: fixed translations
2021-07-22 15:09:29 +03:00
075d9232ec
Web: People: moved translation "Name" to Common.json
2021-07-16 13:23:52 +03:00
1203ee314d
Web: added translations
2021-07-14 15:44:01 +03:00
b3fd47a216
Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:42:05 +03:00
83884f1a60
Web: added link in locales
2021-07-01 11:03:42 +03:00
29446f1c36
Web: moved locales
2021-07-01 10:40:07 +03:00
3369cc2c7d
Web: added campaigns locales
2021-07-01 00:30:08 +03:00
b1662e7ac6
Web: Init maintenance displaying
2021-06-22 13:41:11 +03:00
d9b4611517
added ResetApplication translations in Common
2021-06-08 15:30:11 +03:00
908310041f
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
2021-06-02 10:59:07 +03:00
7ae9b19412
Web: Turn on new languages >= 78%
...
1. Language 'de' translated by '90%'
2. Language 'fr' translated by '54%'
3. Language 'it' translated by '78%'
4. Language 'lo' translated by '78%'
5. Language 'pt-BR' translated by '78%'
6. Language 'ro' translated by '78%'
7. Language 'ru' translated by '99%'
8. Language 'sk' translated by '19%'
9. Language 'en' translated by '100%'
2021-06-01 13:25:41 +03:00
e2b9561d7b
Web: Rewritten all json translation files with sorting of properties alphabetically
2021-05-31 18:34:15 +03:00
Artem Tarasov
102f26ed3c
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-27 11:58:53 +03:00
Artem Tarasov
46d80f7b34
Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json"
2021-05-27 11:57:20 +03:00
3536be88c2
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-27 11:51:39 +03:00
00957a65ad
Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version"
2021-05-27 11:51:32 +03:00
b57da432bf
Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common.
2021-05-27 11:50:11 +03:00
7d1af40f6a
Web: Fix translation tests issues
2021-05-27 11:27:27 +03:00
Artem Tarasov
a12ab6c970
Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json"
2021-05-26 18:30:57 +03:00
Artem Tarasov
6ec9db8870
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-26 18:02:11 +03:00
Artem Tarasov
8d9655fa0b
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-26 17:59:52 +03:00
Artem Tarasov
d5ddeb4c42
Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json"
2021-05-26 17:58:05 +03:00
fe18e7e55c
Web: moved translation key "LblSelect"
2021-05-26 17:53:36 +03:00
151ffc7b26
Web: moved translation key "Active"
2021-05-26 17:46:09 +03:00
e437c7a035
Web: moved translationKeys "Size", "View", "Review"
2021-05-26 17:37:03 +03:00
541b14c8fe
Web: moved translationKeys "DisableUserButton", "NotFoundLanguage"
2021-05-26 16:40:02 +03:00
bf63128496
Web: moved translationKeys "LastName", "Language", "Mail"
2021-05-26 16:28:58 +03:00
2c5b95e352
Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage"
2021-05-26 16:06:40 +03:00
dc4872129b
Web: moved translationKeys "More", "Search", "AddFilter", "Comments"
2021-05-26 15:15:43 +03:00
f87b1f78f3
Web: moved translationKeys "Error", "ErrorUnknownFileImageType", "FemaleSexStatus", "LDAPLbl", "Location"
2021-05-26 14:55:33 +03:00
252fef7ae3
Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError"
2021-05-26 14:36:58 +03:00
3c1e322406
Web: moved translationKeys "Profile", "RecoverErrorMessage"
2021-05-26 14:21:11 +03:00
49bf2618d2
Web: moved translationKeys "Enable", "ProviderLoginError", "ProviderNotConnected"
2021-05-26 13:35:11 +03:00
Artem Tarasov
5170f6d682
Web: moved translationKeys "Download", "DownloadButton" to "/static/locales/{lng}/Common.json"
2021-05-26 12:36:28 +03:00
Artem Tarasov
98ee9062e8
Web: moved translation keys "SelectAll", "SelectAllLbl" to "/static/locales/{lng}/Common.json"
2021-05-26 11:44:36 +03:00
4228b0a5dc
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-25 17:26:12 +03:00