0.9.3

2021-08-08 10:14:47 +02:00 · 2021-08-08 10:14:47 +02:00 · f35a246167
parent d1a2793017
commit f35a246167
24 changed files with 17523 additions and 14283 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,18 +3,39 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).


+
+## [0.9.3 / 5.51.3] - 2021-08-??
+
+
+### added
+- ability to us theh run unsandboxed option with sandboxie links [#614](https://github.com/sandboxie-plus/Sandboxie/issues/614)
+
+### Fixed
+- fixed open template does not load the edit tab [#1054](https://github.com/sandboxie-plus/Sandboxie/issues/1054)
+- fixed issue with explore sandboxed [#972](https://github.com/sandboxie-plus/Sandboxie/issues/972)
+- fixed start directory for sandboxed processes [#1071](https://github.com/sandboxie-plus/Sandboxie/issues/1071)
+- fixed issue with language auto detection [#1018](https://github.com/sandboxie-plus/Sandboxie/issues/1018)
+- fixed issue with multiple files with same name, by always showing the extension [#1041](https://github.com/sandboxie-plus/Sandboxie/issues/1041)
+- fixed multiple program grouping issues with the sandman ui [#1054](https://github.com/sandboxie-plus/Sandboxie/issues/1054)
+
+
+
 ## [0.9.2 / 5.51.2] - 2021-08-07

 ### Added
 - added ability to reconfigure the driver, which allows enabling/disabling WFP and other features without a reload/reboot

+### Changed
+- reorganized and improved the settings window
+- improved the tray icon a bit, the sand is now more yellow
+
 ### Fixed
 - fixed issue with process start handling introduced in 5.51.0 [#1063](https://github.com/sandboxie-plus/Sandboxie/issues/1063)
 - fixed issue with quick recovery introduced in 5.51.0
 - fixed incompatibility with CET Hardware-enforced Stack Protection on Intel 11th gen and AMD Ryzen 5XXX CPUs [#1067](https://github.com/sandboxie-plus/Sandboxie/issues/1067) [#1012](https://github.com/sandboxie-plus/Sandboxie/issues/1012)

 ### removed
- commented out all Windows XP-specific support code
+- commented out all Windows XP-specific support code from the driver



--- a/Sandboxie/apps/start/menu.cpp
+++ b/Sandboxie/apps/start/menu.cpp
@ -721,7 +721,7 @@ _FX void ScanFolder(MENU_DIR *menu, WCHAR *path, UCHAR source)

                    MENU_ITEM *menu_item;
                    wcscpy(path_end + 1, data.cFileName);
-                    *ptr = L'\0';
+                    //*ptr = L'\0';
                    menu_item = Insert_MENU_ITEM(
                                    menu, data.cFileName, path, source);
                    if (menu_item)
--- a/Sandboxie/apps/start/start.cpp
+++ b/Sandboxie/apps/start/start.cpp
@ -795,6 +795,19 @@ BOOL Parse_Command_Line(void)
        return FALSE;
    }

+    //
+    // if this is a link to start.exe with a box, extract the target command line
+    //
+
+    if (StrStrIW(cmd, L"\\start.exe") != 0) {
+        wchar_t* tmp = StrStrIW(cmd, L"/box:");
+        if (tmp) {
+            tmp = StrStrIW(tmp, L" ");
+            if (tmp)
+                cmd = tmp + 1;
+        }
+    }
+
    ChildCmdLine = (WCHAR *)MyHeapAlloc(10240 * sizeof(WCHAR));
    wcscpy(ChildCmdLine, cmd);

--- a/Sandboxie/common/my_version.h
+++ b/Sandboxie/common/my_version.h
@ -21,8 +21,8 @@
 #ifndef _MY_VERSION_H
 #define _MY_VERSION_H

-#define MY_VERSION_BINARY       5,51,2
-#define MY_VERSION_STRING       "5.51.2"
+#define MY_VERSION_BINARY       5,51,3
+#define MY_VERSION_STRING       "5.51.3"
 #define MY_VERSION_COMPAT		"5.51.0" // this refers to the driver ABI compatibility

 // These #defines are used by either Resource Compiler, or by NSIC installer
--- a/SandboxiePlus/QSbieAPI/SbieAPI.cpp
+++ b/SandboxiePlus/QSbieAPI/SbieAPI.cpp
@ -995,15 +995,21 @@ SB_STATUS CSbieAPI::RunStart(const QString& BoxName, const QString& Command, QPr
 		StartArgs += "/box:" + BoxName + " ";
 	else
 		StartArgs += "/disable_force ";
+
 	StartArgs += Command;

+	wchar_t sysPath[MAX_PATH];
+	GetSystemDirectoryW(sysPath, MAX_PATH);
+
 	if (pProcess) {
+		pProcess->setWorkingDirectory(QString::fromWCharArray(sysPath));
 		pProcess->setProgram(GetStartPath());
 		pProcess->setNativeArguments(StartArgs);
 		pProcess->start();
 	} 
 	else {
 		QProcess process;
+		process.setWorkingDirectory(QString::fromWCharArray(sysPath));
 		process.setProgram(GetStartPath());
 		process.setNativeArguments(StartArgs);
 		process.startDetached();
--- a/SandboxiePlus/SandMan/Forms/OptionsWindow.ui
+++ b/SandboxiePlus/SandMan/Forms/OptionsWindow.ui
@ -814,20 +814,6 @@
             </property>
            </widget>
           </item>
-           <item row="2" column="1">
-            <widget class="QPushButton" name="btnAddProg">
-             <property name="text">
-              <string>Add Program</string>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="1">
-            <widget class="QPushButton" name="btnDelProg">
-             <property name="text">
-              <string>Remove</string>
-             </property>
-            </widget>
-           </item>
           <item row="3" column="1">
            <spacer name="verticalSpacer_7">
             <property name="orientation">
@ -841,7 +827,7 @@
             </property>
            </spacer>
           </item>
-           <item row="1" column="0" rowspan="4">
+           <item row="1" column="0" rowspan="5">
            <widget class="QTreeWidget" name="treeGroups">
             <property name="sortingEnabled">
              <bool>true</bool>
@ -853,16 +839,37 @@
             </column>
            </widget>
           </item>
+           <item row="2" column="1">
+            <widget class="QPushButton" name="btnAddProg">
+             <property name="text">
+              <string>Add Program</string>
+             </property>
+            </widget>
+           </item>
           <item row="0" column="0" colspan="2">
            <widget class="QLabel" name="label_3">
             <property name="text">
-              <string>You can group programs together and give them a group name.  Program groups can be used with some of the settings instead of program names.</string>
+              <string>You can group programs together and give them a group name.  Program groups can be used with some of the settings instead of program names. Groups defined for the box overwrite groups defined in templates.</string>
             </property>
             <property name="wordWrap">
              <bool>true</bool>
             </property>
            </widget>
           </item>
+           <item row="5" column="1">
+            <widget class="QPushButton" name="btnDelProg">
+             <property name="text">
+              <string>Remove</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QCheckBox" name="chkShowGroupTmpl">
+             <property name="text">
+              <string>Show Templates</string>
+             </property>
+            </widget>
+           </item>
          </layout>
         </item>
        </layout>
--- a/SandboxiePlus/SandMan/SandMan.cpp
+++ b/SandboxiePlus/SandMan/SandMan.cpp
@ -574,13 +574,23 @@ void CSandMan::OnMessage(const QString& Message)
 	}
 	else if (Message.left(4) == "Run:")
 	{
+		QString BoxName = "DefaultBox";
 		QString CmdLine = Message.mid(4);

+		if (CmdLine.contains("\\start.exe", Qt::CaseInsensitive)) {
+			int pos = CmdLine.indexOf("/box:", 0, Qt::CaseInsensitive);
+			int pos2 = CmdLine.indexOf(" ", pos);
+			if (pos != -1 && pos2 != -1) {
+				BoxName = CmdLine.mid(pos + 5, pos2 - (pos + 5));
+				CmdLine = CmdLine.mid(pos2 + 1);
+			}
+		}
+
 		if (theConf->GetBool("Options/RunInDefaultBox", false) && (QGuiApplication::queryKeyboardModifiers() & Qt::ControlModifier) == 0) {
 			theAPI->RunStart("DefaultBox", CmdLine);
 		}
 		else
-			RunSandboxed(QStringList(CmdLine));
+			RunSandboxed(QStringList(CmdLine), BoxName);
 	}
 	else if (Message.left(3) == "Op:")
 	{
@ -636,9 +646,9 @@ void CSandMan::dragEnterEvent(QDragEnterEvent* e)
 	}
 }

-void CSandMan::RunSandboxed(const QStringList& Commands)
+void CSandMan::RunSandboxed(const QStringList& Commands, const QString& BoxName)
 {
-	CSelectBoxWindow* pSelectBoxWindow = new CSelectBoxWindow(Commands);
+	CSelectBoxWindow* pSelectBoxWindow = new CSelectBoxWindow(Commands, BoxName);
 	pSelectBoxWindow->show();
 }

@ -650,7 +660,7 @@ void CSandMan::dropEvent(QDropEvent* e)
 			Commands.append(url.toLocalFile().replace("/", "\\"));
 	}

-	RunSandboxed(Commands);
+	RunSandboxed(Commands, "DefaultBox");
 }

 void CSandMan::timerEvent(QTimerEvent* pEvent)
@ -1778,7 +1788,7 @@ void CSandMan::OpenUrl(const QUrl& url)
 		if(bCheck) theConf->SetValue("Options/OpenUrlsSandboxed", iSandboxed);
 	}

-	if (iSandboxed) RunSandboxed(QStringList(url.toString()));
+	if (iSandboxed) RunSandboxed(QStringList(url.toString()), "DefaultBox");
 	else ShellExecute(MainWndHandle, NULL, url.toString().toStdWString().c_str(), NULL, NULL, SW_SHOWNORMAL);
 }

@ -2135,7 +2145,7 @@ void CSandMan::LoadLanguage()
 		m_LanguageId = LocaleNameToLCID(Lang.toStdWString().c_str(), 0);

 		QString LangAux = Lang; // Short version as fallback
-		LangAux.truncate(LangAux.lastIndexOf('-'));
+		LangAux.truncate(LangAux.lastIndexOf('_'));

 		QString LangPath = QApplication::applicationDirPath() + "/translations/sandman_";
 		bool bAux = false;
--- a/SandboxiePlus/SandMan/SandMan.h
+++ b/SandboxiePlus/SandMan/SandMan.h
@ -50,7 +50,7 @@ public:

 	CSbieView*			GetBoxView() { return m_pBoxView; }

-	void				RunSandboxed(const QStringList& Commands);
+	void				RunSandboxed(const QStringList& Commands, const QString& BoxName);

 	QIcon				GetBoxIcon(bool inUse, int boxType = 0);

--- a/SandboxiePlus/SandMan/Windows/OptionsGrouping.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsGrouping.cpp
@ -14,35 +14,12 @@ void COptionsWindow::LoadGroups()
 	m_TemplateGroups.clear();
 	ui.treeGroups->clear();

-	QMultiMap<QString, QStringList> GroupMap; // if we have a duplicate we want to know it
-	QSet<QString> LocalGroups;
-
 	QStringList ProcessGroups = m_pBox->GetTextList("ProcessGroup", m_Template);
 	foreach(const QString& Group, ProcessGroups)
 	{
 		QStringList Entries = Group.split(",");
 		QString GroupName = Entries.takeFirst();
-		GroupMap.insertMulti(GroupName, Entries);
-		LocalGroups.insert(GroupName);
-	}

-	foreach(const QString& Template, m_pBox->GetTemplates())
-	{
-		foreach(const QString& Group, m_pBox->GetTextListTmpl("ProcessGroup", Template))
-		{
-			m_TemplateGroups.insert(Group);
-			QStringList Entries = Group.split(",");
-			QString GroupName = Entries.takeFirst();
-			if (LocalGroups.contains(GroupName))
-				continue; // local group definitions overwrite template once
-			GroupMap.insertMulti(GroupName, Entries);
-		}
-	}
-
-	for(QMultiMap<QString, QStringList>::iterator I = GroupMap.begin(); I != GroupMap.end(); ++I)
-	{
-		QString GroupName = I.key();
-		QStringList Entries = I.value();
 		QTreeWidgetItem* pItem = new QTreeWidgetItem();
 		pItem->setData(0, Qt::UserRole, GroupName);
 		if (GroupName.length() > 2)
@ -58,11 +35,61 @@ void COptionsWindow::LoadGroups()
 		}
 		ui.treeGroups->addTopLevelItem(pItem);
 	}
+	
+	LoadGroupsTmpl();
+
 	ui.treeGroups->expandAll();

 	m_GroupsChanged = false;
 }

+void COptionsWindow::LoadGroupsTmpl(bool bUpdate)
+{
+	if (ui.chkShowGroupTmpl->isChecked())
+	{
+		foreach(const QString& Template, m_pBox->GetTemplates())
+		{
+			foreach(const QString& Group, m_pBox->GetTextListTmpl("ProcessGroup", Template))
+			{
+				m_TemplateGroups.insert(Group);
+				QStringList Entries = Group.split(",");
+				QString GroupName = Entries.takeFirst();
+				
+
+				QTreeWidgetItem* pItem = new QTreeWidgetItem();
+				if (GroupName.length() > 2)
+					GroupName = GroupName.mid(1, GroupName.length() - 2);
+				pItem->setText(0, GroupName + " (" + Template + ")");
+				for (int i = 0; i < Entries.count(); i++) 
+				{
+					if (Entries[i].isEmpty())
+						continue;
+					QTreeWidgetItem* pSubItem = new QTreeWidgetItem();
+					SetProgramItem(Entries[i], pSubItem, 0);
+					pItem->addChild(pSubItem);
+				}
+				ui.treeGroups->addTopLevelItem(pItem);
+			}
+		}
+
+		if (bUpdate)
+			ui.treeGroups->expandAll();
+	}
+	else if (bUpdate)
+	{
+		for (int i = 0; i < ui.treeGroups->topLevelItemCount(); )
+		{
+			QTreeWidgetItem* pItem = ui.treeGroups->topLevelItem(i);
+			QString GroupName = pItem->data(0, Qt::UserRole).toString();
+			if (GroupName.isEmpty()) {
+				delete pItem;
+				continue; // entry from template
+			}
+			i++;
+		}
+	}
+}
+
 void COptionsWindow::SaveGroups()
 {
 	QStringList ProcessGroups;
@ -70,6 +97,8 @@ void COptionsWindow::SaveGroups()
 	{
 		QTreeWidgetItem* pItem = ui.treeGroups->topLevelItem(i);
 		QString GroupName = pItem->data(0, Qt::UserRole).toString();
+		if (GroupName.isEmpty())
+			continue; // this is a template entry, dont save
 		QStringList Programs;
 		for (int j = 0; j < pItem->childCount(); j++)
 			Programs.append(pItem->child(j)->data(0, Qt::UserRole).toString());
@ -237,6 +266,11 @@ void COptionsWindow::OnAddProg()
 		return;
 	}

+	if (pItem->data(0, Qt::UserRole).toString().isEmpty()) {
+		QMessageBox::warning(this, "SandboxiePlus", tr("Template values can not be edited."));
+		return;
+	}
+
 	QString Value = SelectProgram();
 	if (Value.isEmpty())
 		return;
@ -254,6 +288,11 @@ void COptionsWindow::OnDelProg()
 	if (!pItem)
 		return;

+	if ((pItem->parent() ? pItem->parent() : pItem)->data(0, Qt::UserRole).toString().isEmpty()) {
+		QMessageBox::warning(this, "SandboxiePlus", tr("Template values can not be edited."));
+		return;
+	}
+
 	delete pItem;

 	m_GroupsChanged = true;
--- a/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/OptionsWindow.cpp
@ -77,6 +77,8 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
 	}

 	ui.tabs->setCurrentIndex(m_Template ? 10 : 0);
+	if(m_Template)
+		OnTab();

 	//connect(ui.chkWithTemplates, SIGNAL(clicked(bool)), this, SLOT(OnWithTemplates()));

@ -88,6 +90,7 @@ COptionsWindow::COptionsWindow(const QSharedPointer<CSbieIni>& pBox, const QStri
 	connect(ui.btnAddGroup, SIGNAL(clicked(bool)), this, SLOT(OnAddGroup()));
 	connect(ui.btnAddProg, SIGNAL(clicked(bool)), this, SLOT(OnAddProg()));
 	connect(ui.btnDelProg, SIGNAL(clicked(bool)), this, SLOT(OnDelProg()));
+	connect(ui.chkShowGroupTmpl, SIGNAL(clicked(bool)), this, SLOT(OnShowGroupTmpl()));
 	//

 	// Force
--- a/SandboxiePlus/SandMan/Windows/OptionsWindow.h
+++ b/SandboxiePlus/SandMan/Windows/OptionsWindow.h
@ -41,6 +41,7 @@ private slots:
 	void OnAddGroup();
 	void OnAddProg();
 	void OnDelProg();
+	void OnShowGroupTmpl()			{ LoadGroupsTmpl(true); }

 	void OnForceProg();
 	void OnForceDir();
@ -224,6 +225,7 @@ protected:
 	void SaveGeneral();

 	void LoadGroups();
+	void LoadGroupsTmpl(bool bUpdate = false);
 	void SaveGroups();

 	void LoadForced();
--- a/SandboxiePlus/SandMan/main.cpp
+++ b/SandboxiePlus/SandMan/main.cpp
@ -34,7 +34,7 @@ int main(int argc, char *argv[])
 	QString PendingMessage;

 	QStringList Args = QCoreApplication::arguments();
-	int CmdPos = Args.indexOf("-op");
+	int CmdPos = Args.indexOf("-op", Qt::CaseInsensitive);
 	if (CmdPos != -1) {
 		QString Op;
 		if (Args.count() > CmdPos)
@ -42,12 +42,15 @@ int main(int argc, char *argv[])
 		PendingMessage = "Op:" + Op;
 	}

-	CmdPos = Args.indexOf("/box:__ask__");
+	CmdPos = Args.indexOf("/box:__ask__", Qt::CaseInsensitive);
 	if (CmdPos != -1) {
-		QString CommandLine;
-		for (int i = CmdPos + 1; i < Args.count(); i++)
-			CommandLine += "\"" + Args[i] + "\" ";
-		PendingMessage = "Run:" + CommandLine.trimmed();
+		// Note: a escaped command ending with \" will fail and unescape "
+		//QString CommandLine;
+		//for (int i = CmdPos + 1; i < Args.count(); i++)
+		//	CommandLine += "\"" + Args[i] + "\" ";
+		//PendingMessage = "Run:" + CommandLine.trimmed();
+		LPWSTR ChildCmdLine = wcsstr(GetCommandLineW(), L"/box:__ask__") + 13;
+		PendingMessage = "Run:" + QString::fromWCharArray(ChildCmdLine);
 	}

 	if (!PendingMessage.isEmpty()) {
--- a/SandboxiePlus/SandMan/sandman_de.ts
+++ b/SandboxiePlus/SandMan/sandman_de.ts
--- a/SandboxiePlus/SandMan/sandman_en.ts
+++ b/SandboxiePlus/SandMan/sandman_en.ts
--- a/SandboxiePlus/SandMan/sandman_es.ts
+++ b/SandboxiePlus/SandMan/sandman_es.ts
--- a/SandboxiePlus/SandMan/sandman_it.ts
+++ b/SandboxiePlus/SandMan/sandman_it.ts
--- a/SandboxiePlus/SandMan/sandman_nl.ts
+++ b/SandboxiePlus/SandMan/sandman_nl.ts
--- a/SandboxiePlus/SandMan/sandman_pl.ts
+++ b/SandboxiePlus/SandMan/sandman_pl.ts
--- a/SandboxiePlus/SandMan/sandman_pt.ts
+++ b/SandboxiePlus/SandMan/sandman_pt.ts
--- a/SandboxiePlus/SandMan/sandman_ru.ts
+++ b/SandboxiePlus/SandMan/sandman_ru.ts
@ -322,6 +322,50 @@
        <source>Do you really want to delete the selected local template?</source>
        <translation>Вы действительно хотите удалить выбранный локальный шаблон?</translation>
    </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UDP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ICMP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block using Windows Filtering Platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block by denying access to Network devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block (WFP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block (NDev)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CPopUpMessage</name>
@ -636,7 +680,7 @@ Full path: %4</source>
    </message>
    <message>
        <source>Driver version: %1</source>
-        <translation>Версия драйвера: %1</translation>
+        <translation type="vanished">Версия драйвера: %1</translation>
    </message>
    <message>
        <source>Sandboxie-Plus v%1</source>
@ -1062,7 +1106,7 @@ Full path: %4</source>
    </message>
    <message>
        <source>Sandboxie-Plus was started in portable mode, do you want to put the SandBox folder into its parent directory?</source>
-        <translation>Sandboxie-Plus был запущен в портативном режиме, вы хотите поместить папку SandBox в ее родительский каталог?</translation>
+        <translation type="vanished">Sandboxie-Plus был запущен в портативном режиме, вы хотите поместить папку SandBox в ее родительский каталог?</translation>
    </message>
    <message>
        <source>The file %1 already exists, do you want to overwrite it?</source>
@ -1110,7 +1154,7 @@ Full path: %4</source>
    </message>
    <message>
        <source>Select box:</source>
-        <translation>Выберите песочницу:</translation>
+        <translation type="vanished">Выберите песочницу:</translation>
    </message>
    <message>
        <source>Some compatibility templates (%1) are missing, probably deleted, do you want to remove them from all boxes?</source>
@ -1177,10 +1221,34 @@ Do you want to do the clean up?</source>
 <byte value="xd"/>

 Do you want to do the clean up?</source>
-        <translation>Sandboxie-Plus работала в портативном режиме, теперь ей нужно очистить созданные службы. Это вызовет запрос на получение административных привилегий.
+        <translation type="vanished">Sandboxie-Plus работала в портативном режиме, теперь ей нужно очистить созданные службы. Это вызовет запрос на получение административных привилегий.

 Вы хотите выполнить очистку?</translation>
    </message>
+    <message>
+        <source>Sandboxie-Plus was running in portable mode, now it has to clean up the created services. This will prompt for administrative privileges.<byte value="xd"/>
+<byte value="xd"/>
+Do you want to do the clean up?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown operation &apos;%1&apos; requested via command line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sandboxie-Plus was started in portable mode, do you want to put the Sandbox folder into its parent directory?<byte value="xd"/>
+Yes will choose: %1<byte value="xd"/>
+No will choose: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CAUTION: Another agent (probably SbieCtrl.exe) is already managing this Sandboxie session, please close it first and reconnect to take over.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The config password must not be longer than 64 characters</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CSbieModel</name>
@ -1237,7 +1305,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Sbie WuAu Svc</source>
-        <translation>Sbie WuAu Svc</translation>
+        <translation type="vanished">Sbie WuAu Svc</translation>
    </message>
    <message>
        <source>Sbie BITS</source>
@ -1360,6 +1428,10 @@ Do you want to do the clean up?</source>
        <source>Firefox Plugin Container</source>
        <translation>Firefox контейнер плагина</translation>
    </message>
+    <message>
+        <source>Sbie WuauServ</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CSbieView</name>
@ -1383,7 +1455,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run eMail Client</source>
-        <translation>Запустить почтовый клиент</translation>
+        <translation type="vanished">Запустить почтовый клиент</translation>
    </message>
    <message>
        <source>Remove Group</source>
@ -1489,7 +1561,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run Web Browser</source>
-        <translation>Запустить веб-браузер</translation>
+        <translation type="vanished">Запустить веб-браузер</translation>
    </message>
    <message>
        <source>Allow Network Shares</source>
@ -1497,7 +1569,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run Cmd.exe</source>
-        <translation>Запустить Cmd.exe</translation>
+        <translation type="vanished">Запустить Cmd.exe</translation>
    </message>
    <message>
        <source>Snapshots Manager</source>
@ -1505,7 +1577,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run Explorer</source>
-        <translation>Запустите проводник</translation>
+        <translation type="vanished">Запустите проводник</translation>
    </message>
    <message>
        <source>Block Internet Access</source>
@ -1582,7 +1654,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run Cmd.exe as Admin</source>
-        <translation>Запуск Cmd.exe от имени администратора</translation>
+        <translation type="vanished">Запуск Cmd.exe от имени администратора</translation>
    </message>
    <message>
        <source>Ask for UAC Elevation</source>
@ -1596,6 +1668,53 @@ Do you want to do the clean up?</source>
        <source>Do you want to %1 the selected process(es)?</source>
        <translation>Вы хотите %1 выбранных процессов?</translation>
    </message>
+    <message>
+        <source>Default Web Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default eMail Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Windows Explorer</source>
+        <translation type="unfinished">Проводник</translation>
+    </message>
+    <message>
+        <source>Registry Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Programs and Features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal (as Admin)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal (32-bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CSelectBoxWindow</name>
+    <message>
+        <source>Sandboxie-Plus - Run Sandboxed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to run the program outside the sandbox?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select a sandbox.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CSettingsWindow</name>
@ -1647,6 +1766,14 @@ Do you want to do the clean up?</source>
        <source>Auto Detection</source>
        <translation>Автоопределение</translation>
    </message>
+    <message>
+        <source>Thank you for supporting the developement of Sandboxie-Plus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This support certificate is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CSnapshotsWindow</name>
@ -1738,7 +1865,11 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Show only sellectes box</source>
-        <translation>Показать только выбранную песочницу</translation>
+        <translation type="vanished">Показать только выбранную песочницу</translation>
+    </message>
+    <message>
+        <source>Filter selected box only</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
@ -1924,7 +2055,7 @@ If leader processes are defined, all others are treated as lingering processes.<
    </message>
    <message>
        <source>Block internet access for all programs except those added to the list.</source>
-        <translation>Заблокировать доступ в Интернет для всех программ, кроме добавленных в список.</translation>
+        <translation type="vanished">Заблокировать доступ в Интернет для всех программ, кроме добавленных в список.</translation>
    </message>
    <message>
        <source>Issue message 1307 when a program is denied internet access</source>
@ -2036,15 +2167,15 @@ If leader processes are defined, all others are treated as lingering processes.<
    </message>
    <message>
        <source>Sandbox protection</source>
-        <translation>Защита песочницы</translation>
+        <translation type="vanished">Защита песочницы</translation>
    </message>
    <message>
        <source>You can group programs together and give them a group name.  Program groups can be used with some of the settings instead of program names.</source>
-        <translation>Вы можете сгруппировать программы вместе и дать им название группы. Группы программ могут использоваться с некоторыми настройками вместо имен программ.</translation>
+        <translation type="vanished">Вы можете сгруппировать программы вместе и дать им название группы. Группы программ могут использоваться с некоторыми настройками вместо имен программ.</translation>
    </message>
    <message>
        <source>Protect sandboxed SYSTEM processes from unprivileged unsandboxed processes</source>
-        <translation>Защитить системные процессы в песочнице от непривилегированных процессов вне песочницы</translation>
+        <translation type="vanished">Защитить системные процессы в песочнице от непривилегированных процессов вне песочницы</translation>
    </message>
    <message>
        <source>Add Command</source>
@ -2126,7 +2257,7 @@ instead of &quot;*&quot;.</source>
    </message>
    <message>
        <source>Add sandboxed processes to job objects (recommended)</source>
-        <translation>Добавить изолированные процессы к объектам задания (рекомендуется)</translation>
+        <translation type="vanished">Добавить изолированные процессы к объектам задания (рекомендуется)</translation>
    </message>
    <message>
        <source>Remove Program</source>
@ -2239,7 +2370,7 @@ Note:  Forced Programs and Force Folders settings for a sandbox do not apply to
    </message>
    <message>
        <source>&lt;- for this one the above does not apply</source>
-        <translation>&lt;- для этого то что выше не применяется</translation>
+        <translation type="vanished">&lt;- для этого то что выше не применяется</translation>
    </message>
    <message>
        <source>Block access to the printer spooler</source>
@ -2303,7 +2434,7 @@ Note:  Forced Programs and Force Folders settings for a sandbox do not apply to
    </message>
    <message>
        <source>Security note: Elevated applications running under the supervision of Sandboxie, with an admin token, have more opportunities to bypass isolation and modify the system outside the sandbox.</source>
-        <translation>Примечание по безопасности: приложения с повышенными правами, работающие под контролем Sandboxie, с токеном администратора, имеют больше возможностей для обхода изоляции и изменения системы за пределами песочницы.</translation>
+        <translation type="vanished">Примечание по безопасности: приложения с повышенными правами, работающие под контролем Sandboxie, с токеном администратора, имеют больше возможностей для обхода изоляции и изменения системы за пределами песочницы.</translation>
    </message>
    <message>
        <source>Raw Disk access</source>
@ -2319,7 +2450,7 @@ Note:  Forced Programs and Force Folders settings for a sandbox do not apply to
    </message>
    <message>
        <source>Access Options</source>
-        <translation>Опции доступа</translation>
+        <translation type="vanished">Опции доступа</translation>
    </message>
    <message>
        <source>Other restrictions</source>
@ -2371,7 +2502,7 @@ For files access you can use &apos;Direct All&apos; instead to make it apply to
    </message>
    <message>
        <source>Allow sandboxed programs to Change User Passwords and alike</source>
-        <translation>Разрешить изолированным программам изменять пароли пользователей и тому подобное</translation>
+        <translation type="vanished">Разрешить изолированным программам изменять пароли пользователей и тому подобное</translation>
    </message>
    <message>
        <source>Various advanced isolation features can break compatibility, with some applications, if you are using this sandbox &lt;b&gt;NOT for Security&lt;/b&gt; but for simple application portability by changing these options you can restore compatibility by sacrificing some security.&lt;br&gt;These options can be used securely when you don&apos;t grant any of the sandboxed process admin rights.</source>
@ -2379,7 +2510,7 @@ For files access you can use &apos;Direct All&apos; instead to make it apply to
    </message>
    <message>
        <source>Allow sandboxed programs to Managing Hardware/Devices</source>
-        <translation>Разрешить изолированным программам управлять оборудованием и устройствами</translation>
+        <translation type="vanished">Разрешить изолированным программам управлять оборудованием и устройствами</translation>
    </message>
    <message>
        <source>Open access to windows Security Account Manager</source>
@ -2387,7 +2518,7 @@ For files access you can use &apos;Direct All&apos; instead to make it apply to
    </message>
    <message>
        <source>Open access to windows Local Security Authority</source>
-        <translation>Открытый доступ к Windows Local Security Authority</translation>
+        <translation type="vanished">Открытый доступ к Windows Local Security Authority</translation>
    </message>
    <message>
        <source>Access isolation</source>
@ -2457,6 +2588,106 @@ Please note that this values are currently user specific and saved globally for
        <source>Resource Access Monitor</source>
        <translation>Монитор доступа к ресурсам</translation>
    </message>
+    <message>
+        <source>Show this box in the &apos;run in box&apos; selection prompt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Security note: Elevated applications running under the supervision of Sandboxie, with an admin or system token, have more opportunities to bypass isolation and modify the system outside the sandbox.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow MSIServer to run with a sandboxed system token and apply other exceptions if required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: Msi Installer Exemptions should not be required, but if you encounter issues installing a msi package which you trust, this option may help the installation complete successfully. You can also try disabling drop admin rights.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Access Restrictions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You can group programs together and give them a group name.  Program groups can be used with some of the settings instead of program names. Groups defined for the box overwrite groups defined in templates.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Process Restrictions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set network/internet access for unlisted processes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Restrictions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test Rules, Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protocol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CAUTION: Windows Filtering Platform is not enabled with the driver, therefore these rules will be applied only in user mode and can not be enforced!!! This means that malicious applications may bypass them.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow use of nested job objects (experimental, works on Windows 8 and later)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow sandboxed programs to managing Hardware/Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open access to Windows Local Security Authority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Firewall</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PopUpWindow</name>
@ -2534,6 +2765,29 @@ Please note that this values are currently user specific and saved globally for
        <translation>SandboxiePlus - Восстановление</translation>
    </message>
 </context>
+<context>
+    <name>SelectBoxWindow</name>
+    <message>
+        <source>SandboxiePlus select box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the sandbox in which to start the program, installer or document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run As UAC Administrator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Sandboxed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Outside the Sandbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>SettingsWindow</name>
    <message>
@ -2566,11 +2820,11 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>General Options</source>
-        <translation>Общие настройки</translation>
+        <translation type="vanished">Общие настройки</translation>
    </message>
    <message>
        <source>Program Restrictions</source>
-        <translation>Ограничения программы</translation>
+        <translation type="vanished">Ограничения программы</translation>
    </message>
    <message>
        <source>Restart required (!)</source>
@ -2578,7 +2832,7 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>Tray options</source>
-        <translation>Опции лотка</translation>
+        <translation type="vanished">Опции лотка</translation>
    </message>
    <message>
        <source>Enable</source>
@ -2630,7 +2884,7 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>Software Compatibility</source>
-        <translation>Совместимость программного обеспечения</translation>
+        <translation type="vanished">Совместимость программного обеспечения</translation>
    </message>
    <message>
        <source>On main window close:</source>
@ -2654,7 +2908,7 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>Advanced Options</source>
-        <translation>Расширенные настройки</translation>
+        <translation type="vanished">Расширенные настройки</translation>
    </message>
    <message>
        <source>Prevent the listed programs from starting on this system</source>
@ -2706,12 +2960,92 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>Other settings</source>
-        <translation>Другие настройки</translation>
+        <translation type="vanished">Другие настройки</translation>
    </message>
    <message>
        <source>Use Dark Theme (fully applied after a restart)</source>
        <translation>Использовать темную тему (полностью применяется после перезапуска)</translation>
    </message>
+    <message>
+        <source>General Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hotkey for terminating all boxed processes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Systray options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI Language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shell Integration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Sandboxed - Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always use DefaultBox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Sandbox Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sandboxing features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Windows Filtering Platform to restrict network access (experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Program Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Protection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compatibility</source>
+        <translation type="unfinished">Совместимость</translation>
+    </message>
+    <message>
+        <source>Support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install updates automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keeping Sandboxie up to date with the rolling releases of Windows and compatible with all web browsers is a never-ending endeavor. Please consider supporting this work with a donation.&lt;br /&gt;You can support the development with a &lt;a href=&quot;https://sandboxie-plus.com/go.php?to=donate&quot;&gt;PayPal donation&lt;/a&gt;, working also with credit cards.&lt;br /&gt;Or you can provide continuous support with a &lt;a href=&quot;https://sandboxie-plus.com/go.php?to=patreon&quot;&gt;Patreon subscription&lt;/a&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the support certificate here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Support Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Supporters of the Sandboxie-Plus project receive a &lt;a href=&quot;https://sandboxie-plus.com/go.php?to=certificate&quot;&gt;supporter certificate&lt;/a&gt;. It&apos;s like a license key but for awesome people using free software. :-)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>SnapshotsWindow</name>
--- a/SandboxiePlus/SandMan/sandman_tr.ts
+++ b/SandboxiePlus/SandMan/sandman_tr.ts
@ -322,6 +322,50 @@
        <source>Do you really want to delete the selected local template?</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>TCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UDP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ICMP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block using Windows Filtering Platform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block by denying access to Network devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block (WFP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block (NDev)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Block</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CPopUpMessage</name>
@ -659,7 +703,7 @@ Full path: %4</source>
    </message>
    <message>
        <source>Driver version: %1</source>
-        <translation>Sürücü sürümü: %1</translation>
+        <translation type="vanished">Sürücü sürümü: %1</translation>
    </message>
    <message>
        <source>Sandboxie-Plus v%1</source>
@ -1097,7 +1141,7 @@ Full path: %4</source>
    </message>
    <message>
        <source>Sandboxie-Plus was started in portable mode, do you want to put the SandBox folder into its parent directory?</source>
-        <translation>Sandboxie-Plus taşınabilir modda başlatıldı, SandBox klasörünü kendi ana dizinine koymak ister misiniz?</translation>
+        <translation type="vanished">Sandboxie-Plus taşınabilir modda başlatıldı, SandBox klasörünü kendi ana dizinine koymak ister misiniz?</translation>
    </message>
    <message>
        <source>The file %1 already exists, do you want to overwrite it?</source>
@ -1145,7 +1189,7 @@ Full path: %4</source>
    </message>
    <message>
        <source>Select box:</source>
-        <translation>Kutu seç:</translation>
+        <translation type="vanished">Kutu seç:</translation>
    </message>
    <message>
        <source>Some compatibility templates (%1) are missing, probably deleted, do you want to remove them from all boxes?</source>
@ -1205,6 +1249,24 @@ Full path: %4</source>
 Do you want to do the clean up?</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Unknown operation &apos;%1&apos; requested via command line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sandboxie-Plus was started in portable mode, do you want to put the Sandbox folder into its parent directory?<byte value="xd"/>
+Yes will choose: %1<byte value="xd"/>
+No will choose: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CAUTION: Another agent (probably SbieCtrl.exe) is already managing this Sandboxie session, please close it first and reconnect to take over.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The config password must not be longer than 64 characters</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CSbieModel</name>
@ -1259,10 +1321,6 @@ Do you want to do the clean up?</source>
        <source>Sbie Crypto</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Sbie WuAu Svc</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Sbie BITS</source>
        <translation type="unfinished"></translation>
@ -1368,6 +1426,10 @@ Do you want to do the clean up?</source>
        <source>Firefox Plugin Container</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Sbie WuauServ</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CSbieView</name>
@ -1391,7 +1453,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run eMail Client</source>
-        <translation>ePosta istemcisini çalıştır</translation>
+        <translation type="vanished">ePosta istemcisini çalıştır</translation>
    </message>
    <message>
        <source>Remove Group</source>
@ -1501,7 +1563,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run Web Browser</source>
-        <translation>Web Tarayıcı Çalıştır</translation>
+        <translation type="vanished">Web Tarayıcı Çalıştır</translation>
    </message>
    <message>
        <source>Allow Network Shares</source>
@ -1509,7 +1571,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run Cmd.exe</source>
-        <translation>Cmd.exe&apos;yi çalıştır</translation>
+        <translation type="vanished">Cmd.exe&apos;yi çalıştır</translation>
    </message>
    <message>
        <source>Snapshots Manager</source>
@ -1517,7 +1579,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run Explorer</source>
-        <translation>Dosya Gezginini Çalıştır</translation>
+        <translation type="vanished">Dosya Gezginini Çalıştır</translation>
    </message>
    <message>
        <source>Block Internet Access</source>
@ -1594,7 +1656,7 @@ Do you want to do the clean up?</source>
    </message>
    <message>
        <source>Run Cmd.exe as Admin</source>
-        <translation>Cmd.exe yi yönetici olarak çalıştır</translation>
+        <translation type="vanished">Cmd.exe yi yönetici olarak çalıştır</translation>
    </message>
    <message>
        <source>Ask for UAC Elevation</source>
@ -1608,6 +1670,53 @@ Do you want to do the clean up?</source>
        <source>Do you want to %1 the selected process(es)?</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Default Web Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default eMail Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Windows Explorer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Registry Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Programs and Features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal (as Admin)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal (32-bit)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CSelectBoxWindow</name>
+    <message>
+        <source>Sandboxie-Plus - Run Sandboxed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to run the program outside the sandbox?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select a sandbox.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CSettingsWindow</name>
@ -1659,6 +1768,14 @@ Do you want to do the clean up?</source>
        <source>Auto Detection</source>
        <translation>Otomatik Algıla</translation>
    </message>
+    <message>
+        <source>Thank you for supporting the developement of Sandboxie-Plus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This support certificate is not valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CSnapshotsWindow</name>
@ -1749,7 +1866,7 @@ Do you want to do the clean up?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Show only sellectes box</source>
+        <source>Filter selected box only</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
@ -1950,7 +2067,7 @@ If leader processes are defined, all others are treated as lingering processes.<
    </message>
    <message>
        <source>Block internet access for all programs except those added to the list.</source>
-        <translation>Listeye eklenenler dışındaki tüm programlar için internet erişimini engelle.</translation>
+        <translation type="vanished">Listeye eklenenler dışındaki tüm programlar için internet erişimini engelle.</translation>
    </message>
    <message>
        <source>Issue message 1307 when a program is denied internet access</source>
@ -2062,15 +2179,15 @@ If leader processes are defined, all others are treated as lingering processes.<
    </message>
    <message>
        <source>Sandbox protection</source>
-        <translation>KumKutusu koruması</translation>
+        <translation type="vanished">KumKutusu koruması</translation>
    </message>
    <message>
        <source>You can group programs together and give them a group name.  Program groups can be used with some of the settings instead of program names.</source>
-        <translation>Programları birlikte gruplayabilir ve onlara bir grup adı verebilirsiniz. Program grupları, program adları yerine bazı ayarlarla kullanılabilir.</translation>
+        <translation type="vanished">Programları birlikte gruplayabilir ve onlara bir grup adı verebilirsiniz. Program grupları, program adları yerine bazı ayarlarla kullanılabilir.</translation>
    </message>
    <message>
        <source>Protect sandboxed SYSTEM processes from unprivileged unsandboxed processes</source>
-        <translation>Korumalı kutuya alınmış SİSTEM işlemlerini ayrıcalıksız korumalı kutuda olmayan işlemlerden koruyun</translation>
+        <translation type="vanished">Korumalı kutuya alınmış SİSTEM işlemlerini ayrıcalıksız korumalı kutuda olmayan işlemlerden koruyun</translation>
    </message>
    <message>
        <source>Add Command</source>
@ -2152,7 +2269,7 @@ Bu seçenekler olay maskesini &quot;*&quot; olarak ayarlar - Tüm erişim olayla
    </message>
    <message>
        <source>Add sandboxed processes to job objects (recommended)</source>
-        <translation>İş nesnelerine KumKutu&apos;lu (korumalı kutu) süreçler ekle (önerilir)</translation>
+        <translation type="vanished">İş nesnelerine KumKutu&apos;lu (korumalı kutu) süreçler ekle (önerilir)</translation>
    </message>
    <message>
        <source>Remove Program</source>
@ -2265,7 +2382,7 @@ Not: Bir korumalı kutuya ilişkin Zorlanmış Programlar ve Zorlanmış Dizinle
    </message>
    <message>
        <source>&lt;- for this one the above does not apply</source>
-        <translation>&lt;- yukarıdakiler bunun için geçerli değildir</translation>
+        <translation type="vanished">&lt;- yukarıdakiler bunun için geçerli değildir</translation>
    </message>
    <message>
        <source>Block access to the printer spooler</source>
@ -2347,10 +2464,6 @@ Not: Bir korumalı kutuya ilişkin Zorlanmış Programlar ve Zorlanmış Dizinle
        <source>(Recommended)</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Security note: Elevated applications running under the supervision of Sandboxie, with an admin token, have more opportunities to bypass isolation and modify the system outside the sandbox.</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Raw Disk access</source>
        <translation type="unfinished"></translation>
@ -2363,10 +2476,6 @@ Not: Bir korumalı kutuya ilişkin Zorlanmış Programlar ve Zorlanmış Dizinle
        <source>Warn when an application opens a harddrive handle</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Access Options</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Other restrictions</source>
        <translation type="unfinished"></translation>
@ -2413,22 +2522,10 @@ For files access you can use &apos;Direct All&apos; instead to make it apply to
        <source>Isolation</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Allow sandboxed programs to Change User Passwords and alike</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Various advanced isolation features can break compatibility, with some applications, if you are using this sandbox &lt;b&gt;NOT for Security&lt;/b&gt; but for simple application portability by changing these options you can restore compatibility by sacrificing some security.&lt;br&gt;These options can be used securely when you don&apos;t grant any of the sandboxed process admin rights.</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Allow sandboxed programs to Managing Hardware/Devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open access to windows Local Security Authority</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Access isolation</source>
        <translation type="unfinished"></translation>
@ -2495,6 +2592,106 @@ Please note that this values are currently user specific and saved globally for
        <source>Resource Access Monitor</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Show this box in the &apos;run in box&apos; selection prompt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Security note: Elevated applications running under the supervision of Sandboxie, with an admin or system token, have more opportunities to bypass isolation and modify the system outside the sandbox.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow MSIServer to run with a sandboxed system token and apply other exceptions if required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note: Msi Installer Exemptions should not be required, but if you encounter issues installing a msi package which you trust, this option may help the installation complete successfully. You can also try disabling drop admin rights.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Access Restrictions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You can group programs together and give them a group name.  Program groups can be used with some of the settings instead of program names. Groups defined for the box overwrite groups defined in templates.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Process Restrictions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set network/internet access for unlisted processes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Restrictions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Test Rules, Program:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protocol:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CAUTION: Windows Filtering Platform is not enabled with the driver, therefore these rules will be applied only in user mode and can not be enforced!!! This means that malicious applications may bypass them.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow use of nested job objects (experimental, works on Windows 8 and later)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow sandboxed programs to managing Hardware/Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open access to Windows Local Security Authority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Firewall</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PopUpWindow</name>
@ -2512,7 +2709,7 @@ Please note that this values are currently user specific and saved globally for
 </context>
 <context>
    <name>QPlatformTheme</name>
-	<message>
+    <message>
        <source>OK</source>
        <translation>TAMAM</translation>
    </message>
@ -2572,6 +2769,29 @@ Please note that this values are currently user specific and saved globally for
        <translation>SandboxiePlus - Kurtarma</translation>
    </message>
 </context>
+<context>
+    <name>SelectBoxWindow</name>
+    <message>
+        <source>SandboxiePlus select box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select the sandbox in which to start the program, installer or document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run As UAC Administrator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Sandboxed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Outside the Sandbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>SettingsWindow</name>
    <message>
@ -2604,11 +2824,11 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>General Options</source>
-        <translation>Genel Ayarlar</translation>
+        <translation type="vanished">Genel Ayarlar</translation>
    </message>
    <message>
        <source>Program Restrictions</source>
-        <translation>Program Kısıtlamaları</translation>
+        <translation type="vanished">Program Kısıtlamaları</translation>
    </message>
    <message>
        <source>Restart required (!)</source>
@ -2616,7 +2836,7 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>Tray options</source>
-        <translation>Tepsi ayarları</translation>
+        <translation type="vanished">Tepsi ayarları</translation>
    </message>
    <message>
        <source>Use Dark Theme</source>
@ -2672,7 +2892,7 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>Software Compatibility</source>
-        <translation>Yazılım Uyumluluğu</translation>
+        <translation type="vanished">Yazılım Uyumluluğu</translation>
    </message>
    <message>
        <source>On main window close:</source>
@ -2696,7 +2916,7 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>Advanced Options</source>
-        <translation>Gelişmiş Ayarlar</translation>
+        <translation type="vanished">Gelişmiş Ayarlar</translation>
    </message>
    <message>
        <source>Prevent the listed programs from starting on this system</source>
@ -2748,12 +2968,92 @@ Please note that this values are currently user specific and saved globally for
    </message>
    <message>
        <source>Other settings</source>
-        <translation>Diğer ayarlar</translation>
+        <translation type="vanished">Diğer ayarlar</translation>
    </message>
    <message>
        <source>Use Dark Theme (fully applied after a restart)</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>General Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hotkey for terminating all boxed processes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Systray options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UI Language:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shell Integration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Sandboxed - Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always use DefaultBox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Sandbox Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sandboxing features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Windows Filtering Platform to restrict network access (experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Program Control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Protection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compatibility</source>
+        <translation type="unfinished">Uyumluluk</translation>
+    </message>
+    <message>
+        <source>Support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install updates automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keeping Sandboxie up to date with the rolling releases of Windows and compatible with all web browsers is a never-ending endeavor. Please consider supporting this work with a donation.&lt;br /&gt;You can support the development with a &lt;a href=&quot;https://sandboxie-plus.com/go.php?to=donate&quot;&gt;PayPal donation&lt;/a&gt;, working also with credit cards.&lt;br /&gt;Or you can provide continuous support with a &lt;a href=&quot;https://sandboxie-plus.com/go.php?to=patreon&quot;&gt;Patreon subscription&lt;/a&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the support certificate here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Support Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Supporters of the Sandboxie-Plus project receive a &lt;a href=&quot;https://sandboxie-plus.com/go.php?to=certificate&quot;&gt;supporter certificate&lt;/a&gt;. It&apos;s like a license key but for awesome people using free software. :-)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>SnapshotsWindow</name>
--- a/SandboxiePlus/SandMan/sandman_zh-CN.ts
+++ b/SandboxiePlus/SandMan/sandman_zh-CN.ts
--- a/SandboxiePlus/SandMan/sandman_zh-TW.ts
+++ b/SandboxiePlus/SandMan/sandman_zh-TW.ts
--- a/SandboxiePlus/version.h
+++ b/SandboxiePlus/version.h
@ -2,7 +2,7 @@

 #define VERSION_MJR		0
 #define VERSION_MIN 	9
-#define VERSION_REV 	2
+#define VERSION_REV 	3
 #define VERSION_UPD 	0

 #ifndef STR