|
|
0730775b36
|
Merge branch 'feature/sr-cyrl' into develop
# Conflicts:
# packages/client/public/locales/en/PrivacyPage.json
# packages/client/public/locales/sr-Latn-RS/ChangeUserStatusDialog.json
# packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
# packages/client/public/locales/sr-Latn-RS/Files.json
# packages/client/public/locales/sr-Latn-RS/JavascriptSdk.json
# packages/client/public/locales/sr-Latn-RS/Notifications.json
# packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
# packages/client/public/locales/sr-Latn-RS/PrivacyPage.json
# packages/client/public/locales/sr-Latn-RS/Settings.json
# packages/client/public/locales/sr-Latn-RS/SingleSignOn.json
# packages/client/public/locales/sr-Latn-RS/Webhooks.json
# public/locales/sr-Latn-RS/Common.json
|
2024-06-13 14:23:08 +04:00 |
|
|
|
cb0fd44eb3
|
Merge branch 'develop' into bugfix/standalone
|
2024-06-11 20:32:48 +04:00 |
|
|
|
d1a1c9b477
|
Merge branch 'develop' into bugfix/standalone
# Conflicts:
# packages/client/public/locales/ar-SA/PaymentsEnterprise.json
# packages/client/public/locales/az/PaymentsEnterprise.json
# packages/client/public/locales/bg/PaymentsEnterprise.json
# packages/client/public/locales/cs/PaymentsEnterprise.json
# packages/client/public/locales/de/PaymentsEnterprise.json
# packages/client/public/locales/el-GR/PaymentsEnterprise.json
# packages/client/public/locales/en/PaymentsEnterprise.json
# packages/client/public/locales/es/PaymentsEnterprise.json
# packages/client/public/locales/fi/PaymentsEnterprise.json
# packages/client/public/locales/fr/PaymentsEnterprise.json
# packages/client/public/locales/hy-AM/PaymentsEnterprise.json
# packages/client/public/locales/it/PaymentsEnterprise.json
# packages/client/public/locales/ja-JP/PaymentsEnterprise.json
# packages/client/public/locales/ko-KR/PaymentsEnterprise.json
# packages/client/public/locales/lo-LA/PaymentsEnterprise.json
# packages/client/public/locales/lv/PaymentsEnterprise.json
# packages/client/public/locales/nl/PaymentsEnterprise.json
# packages/client/public/locales/pl/PaymentsEnterprise.json
# packages/client/public/locales/pt-BR/PaymentsEnterprise.json
# packages/client/public/locales/pt/PaymentsEnterprise.json
# packages/client/public/locales/ro/PaymentsEnterprise.json
# packages/client/public/locales/ru/PaymentsEnterprise.json
# packages/client/public/locales/si/PaymentsEnterprise.json
# packages/client/public/locales/sk/PaymentsEnterprise.json
# packages/client/public/locales/sl/PaymentsEnterprise.json
# packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
# packages/client/public/locales/tr/PaymentsEnterprise.json
# packages/client/public/locales/uk-UA/PaymentsEnterprise.json
# packages/client/public/locales/vi/PaymentsEnterprise.json
|
2024-06-11 18:27:24 +03:00 |
|
Akmal Isomadinov
|
fb940c9add
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
|
2024-06-11 20:15:15 +05:00 |
|
|
|
55c9942146
|
Renaming portalName value.
|
2024-06-11 13:28:32 +03:00 |
|
|
|
e44172d04b
|
Added interpolation for WebhooksInfo key.
|
2024-06-10 16:39:53 +03:00 |
|
|
|
bf4a25017d
|
Added interpolation for AppName key.
|
2024-06-10 16:36:22 +03:00 |
|
|
|
74c6c74835
|
Added interpolation for SpMetadataDescription key.
|
2024-06-10 16:32:21 +03:00 |
|
|
|
1989992426
|
Added interpolation for SpMetadata key.
|
2024-06-10 16:30:03 +03:00 |
|
|
|
d78ebf4954
|
Added interpolation for ServiceProviderSettings key.
|
2024-06-10 16:27:10 +03:00 |
|
|
|
aff11fa273
|
Added interpolation for SelectUsersDescriptionWorkspace key.
|
2024-06-10 16:16:15 +03:00 |
|
|
|
f1744c05be
|
Added interpolation for SelectUsersDescriptionNextcloud key.
|
2024-06-10 16:13:09 +03:00 |
|
|
|
42000c4690
|
Added interpolation for SelectUsersDescriptionGoogle key.
|
2024-06-10 16:10:38 +03:00 |
|
|
|
dd69f1baa5
|
Added interpolation for SelectFileDescriptionWorkspace key.
|
2024-06-10 16:07:43 +03:00 |
|
|
|
301fd001ac
|
Added interpolation for IntegrationRequest key.
|
2024-06-10 16:05:23 +03:00 |
|
|
|
94f2ccdabd
|
Added interpolation for ImportFromOnlyoffice key.
|
2024-06-10 16:02:46 +03:00 |
|
|
|
3f1f83b353
|
Added interpolation for ImportCompleteDescriptionWorkspace key.
|
2024-06-10 15:41:55 +03:00 |
|
Akmal Isomadinov
|
58dbc2f406
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
|
2024-06-10 17:40:22 +05:00 |
|
|
|
4605ac2213
|
Added interpolation for ImportCompleteDescriptionNextcloud key.
|
2024-06-10 15:38:37 +03:00 |
|
|
|
adbca34d5e
|
Added interpolation for ImportCompleteDescriptionGoogle key.
|
2024-06-10 15:35:02 +03:00 |
|
|
|
78ecc579d3
|
Added interpolation for DataImportDescription key.
|
2024-06-10 15:31:42 +03:00 |
|
|
|
f2c91f49e0
|
Added interpolation for ApiPageDescription key.
|
2024-06-10 15:26:51 +03:00 |
|
|
|
0ee8c7e74c
|
Added interpolation for AddEmailsDescription key.
|
2024-06-10 15:23:42 +03:00 |
|
|
|
98a386e35a
|
Added interpolation for AboutDataImport key.
|
2024-06-10 15:19:39 +03:00 |
|
|
|
7103a99c73
|
Added interpolation for PrivacyEditors key.
|
2024-06-10 15:14:33 +03:00 |
|
|
|
cfdd662ba7
|
Added interpolation for PrivacyDescriptionEditors key.
|
2024-06-10 15:12:20 +03:00 |
|
|
|
35116ff3d7
|
Added interpolation for PrivacyClick key.
|
2024-06-10 15:10:17 +03:00 |
|
|
|
6ddfa823da
|
Added interpolation for PrivacyButton key.
|
2024-06-10 15:07:20 +03:00 |
|
|
|
bfaee1b571
|
Added interpolation for UpgradeToProBannerInstructionHeader key.
|
2024-06-10 15:01:12 +03:00 |
|
|
|
775a7be56d
|
Added interpolation for ActivateTariffDescr key.
|
2024-06-10 14:51:34 +03:00 |
|
|
|
fc71aa476d
|
Added interpolation for PrivateRoomHeader key.
|
2024-06-10 14:48:38 +03:00 |
|
Akmal Isomadinov
|
71cd1ec9ea
|
Public:locales transfers moved to a common
|
2024-06-10 15:42:14 +05:00 |
|
|
|
afd65f3afa
|
Changed translations.
|
2024-06-07 16:43:58 +03:00 |
|
|
|
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 |
|
|
|
97f1c13bcf
|
Fixed translations.
|
2024-06-07 13:51:48 +03:00 |
|
|
|
31e2dc32fd
|
Merge branch 'develop' into feature/create-room-selector
|
2024-06-05 16:20:51 +03:00 |
|
|
|
dbede6ca01
|
Web: Hotkeys: fixed translations
|
2024-06-05 15:52:38 +03:00 |
|
|
|
ce9da8e898
|
Client: move translation key to 'Common'
|
2024-06-05 11:13:23 +03:00 |
|
|
|
a81baf7e74
|
added sr-cyrl
|
2024-06-04 15:29:57 +03:00 |
|
|
|
c58d44e55e
|
Move some translation keys to Common.json
|
2024-06-03 19:22:44 +03:00 |
|
|
|
3555acf047
|
added sr-cyrl
|
2024-06-03 18:26:18 +03:00 |
|
|
|
564a7b8e8e
|
Fixed translation.
|
2024-05-31 19:10:52 +03:00 |
|
|
|
0fb5ad43f8
|
edited My documents
|
2024-05-31 18:46:53 +03:00 |
|
|
|
4a26ae984d
|
Added interpolation for 'TimeLanguageSettingsDescription' key.
|
2024-05-31 18:23:37 +03:00 |
|
|
|
7fcfed8a10
|
Added interpolation for 'RestoreBackupWarningText' key.
|
2024-05-31 18:21:39 +03:00 |
|
|
|
1d5f4042c2
|
Added interpolation for 'RestoreBackupResetInfoWarningText' key.
|
2024-05-31 18:19:29 +03:00 |
|
|
|
1849bbdd13
|
Added interpolation for 'ApiPageDescription' key.
|
2024-05-31 18:17:42 +03:00 |
|
|
|
7585197929
|
Added interpolation for 'UserLimitExceeded' key.
|
2024-05-31 18:16:07 +03:00 |
|
|
|
1e6be726bb
|
Added interpolation for 'SDKDescription' key.
|
2024-05-31 18:14:23 +03:00 |
|
|
|
88cd8aaf8e
|
Added interpolation for 'SelectToDocspace' key.
|
2024-05-31 18:10:56 +03:00 |
|
