Commit Graph

291 Commits

Author SHA1 Message Date
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