|
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 |
|
|
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 |
|
|
8538b55dfc
|
Web: Turned on all languages
|
2021-12-09 21:45:10 +03:00 |
|
|
4ac6064578
|
add 'Save as oform'
|
2021-12-06 11:03:52 +03:00 |
|
|
50f985a374
|
update translations
|
2021-11-29 12:12:38 +03:00 |
|
|
adbb316dd2
|
Web: moved "Owner" translation to Common
|
2021-11-15 18:33:32 +03:00 |
|
|
1c8f091dce
|
Web: Fix DublicatesByContentTest translation issues
|
2021-11-12 20:12:33 +03:00 |
|
|
24e13fb79d
|
Web: deleted campaigns locales
|
2021-09-07 12:47:53 +03:00 |
|
|
e6efbb45b1
|
Web: People: added new translations, moved translations to Common.json
|
2021-07-29 16:09:56 +03:00 |
|
|
075d9232ec
|
Web: People: moved translation "Name" to Common.json
|
2021-07-16 13:23:52 +03:00 |
|
|
83884f1a60
|
Web: added link in locales
|
2021-07-01 11:03:42 +03:00 |
|
|
29446f1c36
|
Web: moved locales
|
2021-07-01 10:40:07 +03:00 |
|
|
3369cc2c7d
|
Web: added campaigns locales
|
2021-07-01 00:30:08 +03:00 |
|
|
e2b9561d7b
|
Web: Rewritten all json translation files with sorting of properties alphabetically
|
2021-05-31 18:34:15 +03:00 |
|
Artem Tarasov
|
215c933d9e
|
Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json"
|
2021-05-28 13:28:40 +03:00 |
|
Artem Tarasov
|
102f26ed3c
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-27 11:58:53 +03:00 |
|
Artem Tarasov
|
46d80f7b34
|
Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json"
|
2021-05-27 11:57:20 +03:00 |
|
|
3536be88c2
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 11:51:39 +03:00 |
|
|
00957a65ad
|
Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version"
|
2021-05-27 11:51:32 +03:00 |
|
|
b57da432bf
|
Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common.
|
2021-05-27 11:50:11 +03:00 |
|
|
7d1af40f6a
|
Web: Fix translation tests issues
|
2021-05-27 11:27:27 +03:00 |
|
Artem Tarasov
|
a12ab6c970
|
Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json"
|
2021-05-26 18:30:57 +03:00 |
|
Artem Tarasov
|
6ec9db8870
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-26 18:02:11 +03:00 |
|
Artem Tarasov
|
8d9655fa0b
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-26 17:59:52 +03:00 |
|
Artem Tarasov
|
d5ddeb4c42
|
Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json"
|
2021-05-26 17:58:05 +03:00 |
|
|
fe18e7e55c
|
Web: moved translation key "LblSelect"
|
2021-05-26 17:53:36 +03:00 |
|
|
151ffc7b26
|
Web: moved translation key "Active"
|
2021-05-26 17:46:09 +03:00 |
|
|
e437c7a035
|
Web: moved translationKeys "Size", "View", "Review"
|
2021-05-26 17:37:03 +03:00 |
|
|
541b14c8fe
|
Web: moved translationKeys "DisableUserButton", "NotFoundLanguage"
|
2021-05-26 16:40:02 +03:00 |
|
|
bf63128496
|
Web: moved translationKeys "LastName", "Language", "Mail"
|
2021-05-26 16:28:58 +03:00 |
|
|
2c5b95e352
|
Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage"
|
2021-05-26 16:06:40 +03:00 |
|
|
dc4872129b
|
Web: moved translationKeys "More", "Search", "AddFilter", "Comments"
|
2021-05-26 15:15:43 +03:00 |
|
|
f87b1f78f3
|
Web: moved translationKeys "Error", "ErrorUnknownFileImageType", "FemaleSexStatus", "LDAPLbl", "Location"
|
2021-05-26 14:55:33 +03:00 |
|
|
252fef7ae3
|
Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError"
|
2021-05-26 14:36:58 +03:00 |
|
|
3c1e322406
|
Web: moved translationKeys "Profile", "RecoverErrorMessage"
|
2021-05-26 14:21:11 +03:00 |
|
|
49bf2618d2
|
Web: moved translationKeys "Enable", "ProviderLoginError", "ProviderNotConnected"
|
2021-05-26 13:35:11 +03:00 |
|
Artem Tarasov
|
5170f6d682
|
Web: moved translationKeys "Download", "DownloadButton" to "/static/locales/{lng}/Common.json"
|
2021-05-26 12:36:28 +03:00 |
|
Artem Tarasov
|
98ee9062e8
|
Web: moved translation keys "SelectAll", "SelectAllLbl" to "/static/locales/{lng}/Common.json"
|
2021-05-26 11:44:36 +03:00 |
|
|
4228b0a5dc
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-25 17:26:12 +03:00 |
|
|
2452ec957d
|
Web: Moved translationKeys "Enable" to "/static/locales/{lng}/Common.json"
|
2021-05-25 17:16:09 +03:00 |
|
Artem Tarasov
|
f68bb45e61
|
Web: moved translation keys "Delete", "DeleteButton" to "/static/locales/{lng}/Common.json"
|
2021-05-25 15:22:59 +03:00 |
|
Artem Tarasov
|
671f98519a
|
Web: Moved translation Keys "ContinuteButton" to "/static/locales/{lng}/Common.json"
|
2021-05-25 12:49:56 +03:00 |
|
|
e01af3fd20
|
Web: Moved translationKeys "AdminSettings" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:47:26 +03:00 |
|
|
a80890f7cc
|
Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:40:26 +03:00 |
|
|
f94c19385f
|
Web: Moved translationKeys "Settings" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:31:41 +03:00 |
|
|
43e65a51d1
|
Web: Moved translationKeys "Next", "Previous", "PageOfTotalPage" and "CountPerPage" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:22:20 +03:00 |
|
|
b8dd8b3048
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-24 19:07:46 +03:00 |
|
|
1e954b15d7
|
Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:05:29 +03:00 |
|