Commit Graph

171 Commits

Author SHA1 Message Date
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
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
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +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
TimofeyBoyko
937d99249e Merge branch 'develop' into feature/accounts-list 2022-08-29 09:47:42 +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
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