diff --git a/common/loginpage/src/css/window.less b/common/loginpage/src/css/window.less
index 42f7623e1..ef182872f 100644
--- a/common/loginpage/src/css/window.less
+++ b/common/loginpage/src/css/window.less
@@ -17,7 +17,7 @@ dialog {
     z-index: 2;
     border-radius: 5px;
     box-shadow: 0 2px 6px rgba(0,0,0,0.2);
-    border: 1px solid @border-tabbar;
+    border: @scaled-one-px solid @border-tabbar;
     overflow-y: visibile;
 
     &::backdrop {
@@ -32,7 +32,7 @@ dialog {
 
     .title {
         height: @title-height;
-        border-bottom: 1px solid @border-tabbar;
+        border-bottom: @scaled-one-px solid @border-tabbar;
         display: flex;
         color: @text-normal;
         align-items: center;
@@ -55,7 +55,7 @@ dialog {
         width: 100%;
         top: @title-height;
         bottom: 0;
-        padding: 20px 30px 30px;
+        padding: 20px 30px 28px;
     }
 
     .tool.close {
@@ -104,7 +104,7 @@ dialog {
     }
 
     .separator {
-        border-top: 1px solid @color-gray-3;
+        border-top: @scaled-one-px solid @color-gray-3;
         margin: 24px 0;
     }
 
diff --git a/win-linux/langs/fr.ts b/win-linux/langs/fr.ts
index 5941bf631..8226d5526 100644
--- a/win-linux/langs/fr.ts
+++ b/win-linux/langs/fr.ts
@@ -242,7 +242,7 @@
     <message>
         <location filename="../src/cfiledialog.cpp" line="234"/>
         <source>DOCXF Document (*.docxf)</source>
-        <translation>Modèle de formulaire ONLYOFFIC (*.docxf)</translation>
+        <translation type="unfinished">Modèle de formulaire ONLYOFFICE (*.docxf)</translation>
     </message>
     <message>
         <location filename="../src/cfiledialog.cpp" line="236"/>
diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss
index baffeb0fe..7476863b9 100644
--- a/win-linux/package/windows/common.iss
+++ b/win-linux/package/windows/common.iss
@@ -133,7 +133,7 @@ Name: vi; MessagesFile: compiler:Languages\Vietnamese.islu; LicenseFile: {#sBran
 #else
 Name: vi; MessagesFile: compiler:Languages\Vietnamese.isl; LicenseFile: {#sBrandingFolder}\common\package\license\{#LIC_FILE}.rtf;
 #endif
-Name: zh_CN; MessagesFile: compiler:Languages\ChineseTraditional.isl;  LicenseFile: {#sBrandingFolder}\common\package\license\{#LIC_FILE}.rtf;
+Name: zh_CN; MessagesFile: compiler:Languages\ChineseSimplified.isl;  LicenseFile: {#sBrandingFolder}\common\package\license\{#LIC_FILE}.rtf;
 ;Name: hy_AM; MessagesFile: compiler:Languages\Armenian.islu;    LicenseFile: {#sBrandingFolder}\common\package\license\{#LIC_FILE}.rtf;
 ;Name: hr; MessagesFile: compiler:Languages\Croatian.isl;     LicenseFile: {#sBrandingFolder}\common\package\license\{#LIC_FILE}.rtf;
 Name: da; MessagesFile: compiler:Languages\Danish.isl;     LicenseFile: {#sBrandingFolder}\common\package\license\{#LIC_FILE}.rtf;
diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp
index 698e81e9f..40d5bc85d 100644
--- a/win-linux/src/cascapplicationmanagerwrapper.cpp
+++ b/win-linux/src/cascapplicationmanagerwrapper.cpp
@@ -808,6 +808,9 @@ void CAscApplicationManagerWrapper::handleInputCmd(const std::vector<wstring>& v
         }
 
         if (open_opts.srctype == etUndefined) {
+            if ( _app.m_private->bringEditorToFront(QString::fromStdWString(open_opts.wurl)) ) {
+                continue;
+            } else
             if ( CFileInspector::isLocalFile(QString::fromStdWString(open_opts.wurl)) ) {
                 open_opts.srctype = etLocalFile;
 #ifdef Q_OS_WIN