Commit Graph

782 Commits

Author SHA1 Message Date
0dfab5563b Merge branch 'feature/VDR-room' into feature/VDR-watermarks
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/components/tabs-container/index.js
#	packages/components/tabs-container/styled-tabs-container.js
#	packages/components/themes/base.js
#	packages/components/utils/globalColors.js
#	public/locales/en/Common.json
2024-05-02 10:42:07 +03:00
e8eb0db251 Merge branch 'develop' into feature/VDR-room
# Conflicts:
#	public/locales/en/Common.json
2024-04-22 15:43:39 +04:00
d2733829e5 Merge branch 'release/v2.5.0' into develop 2024-04-19 19:10:43 +04:00
af7ea9116e Translations: Moved 'Reconnect' key to Common 2024-04-19 14:54:40 +04:00
5c7a15c5f8 edited zh 'people' 2024-04-19 13:12:23 +03:00
fff1f996bd edited ar 'sign up/sign in' 2024-04-19 13:08:34 +03:00
8a202e1d79 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/shared/utils/common.ts
2024-04-19 13:13:00 +04:00
49cb4789f9 Enabled new language sr-Latn-RS 2024-04-16 13:02:44 +04:00
e27e7dbc7a Merge branch 'develop' into feature/VDR-room
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/EditRoomDialog.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/index.js
#	packages/client/src/store/CreateEditRoomStore.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/InfoPanelStore.js
2024-04-15 18:31:54 +04:00
e27bad8eae Merge branch 'release/v2.5.0' into develop 2024-04-12 20:13:01 +04:00
1f2260e5a0 Translations: Fix bad tag in keys InvitationToPortal, InvitationToRoom 2024-04-12 20:05:39 +04:00
ddb9f74d83 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/doceditor/src/app/(root)/create/page.tsx
#	public/locales/en/Common.json
2024-04-12 19:14:59 +04:00
9afb296b5d updated hy 2024-04-12 16:59:47 +03:00
0ee71165ac added sr-latn-RS 2024-04-11 19:48:03 +03:00
5752bb3a2d updated translations 2024-04-11 16:21:30 +03:00
7b44084797 Translations: Fix EnDublicatesByContentTest issue (Moved "Editor" key to Common and replaced "RoleEditor") 2024-04-11 13:34:53 +04:00
5b67fbeb5d Translations: Fix EnDublicatesByContentTest issue (ProviderSso replaced to SSO) 2024-04-11 13:10:18 +04:00
0decfee5f0 Translations: Fix EnDublicatesByContentTest issue (replaced GroupsNotFoundHeader to NotFoundGroups) 2024-04-11 12:51:03 +04:00
b5a38f3434 Translations: Fix UselessTranslationKeysTest issues 2024-04-11 12:46:19 +04:00
24d9d0e431 Translations: Fix WrongTranslationVariablesTest issues 2024-04-11 09:49:48 +04:00
7206ee6205 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/store/DialogsStore.js
2024-04-10 20:09:16 +04:00
64c2989408 edited translations 2024-04-10 18:28:56 +03:00
5369fae080 Merge branch 'feature/new-translations_v.2.5' of github.com:ONLYOFFICE/DocSpace-client into feature/new-translations_v.2.5 2024-04-10 18:28:20 +04:00
e298fc0d1d Merge branch 'release/v2.5.0' into feature/new-translations_v.2.5
# Conflicts:
#	packages/client/public/locales/ar-SA/InviteDialog.json
#	packages/client/public/locales/ar-SA/Settings.json
#	packages/client/public/locales/az/InviteDialog.json
#	packages/client/public/locales/az/Settings.json
#	packages/client/public/locales/bg/InviteDialog.json
#	packages/client/public/locales/bg/Settings.json
#	packages/client/public/locales/cs/InviteDialog.json
#	packages/client/public/locales/cs/Settings.json
#	packages/client/public/locales/de/InviteDialog.json
#	packages/client/public/locales/de/Settings.json
#	packages/client/public/locales/el-GR/InviteDialog.json
#	packages/client/public/locales/el-GR/Settings.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/WebPlugins.json
#	packages/client/public/locales/es/InviteDialog.json
#	packages/client/public/locales/es/Settings.json
#	packages/client/public/locales/fi/InviteDialog.json
#	packages/client/public/locales/fi/Settings.json
#	packages/client/public/locales/fr/InviteDialog.json
#	packages/client/public/locales/fr/Settings.json
#	packages/client/public/locales/hy-AM/InviteDialog.json
#	packages/client/public/locales/hy-AM/Settings.json
#	packages/client/public/locales/it/InviteDialog.json
#	packages/client/public/locales/it/Settings.json
#	packages/client/public/locales/ja-JP/InviteDialog.json
#	packages/client/public/locales/ja-JP/Settings.json
#	packages/client/public/locales/ko-KR/InviteDialog.json
#	packages/client/public/locales/ko-KR/Settings.json
#	packages/client/public/locales/lv/InviteDialog.json
#	packages/client/public/locales/lv/Settings.json
#	packages/client/public/locales/nl/InviteDialog.json
#	packages/client/public/locales/nl/Settings.json
#	packages/client/public/locales/pl/InviteDialog.json
#	packages/client/public/locales/pl/Settings.json
#	packages/client/public/locales/pt-BR/InviteDialog.json
#	packages/client/public/locales/pt-BR/Settings.json
#	packages/client/public/locales/pt/InviteDialog.json
#	packages/client/public/locales/pt/Settings.json
#	packages/client/public/locales/ro/InviteDialog.json
#	packages/client/public/locales/ro/Settings.json
#	packages/client/public/locales/ru/InviteDialog.json
#	packages/client/public/locales/ru/Settings.json
#	packages/client/public/locales/ru/Translations.json
#	packages/client/public/locales/sk/InviteDialog.json
#	packages/client/public/locales/sk/Settings.json
#	packages/client/public/locales/sl/InviteDialog.json
#	packages/client/public/locales/sl/Settings.json
#	packages/client/public/locales/tr/InviteDialog.json
#	packages/client/public/locales/tr/Settings.json
#	packages/client/public/locales/uk-UA/InviteDialog.json
#	packages/client/public/locales/uk-UA/Settings.json
#	packages/client/public/locales/vi/InviteDialog.json
#	packages/client/public/locales/vi/Settings.json
#	packages/client/public/locales/zh-CN/InviteDialog.json
#	packages/client/public/locales/zh-CN/Settings.json
#	public/locales/ar-SA/Common.json
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el-GR/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/hy-AM/Common.json
#	public/locales/it/Common.json
#	public/locales/ja-JP/Common.json
#	public/locales/ko-KR/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/tr/Common.json
#	public/locales/uk-UA/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2024-04-10 18:28:12 +04:00
af240bb9ef added translations 2024-04-10 16:48:51 +03:00
07d20cd9da added translations 2024-04-10 15:30:25 +03:00
7bb8ee3295 added it 2024-04-09 18:04:38 +03:00
013fd4a8be Web: move translations to Common 2024-04-09 10:35:07 +03:00
3550bea206 Update translations [ru] 2024-04-08 11:29:56 +03:00
76c29e1335 Merge branch 'develop' into feature/form-room-modals 2024-04-08 01:39:14 +04:00
010f63e5d2 added translations 2024-04-04 18:26:42 +03:00
820da7bb80 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/client/src/components/FilesSelector/index.tsx
#	packages/client/src/components/FilesSelector/utils.ts
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/store/SelectedFolderStore.ts
#	packages/doceditor/src/app/create/page.tsx
2024-04-04 11:15:24 +04:00
b8ddf6bd9d added translations 2024-04-02 18:24:47 +03:00
Vladimir Khvan
3ec31707ce Merge branch 'release/v2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/data-migration 2024-04-02 12:43:19 +05:00
c78075bf35 added translations 2024-04-01 18:31:03 +03:00
7790adb782 Web: Files: ThirdParty: fixed translations 2024-04-01 17:42:39 +03:00
Vladimir Khvan
c0509ca855 Web: Client: translation was corrected 2024-04-01 15:25:53 +05:00
Akmal Isomadinov
b2d73e8f48 Client:Public:Locales:CreatedPDFFormDialog Added translations 2024-03-28 22:53:15 +05:00
Akmal Isomadinov
22002269ab Client:Dialog: Added CreatedPDFFormDialog 2024-03-28 17:04:16 +05:00
46835e7a40 added translations 2024-03-27 17:24:48 +03:00
09bdc7e382 Merge branch 'release/v2.5.0' into develop 2024-03-26 14:38:57 +04:00
daf914604e Translation: Moved "InviteDialog:Invited" and "Settings:Disabled" keys to Common 2024-03-26 13:51:15 +04:00
namushka
b1a4cb158d fix translations 2024-03-26 12:23:29 +03:00
a98d1060ed added hy, pt-BR 2024-03-22 17:04:42 +03:00
2d11fbf5bb edited en 2024-03-19 12:46:56 +03:00
a9380b879e Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/GlobalEvents/CreateEvent.js
#	public/locales/en/Common.json
2024-03-14 17:47:38 +04:00
Akmal Isomadinov
fe1ace1795 Merge branch 'develop' into feature/redesign-form-filling-room
# Conflicts:
#	public/locales/en/Common.json
2024-03-13 16:38:57 +05:00
Akmal Isomadinov
5fad4f34b8 Client:Article:MainButton: Added form file selection actions 2024-03-13 15:24:41 +05:00
7293ae5dbd Fix some translation issues 2024-03-07 20:07:06 +04:00
18fd7db7a5 Fix UselessTranslationKeysTest issues 2024-03-07 18:10:01 +04:00