Commit Graph

814 Commits

Author SHA1 Message Date
c8df2d9703 Merge branch 'develop' into feature/branding-correction
# Conflicts:
#	packages/client/public/locales/ar-SA/CreateEditRoomDialog.json
#	packages/client/public/locales/az/CreateEditRoomDialog.json
#	packages/client/public/locales/bg/CreateEditRoomDialog.json
#	packages/client/public/locales/cs/CreateEditRoomDialog.json
#	packages/client/public/locales/de/CreateEditRoomDialog.json
#	packages/client/public/locales/el-GR/CreateEditRoomDialog.json
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/client/public/locales/es/CreateEditRoomDialog.json
#	packages/client/public/locales/fi/CreateEditRoomDialog.json
#	packages/client/public/locales/fr/CreateEditRoomDialog.json
#	packages/client/public/locales/hy-AM/CreateEditRoomDialog.json
#	packages/client/public/locales/it/CreateEditRoomDialog.json
#	packages/client/public/locales/ja-JP/CreateEditRoomDialog.json
#	packages/client/public/locales/ko-KR/CreateEditRoomDialog.json
#	packages/client/public/locales/lo-LA/CreateEditRoomDialog.json
#	packages/client/public/locales/lv/CreateEditRoomDialog.json
#	packages/client/public/locales/nl/CreateEditRoomDialog.json
#	packages/client/public/locales/pl/CreateEditRoomDialog.json
#	packages/client/public/locales/pt-BR/CreateEditRoomDialog.json
#	packages/client/public/locales/pt/CreateEditRoomDialog.json
#	packages/client/public/locales/ro/CreateEditRoomDialog.json
#	packages/client/public/locales/ru/CreateEditRoomDialog.json
#	packages/client/public/locales/si/CreateEditRoomDialog.json
#	packages/client/public/locales/sk/CreateEditRoomDialog.json
#	packages/client/public/locales/sl/CreateEditRoomDialog.json
#	packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
#	packages/client/public/locales/tr/CreateEditRoomDialog.json
#	packages/client/public/locales/uk-UA/CreateEditRoomDialog.json
#	packages/client/public/locales/vi/CreateEditRoomDialog.json
#	packages/client/public/locales/zh-CN/CreateEditRoomDialog.json
2024-06-07 15:49:36 +03:00
03d313606f Deleted zh-CN translations. 2024-06-07 15:26:45 +03:00
ce9da8e898 Client: move translation key to 'Common' 2024-06-05 11:13:23 +03:00
c58d44e55e Move some translation keys to Common.json 2024-06-03 19:22:44 +03:00
7f8b7ddc4f Fixed translations. 2024-05-30 17:42:40 +03:00
3e942791be Added interpolation for 'SpaceUsersOnly' key. 2024-05-30 17:40:29 +03:00
f238741429 Fixed translation. 2024-05-30 17:37:21 +03:00
4d3e61b703 Added interpolation for 'SelectFromDocspace' key. 2024-05-30 16:40:55 +03:00
7fd2cad5ee Added interpolation for 'FromDocspace' key. 2024-05-30 16:39:22 +03:00
364c25a813 Added interpolation for 'BetaBadgeDescription' key. 2024-05-30 16:36:00 +03:00
1809b8cd92 Added interpolation for 'TurnOffDiskSpaceLimit key. 2024-05-30 14:57:14 +03:00
3313d4f020 Added interpolation for 'SetDiskSpaceQuota' key. 2024-05-30 14:54:02 +03:00
c02cc44108 Added interpolation for 'PortalRestriction' key. 2024-05-30 14:48:46 +03:00
ab7d326315 Added interpolation for 'InvitationToPortal' key. 2024-05-30 14:39:57 +03:00
706d28344b Added interpolation for 'ErrorDeactivatedText' key. 2024-05-30 14:30:22 +03:00
53529ce19a Added interpolation for 'EmptyDescription' key. 2024-05-30 14:04:56 +03:00
8c7bd1a241 Added interpolation for 'DocspaceOwner' key. 2024-05-30 13:27:15 +03:00
c0ee32f303 Added interpolation for 'DocspaceAdmin' key. 2024-05-30 13:13:43 +03:00
d1061bb3ae renaming resource keys 2024-05-23 18:14:33 +03:00
881b7bad4b Translations: fix UselessTranslationKeysTest issues 2024-05-15 19:37:37 +04:00
467f53220f Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 19:10:03 +04:00
981afb7fa2 updated si 2024-05-13 16:18:53 +03:00
df9ced222f Merge branch 'develop' into bugfix/form-room 2024-05-07 20:26:54 +04:00
Akmal Isomadinov
0ed0fc2e18 Client:Components:Badges Fixed translation 2024-05-07 18:39:54 +05:00
Vladimir Khvan
6c7e8caa8d Merge branch 'develop' into feature/sdk-presets 2024-05-07 15:30:30 +05:00
4f2295c2d8 Merge branch 'hotfix/v2.5.1' into develop 2024-05-03 14:51:27 +04:00
b52e7af32c Fix Bug 67813
No translation of Share panel in editor
2024-05-03 12:32:58 +03:00
ee84c16335 Merge branch 'hotfix/v2.5.1' into develop 2024-05-02 15:05:36 +04:00
c1269a6a60 edited zh 2024-05-02 13:45:15 +03:00
Vladimir Khvan
e4ab7e11e4 Merge branch 'develop' into feature/sdk-presets 2024-04-30 02:09:42 +05:00
fcc50d6dfc Merge branch 'hotfix/v2.5.1' into develop 2024-04-26 18:05:43 +04:00
fede13cd74 Translations: Moved "Errors:InvalidLink" to Common 2024-04-26 17:41:30 +04:00
8b4bb07568 Translations: Common: Removed old key 'SelectIMGFormat' 2024-04-26 16:42:07 +04:00
1ab2c02025 Merge branch 'develop' into feature/sdk-presets
# Conflicts:
#	public/locales/en/Common.json
2024-04-26 16:40:45 +04:00
Vladimir Khvan
c308e5560e Web: Client: JavascriptSDK: corrected translations for fileSelector presets 2024-04-23 15:54:47 +05:00
Akmal Isomadinov
41e70017a0 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/shared/components/empty-view/EmptyView.styled.ts
2024-04-22 19:22:51 +05:00
d2733829e5 Merge branch 'release/v2.5.0' into develop 2024-04-19 19:10:43 +04:00
Akmal Isomadinov
0623e57d9e Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/doceditor/src/utils/index.ts
2024-04-19 16:42:10 +05: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
Akmal Isomadinov
4027d69236 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/doceditor/src/utils/actions.ts
#	public/locales/en/Common.json
2024-04-18 12:23:54 +05:00
Akmal Isomadinov
6f7ae7540f Client:ContextOptionsStore Added edit pdf action 2024-04-16 14:56:12 +05:00
49cb4789f9 Enabled new language sr-Latn-RS 2024-04-16 13:02:44 +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
Akmal Isomadinov
7c4adde668 Merge branch 'develop' into feature/form-room 2024-04-12 11:36:53 +05:00