Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0
This commit is contained in:
commit
ff6986ddb1
@ -1,5 +1,4 @@
|
||||
{
|
||||
"SelectFile": "Select file",
|
||||
"Create": "Create",
|
||||
"SelectDOCXFormat": "Select the file in .DOCX format"
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,3 @@
|
||||
{
|
||||
"SelectFile": "Выбрать файл",
|
||||
"Create": "Создать"
|
||||
"SelectFile": "Выбрать файл"
|
||||
}
|
||||
|
@ -34,7 +34,7 @@ class SelectFileDialogBody extends React.Component {
|
||||
} = this.props;
|
||||
|
||||
this.buttonName = creationButtonPrimary
|
||||
? t("Create")
|
||||
? t("Common:Create")
|
||||
: t("Common:SaveButton");
|
||||
|
||||
this.state = {
|
||||
|
@ -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;
|
||||
|
@ -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",
|
||||
|
@ -28,6 +28,7 @@
|
||||
"Culture_pt-BR": "Португальский (Бразилия)",
|
||||
"Culture_ro": "Румынский (Румыния)",
|
||||
"Culture_sk-SK": "Словацкий (Словакия)",
|
||||
"Create": "Создать",
|
||||
"Delete": "Удалить",
|
||||
"DirectionAscLabel": "А-Я",
|
||||
"DirectionDescLabel": "Я-А",
|
||||
|
Loading…
Reference in New Issue
Block a user