Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie

SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj

@@ -224,7 +224,9 @@
     </ClCompile>
     <ClCompile Include="Archive\CachedArchive.cpp" />
     <ClCompile Include="Archive\SplitFile.cpp" />
+    <ClCompile Include="Common\CheckableComboBox.cpp" />
     <ClCompile Include="Common\CheckableMessageBox.cpp" />
+    <ClCompile Include="Common\CodeEdit.cpp" />
     <ClCompile Include="Common\ComboInputDialog.cpp" />
     <ClCompile Include="Common\Common.cpp" />
     <ClCompile Include="Common\DebugHelpers.cpp" />
@@ -269,6 +271,8 @@
     <ClInclude Include="Archive\ArchiveUpdater.h" />
     <ClInclude Include="Archive\CachedArchive.h" />
     <QtMoc Include="Archive\SplitFile.h" />
+    <QtMoc Include="Common\CheckableComboBox.h" />
+    <QtMoc Include="Common\CodeEdit.h" />
     <ClInclude Include="Common\Common.h" />
     <ClInclude Include="Common\DebugHelpers.h" />
     <ClInclude Include="Common\ExitDialog.h" />

SandboxiePlus/MiscHelpers/MiscHelpers.vcxproj.filters

@@ -132,6 +132,12 @@
     <ClCompile Include="Archive\ArchiveFS.cpp">
       <Filter>Archive</Filter>
     </ClCompile>
+    <ClCompile Include="Common\CheckableComboBox.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="Common\CodeEdit.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="MiscHelpers.h">
@@ -276,5 +282,11 @@
     <QtMoc Include="Common\NeonEffect.h">
       <Filter>Common</Filter>
     </QtMoc>
+    <QtMoc Include="Common\CheckableComboBox.h">
+      <Filter>Common</Filter>
+    </QtMoc>
+    <QtMoc Include="Common\CodeEdit.h">
+      <Filter>Common</Filter>
+    </QtMoc>
   </ItemGroup>
 </Project>

SandboxiePlus/SandMan/SandMan.vcxproj

@@ -483,6 +483,7 @@
     <ClInclude Include="Engine\V4ScriptDebuggerApi.h" />
     <ClInclude Include="Helpers\FindTool.h" />
     <ClInclude Include="Helpers\FullScreen.h" />
+    <QtMoc Include="Helpers\IniHighlighter.h" />
     <ClInclude Include="Helpers\ReadDirectoryChanges.h" />
     <ClInclude Include="Helpers\ReadDirectoryChangesPrivate.h" />
     <ClInclude Include="Helpers\StorageInfo.h" />

SandboxiePlus/SandMan/SandMan.vcxproj.filters

@@ -240,6 +240,9 @@
     <ClCompile Include="Helpers\TabOrder.cpp">
       <Filter>Helpers</Filter>
     </ClCompile>
+    <ClCompile Include="Helpers\IniHighlighter.cpp">
+      <Filter>Helpers</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -397,6 +400,9 @@
     <QtMoc Include="Windows\ExtractDialog.h">
       <Filter>Windows</Filter>
     </QtMoc>
+    <QtMoc Include="Helpers\IniHighlighter.h">
+      <Filter>Helpers</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <QtRcc Include="Resources\SandMan.qrc">

SandboxiePlus/SandMan/sandman_nl.ts

@@ -6,58 +6,58 @@
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="26"/>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Formulier</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="96"/>
         <source>kilobytes</source>
-        <translation type="unfinished">kilobytes</translation>
+        <translation>kilobytes</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="157"/>
         <source>Protect Box Root from access by unsandboxed processes</source>
-        <translation type="unfinished"></translation>
+        <translation>Bescherm Box Root van toegang van andere processen</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="103"/>
         <location filename="Forms/BoxImageWindow.ui" line="134"/>
         <source>TextLabel</source>
-        <translation type="unfinished">Tekstlabel</translation>
+        <translation>Tekstlabel</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="187"/>
         <source>Show Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Toon wachtwoord</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="144"/>
         <source>Enter Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Huidig wachtwoord</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="70"/>
         <source>New Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuw wachtwoord</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="34"/>
         <source>Repeat Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuw wachtwoord (nogmaals)</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="174"/>
         <source>Disk Image Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Grootte op schijf</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="57"/>
         <source>Encryption Cipher</source>
-        <translation type="unfinished"></translation>
+        <translation>Encryptie cypher</translation>
     </message>
     <message>
         <location filename="Forms/BoxImageWindow.ui" line="83"/>
         <source>Lock the box when all processes stop.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vergrendel de Box als alle processen gestopt zijn</translation>
     </message>
 </context>
 <context>
@@ -2830,12 +2830,12 @@ Volledig pad: %4</translation>
     <message>
         <location filename="Windows/RecoveryWindow.cpp" line="246"/>
         <source>No Files selected!</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen bestanden geselecteerd!</translation>
     </message>
     <message>
         <location filename="Windows/RecoveryWindow.cpp" line="250"/>
         <source>Do you really want to delete %1 selected files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Weet je zeker dat je %1 geselecteerde bestanden wilt verwijderen?</translation>
     </message>
     <message>
         <location filename="Windows/RecoveryWindow.cpp" line="278"/>
@@ -2845,7 +2845,7 @@ Volledig pad: %4</translation>
     <message>
         <location filename="Windows/RecoveryWindow.cpp" line="279"/>
         <source>Close and Disable Immediate Recovery for this box</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluit en schakel direct herstel uit voor deze box</translation>
     </message>
     <message>
         <location filename="Windows/RecoveryWindow.cpp" line="299"/>
@@ -2855,7 +2855,7 @@ Volledig pad: %4</translation>
     <message>
         <location filename="Windows/RecoveryWindow.cpp" line="584"/>
         <source>Recovering File(s)...</source>
-        <translation type="unfinished"></translation>
+        <translation>Bezig met bestand(en) herstellen...</translation>
     </message>
     <message>
         <location filename="Windows/RecoveryWindow.cpp" line="590"/>

SandboxiePlus/SandMan/sandman_zh_CN.ts

@@ -1275,7 +1275,7 @@ You can use %USER% to save each users sandbox to an own fodler.</oldsource>
     <message>
         <location filename="OnlineUpdater.cpp" line="163"/>
         <source>%1</source>
-        <translation type="unfinished">%1</translation>
+        <translation>%1</translation>
     </message>
 </context>
 <context>
@@ -10663,7 +10663,7 @@ Unlike the preview channel, it does not include untested, potentially breaking,
         <location filename="Forms/SettingsWindow.ui" line="2519"/>
         <source>Issue message 1321 when a process has been forced into a sandbox</source>
         <oldsource>Issue message 1321 when a processes has been forced in to a sandbox</oldsource>
-        <translation type="unfinished">当进程被强制沙盒化时，提示问题代码 1321</translation>
+        <translation>当进程被强制沙盒化时，提示问题代码 1321</translation>
     </message>
     <message>
         <location filename="Forms/SettingsWindow.ui" line="2529"/>