Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
This commit is contained in:
commit
830bfac3d7
@ -1,3 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Uploads": "アップロード"
|
"Uploads": "アップロード",
|
||||||
|
"EnterPassword": "パスワードをご入力ください",
|
||||||
|
"HideInput": "隠す",
|
||||||
|
"Ready": "完了",
|
||||||
|
"UploadAndConvert": "ファイルをアップロードして、変換する"
|
||||||
}
|
}
|
@ -23,8 +23,11 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace ASC.Files.Core.Security
|
namespace ASC.Files.Core.Security
|
||||||
{
|
{
|
||||||
|
[JsonConverter(typeof(JsonStringEnumConverter))]
|
||||||
public enum FileShare
|
public enum FileShare
|
||||||
{
|
{
|
||||||
None,
|
None,
|
||||||
|
@ -693,6 +693,7 @@ namespace ASC.Files.Helpers
|
|||||||
var aceCollection = new AceCollection<T>
|
var aceCollection = new AceCollection<T>
|
||||||
{
|
{
|
||||||
Files = new List<T> { fileId },
|
Files = new List<T> { fileId },
|
||||||
|
Folders = new List<T>(0),
|
||||||
Aces = list
|
Aces = list
|
||||||
};
|
};
|
||||||
FileStorageService.SetAceObject(aceCollection, false);
|
FileStorageService.SetAceObject(aceCollection, false);
|
||||||
|
5
web/ASC.Web.Client/public/locales/de/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/de/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "Guten Morgeng, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "Guten Tag, {{displayName}}!",
|
||||||
|
"GoodEvening": "Guten Abend, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/es/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/es/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "¡Buenos días, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "¡Buenas tardes, {{displayName}}!",
|
||||||
|
"GoodEvening": "¡Buenas noches, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/fr/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/fr/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "Bonjour, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "Bon après-midi, {{displayName}}!",
|
||||||
|
"GoodEvening": "Bonsoir, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/it/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/it/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "Buongiorno, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "Buon pomeriggio, {{displayName}}!",
|
||||||
|
"GoodEvening": "Buonasera, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/ja/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/ja/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "{{displayName}}!さん、おはようございます",
|
||||||
|
"GoodAfternoon": "こんにちは{{displayName}}!さん",
|
||||||
|
"GoodEvening": "こんばんは{{displayName}}!さん"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/ro/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/ro/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "Bună dimineața, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "Bună ziua, {{displayName}}!",
|
||||||
|
"GoodEvening": "Bună seara, {{displayName}}!"
|
||||||
|
}
|
5
web/ASC.Web.Client/public/locales/zh-CN/Home.json
Normal file
5
web/ASC.Web.Client/public/locales/zh-CN/Home.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"GoodMorning": "早上好, {{displayName}}!",
|
||||||
|
"GoodAfternoon": "下午好, {{displayName}}!",
|
||||||
|
"GoodEvening": "晚上好, {{displayName}}!"
|
||||||
|
}
|
@ -49,7 +49,7 @@ const Header = styled.header`
|
|||||||
!props.isPersonal &&
|
!props.isPersonal &&
|
||||||
css`
|
css`
|
||||||
@media ${tablet} {
|
@media ${tablet} {
|
||||||
padding-left: 4px;
|
display: none;
|
||||||
}
|
}
|
||||||
`}
|
`}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user