Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0

This commit is contained in:
Alexey Safronov 2021-11-22 14:50:11 +03:00
commit ff6986ddb1
6 changed files with 7 additions and 6 deletions

View File

@ -1,5 +1,4 @@
{
"SelectFile": "Select file",
"Create": "Create",
"SelectDOCXFormat": "Select the file in .DOCX format"
}
}

View File

@ -1,4 +1,3 @@
{
"SelectFile": "Выбрать файл",
"Create": "Создать"
"SelectFile": "Выбрать файл"
}

View File

@ -34,7 +34,7 @@ class SelectFileDialogBody extends React.Component {
} = this.props;
this.buttonName = creationButtonPrimary
? t("Create")
? t("Common:Create")
: t("Common:SaveButton");
this.state = {

View File

@ -737,7 +737,8 @@ const StyledSelectFilePanel = styled.div`
}
}
.loader-wrapper_margin {
margin-left: 12px;
margin-left: ${(props) =>
props.displayType === "aside" ? "16px" : "12px"};
}
.select-file-dialog_modal-loader {
height: 290px;

View File

@ -28,6 +28,7 @@
"Culture_pt-BR": "Portuguese (Brazil)",
"Culture_ro": "Romanian (Romania)",
"Culture_sk-SK": "Slovak (Slovakia)",
"Create": "Create",
"Delete": "Delete",
"DirectionAscLabel": "A-Z",
"DirectionDescLabel": "Z-A",

View File

@ -28,6 +28,7 @@
"Culture_pt-BR": "Португальский (Бразилия)",
"Culture_ro": "Румынский (Румыния)",
"Culture_sk-SK": "Словацкий (Словакия)",
"Create": "Создать",
"Delete": "Удалить",
"DirectionAscLabel": "А-Я",
"DirectionDescLabel": "Я-А",