Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1

products/ASC.Files/Client/public/locales/ja/UploadPanel.json

@@ -1,3 +1,7 @@
 {
-  "Uploads": "アップロード"
+    "Uploads": "アップロード",
+    "EnterPassword": "パスワードをご入力ください",
+    "HideInput": "隠す",
+    "Ready": "完了",
+    "UploadAndConvert": "ファイルをアップロードして、変換する"
 }

products/ASC.Files/Core/Core/Security/FileShare.cs

@@ -23,8 +23,11 @@
  *
 */
 
+using System.Text.Json.Serialization;
+
 namespace ASC.Files.Core.Security
-{
+{
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     public enum FileShare
     {
         None,

products/ASC.Files/Server/Helpers/FilesControllerHelper.cs

@@ -693,6 +693,7 @@ namespace ASC.Files.Helpers
                 var aceCollection = new AceCollection<T>
                 {
                     Files = new List<T> { fileId },
+                    Folders = new List<T>(0),
                     Aces = list
                 };
                 FileStorageService.SetAceObject(aceCollection, false);

web/ASC.Web.Client/public/locales/de/Home.json

@@ -0,0 +1,5 @@
+{
+    "GoodMorning": "Guten Morgeng, {{displayName}}!",
+    "GoodAfternoon": "Guten Tag, {{displayName}}!",
+    "GoodEvening": "Guten Abend, {{displayName}}!"
+}

web/ASC.Web.Client/public/locales/es/Home.json

@@ -0,0 +1,5 @@
+{
+    "GoodMorning": "¡Buenos días, {{displayName}}!",
+    "GoodAfternoon": "¡Buenas tardes, {{displayName}}!",
+    "GoodEvening": "¡Buenas noches, {{displayName}}!"
+}

web/ASC.Web.Client/public/locales/fr/Home.json

@@ -0,0 +1,5 @@
+{
+    "GoodMorning": "Bonjour, {{displayName}}!",
+    "GoodAfternoon": "Bon après-midi, {{displayName}}!",
+    "GoodEvening": "Bonsoir, {{displayName}}!"
+}

web/ASC.Web.Client/public/locales/it/Home.json

@@ -0,0 +1,5 @@
+{
+    "GoodMorning": "Buongiorno, {{displayName}}!",
+    "GoodAfternoon": "Buon pomeriggio, {{displayName}}!",
+    "GoodEvening": "Buonasera, {{displayName}}!"
+}

web/ASC.Web.Client/public/locales/ja/Home.json

@@ -0,0 +1,5 @@
+{
+    "GoodMorning": "{{displayName}}!さん、おはようございます",
+    "GoodAfternoon": "こんにちは{{displayName}}!さん",
+    "GoodEvening": "こんばんは{{displayName}}!さん"
+}

web/ASC.Web.Client/public/locales/ro/Home.json

@@ -0,0 +1,5 @@
+{
+    "GoodMorning": "Bună dimineața, {{displayName}}!",
+    "GoodAfternoon": "Bună ziua, {{displayName}}!",
+    "GoodEvening": "Bună seara, {{displayName}}!"
+}

web/ASC.Web.Client/public/locales/zh-CN/Home.json

@@ -0,0 +1,5 @@
+{
+    "GoodMorning": "早上好, {{displayName}}!",
+    "GoodAfternoon": "下午好, {{displayName}}!",
+    "GoodEvening": "晚上好, {{displayName}}!"
+}

web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js

@@ -49,7 +49,7 @@ const Header = styled.header`
       !props.isPersonal &&
       css`
         @media ${tablet} {
-          padding-left: 4px;
+          display: none;
         }
       `}
   }