Commit Graph

166 Commits

Author SHA1 Message Date
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
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
6b84d183b8 Web: add translates 2022-03-17 12:41:57 +03:00
89b2f94469 Web: add missed translate for de 2022-03-16 11:19:44 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
a7199bd3d4 Web: sort locales by key 2022-03-10 23:50:43 +03:00
3bbf82d918 add new lines 2022-03-09 19:07:24 +03:00
b71c2eabc5 Web:Added translation for "Title" for locales en, pt-BR, ru, de, fr, it. 2022-03-09 12:03:01 +03:00
ee446c8e67 Web: moved translates to Common 2022-03-09 11:04:12 +03:00
7ffaee6efc Web: moved translates to Common 2022-03-05 14:27:59 +03:00
Timofey Boyko
65ccfb896f Web:Files: add new key 'sorting' 2022-03-04 10:20:10 +03:00
7907016bde Web: fix after merge 2022-02-22 13:55:49 +03:00
32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	public/locales/de/Common.json
2022-02-22 13:53:00 +03:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
743d0566a3 edit de (common) 2022-02-17 12:34:35 +03:00
3229019aad Web: move LoginButton key to Common 2022-02-10 18:01:40 +03:00
817a155642 Web: move ShowMore to Common translate 2022-02-08 22:34:21 +03:00
9068af695d Web: add sso translate 2022-02-03 01:09:51 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
34441d6335 Web: Moved some translations from Files to COMMON for asc-web-components 2022-01-21 11:49:16 +03:00
ab931e40ef edit bg, az 2021-12-23 11:23:25 +03:00
93cbab055c edit lo 2021-12-16 15:59:02 +03:00
30860f041a add new keys ro, lo, edit keys az 2021-12-15 13:56:30 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
8538b55dfc Web: Turned on all languages 2021-12-09 21:45:10 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00