diff --git a/CHANGELOG.md b/CHANGELOG.md index 99d6c37c..8fd0d51a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - added option to get free 10 days evaluation certificates from the support settings page. - The evaluation certificates are node lcoked to the HwID and for each HwID up to 3 certs can be requested. - added "TerminateWhenExit"(bool,in Sandboxie-Plus.ini) to terminate all processes when Sandman exits for [#4171](https://github.com/sandboxie-plus/Sandboxie/issues/4171) +- added a question box to ask for Sandbox Import Location for [#4169](https://github.com/sandboxie-plus/Sandboxie/issues/4169) ## [1.14.6 / 5.69.6] - 2024-07-30 diff --git a/SandboxiePlus/SandMan/SbiePlusAPI.cpp b/SandboxiePlus/SandMan/SbiePlusAPI.cpp index 545b487e..edb2f3d7 100644 --- a/SandboxiePlus/SandMan/SbiePlusAPI.cpp +++ b/SandboxiePlus/SandMan/SbiePlusAPI.cpp @@ -329,13 +329,15 @@ void CSandBoxPlus::ImportBoxAsync(const CSbieProgressPtr& pProgress, const QStri pProgress->Finish(Status); } -SB_PROGRESS CSandBoxPlus::ImportBox(const QString& FileName, const QString& Password) +SB_PROGRESS CSandBoxPlus::ImportBox(const QString& FileName, const QString& RootFolder, const QString& Password) { if (!CArchive::IsInit()) return SB_ERR((ESbieMsgCodes)SBX_7zNotReady); CSbieProgressPtr pProgress = CSbieProgressPtr(new CSbieProgress()); - QtConcurrent::run(CSandBoxPlus::ImportBoxAsync, pProgress, FileName, m_FilePath, m_Name, Password); + QString filepath = RootFolder.isEmpty()?m_FilePath:RootFolder; + + QtConcurrent::run(CSandBoxPlus::ImportBoxAsync, pProgress, FileName, filepath, m_Name, Password); return SB_PROGRESS(OP_ASYNC, pProgress); } diff --git a/SandboxiePlus/SandMan/SbiePlusAPI.h b/SandboxiePlus/SandMan/SbiePlusAPI.h index b6990ae3..b9970b41 100644 --- a/SandboxiePlus/SandMan/SbiePlusAPI.h +++ b/SandboxiePlus/SandMan/SbiePlusAPI.h @@ -75,7 +75,7 @@ public: virtual QString GetDisplayName() const; SB_PROGRESS ExportBox(const QString& FileName, const QString& Password = "", int Level = 5, bool Solid = false); - SB_PROGRESS ImportBox(const QString& FileName, const QString& Password = ""); + SB_PROGRESS ImportBox(const QString& FileName, const QString& RootFolder,const QString& Password); virtual void UpdateDetails(); diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp index 21e25a6f..22673b03 100644 --- a/SandboxiePlus/SandMan/Views/SbieView.cpp +++ b/SandboxiePlus/SandMan/Views/SbieView.cpp @@ -1086,6 +1086,10 @@ QString CSbieView::ImportSandbox() if (!Status.IsError()) { pBox = theAPI->GetBoxByName(Name); if (pBox) { + QString rootname = ""; + if (QMessageBox::question(this, tr("Importing Sandbox"), tr("Do you want to select custom root folder?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) { + rootname=QFileDialog::getExistingDirectory(this); + } auto pBoxEx = pBox.objectCast(); if (!Password.isEmpty()) { @@ -1095,7 +1099,9 @@ QString CSbieView::ImportSandbox() } if (!Status.IsError()) - Status = pBoxEx->ImportBox(Path, Password); + Status = pBoxEx->ImportBox(Path,rootname,Password); + if(!rootname.isEmpty()) + pBox->SetText("FileRootPath", rootname); } } if (Status.GetStatus() == OP_ASYNC) { diff --git a/SandboxiePlus/SandMan/sandman_de.ts b/SandboxiePlus/SandMan/sandman_de.ts index 3b13a358..98fdf4f9 100644 --- a/SandboxiePlus/SandMan/sandman_de.ts +++ b/SandboxiePlus/SandMan/sandman_de.ts @@ -737,17 +737,17 @@ Bitte navigieren Sie zum korrekten Nutzerprofilordner. Start evaluation without a certificate for a limited period of time. - Starte Testphase ohne ein Zertifikat für eine begrenzte Zeit. + Starte Evaluation ohne ein Zertifikat für eine begrenzte Zeit. <b><a href="_"><font color='red'>Get a free evaluation certificate</font></a> and enjoy all premium features for %1 days.</b> - + <b><a href="_"><font color='red'>Erhalten Sie ein kostenloses Evaluationszertifikat</font></a> und nutzen Sie alle Premium-Funktionen für %1 Tage.</b> You can request a free %1-day evaluation certificate up to %2 times for any one Hardware ID - + Sie können ein kostenloses %1-Tage-Evaluationszertifikat bis zu %2-mal für eine einzelne Hardware-ID anfordern @@ -4047,7 +4047,7 @@ Bitte überprüfen Sie, ob es ein Update für Sandboxie gibt. The evaluation period has expired!!! - Die Evaluierungsphase ist abgelaufen!!! + Die Evaluationsphase ist abgelaufen!!! @@ -5355,17 +5355,17 @@ This file is part of Sandboxie and all change done to it will be reverted next t <b>You have used %1/%2 evaluation certificates. No more free certificates can be generated.</b> - + <b>Sie haben %1/%2 Evaluationszertifikate verwendet. Es können keine weiteren kostenlosen Zertifikate erstellt werden.</b> <b><a href="_">Get a free evaluation certificate</a> and enjoy all premium features for %1 days.</b> - + <b><a href="_">Erhalten Sie ein kostenloses Evaluationszertifikat</a> und nutzen Sie alle Premium-Funktionen für %1 Tage.</b> You can request a free %1-day evaluation certificate up to %2 times for any one Hardware ID - + Sie können ein kostenloses %1-Tage-Evaluationszertifikat bis zu %2-mal für eine einzelne Hardware-ID anfordern. @@ -5380,22 +5380,22 @@ This file is part of Sandboxie and all change done to it will be reverted next t Expires in: %1 Days - + Läuft ab in: %1 Tagen Expires: %1 Days ago - + Abgelaufen: vor %1 Tagen Options: %1 - + Optionen: %1 Security/Privacy Enhanced & App Boxes (SBox): %1 - + Sicherheit/Privatsphäre verbesserte & App-Boxen (SBox): %1 @@ -5403,7 +5403,7 @@ This file is part of Sandboxie and all change done to it will be reverted next t Enabled - + Aktiviert @@ -5411,22 +5411,22 @@ This file is part of Sandboxie and all change done to it will be reverted next t Disabled - Deaktiviert + Deaktiviert Encrypted Sandboxes (EBox): %1 - + Verschlüsselte Sandboxen (EBox): %1 Network Interception (NetI): %1 - + Netzwerküberwachung (NetI): %1 Sandboxie Desktop (Desk): %1 - + Sandboxie Desktop (Desk): %1 @@ -5451,13 +5451,14 @@ This file is part of Sandboxie and all change done to it will be reverted next t Sandboxie-Plus - Get EVALUATION Certificate - + Sandboxie-Plus - EVALUATIONSzertifikat erhalten Please enter your email address to receive a free %1-day evaluation certificate, which will be issued to %2 and locked to the current hardware. You can request up to %3 evaluation certificates for each unique hardware ID. - + Bitte geben Sie Ihre E-Mail-Adresse ein, um ein kostenloses %1-Tage-Evaluationszertifikat zu erhalten, welches auf %2 ausgestellt und an die aktuelle Hardware gebunden wird. +Sie können bis zu %3 Evaluationszertifikate für jede eindeutige Hardware-ID anfordern. @@ -5727,7 +5728,7 @@ You can request up to %3 evaluation certificates for each unique hardware ID. The evaluation certificate has been successfully applied. Enjoy your free trial! - + Das Evaluationszertifikat wurde erfolgreich angewendet. Viel Spaß beim kostenlosen Ausprobieren! @@ -9619,7 +9620,7 @@ Bitte beachten Sie, dass diese Werte aktuell nutzerspezifisch sind und global f Cert Info - + Zert. Infos diff --git a/SandboxiePlus/SandMan/sandman_ko.ts b/SandboxiePlus/SandMan/sandman_ko.ts index 97a5dfc2..41e48e16 100644 --- a/SandboxiePlus/SandMan/sandman_ko.ts +++ b/SandboxiePlus/SandMan/sandman_ko.ts @@ -894,12 +894,12 @@ Please browse to the correct user profile directory. <b><a href="_"><font color='red'>Get a free evaluation certificate</font></a> and enjoy all premium features for %1 days.</b> - + <b><a href="_"><font color='red'>무료 평가 인증서를 받고</font></a> %1 일 동안 모든 프리미엄 기능을 누리세요.</b> You can request a free %1-day evaluation certificate up to %2 times for any one Hardware ID - + 하나의 하드웨어 ID에 대해 %1일 무료 평가 인증서를 %2회까지 요청할 수 있습니다 @@ -5889,17 +5889,17 @@ This file is part of Sandboxie and all changed done to it will be reverted next <b>You have used %1/%2 evaluation certificates. No more free certificates can be generated.</b> - + <b>%1/%2개의 평가 인증서를 사용했습니다. 더 이상 사용 가능한 인증서를 생성할 수 없습니다.</b> <b><a href="_">Get a free evaluation certificate</a> and enjoy all premium features for %1 days.</b> - + <b><a href="_">무료 평가 인증서를 받고</a> %1일 동안 모든 프리미엄 기능을 누리세요.</b> You can request a free %1-day evaluation certificate up to %2 times for any one Hardware ID - + 하나의 하드웨어 ID에 대해 %1일 무료 평가 인증서를 %2회까지 요청할 수 있습니다 @@ -5919,22 +5919,22 @@ This file is part of Sandboxie and all changed done to it will be reverted next Expires in: %1 Days - + 만료 날짜: %1일 Expires: %1 Days ago - + 만료: %1일 전 Options: %1 - + 옵션: %1 Security/Privacy Enhanced & App Boxes (SBox): %1 - + 보안/개인 정보 보호 강화 및 앱 박스 (SBox): %1 @@ -5942,7 +5942,7 @@ This file is part of Sandboxie and all changed done to it will be reverted next Enabled - + 사용함 @@ -5950,22 +5950,22 @@ This file is part of Sandboxie and all changed done to it will be reverted next Disabled - 사용 안 함 + 사용 안 함 Encrypted Sandboxes (EBox): %1 - + 암호화된 샌드박스 (EBox): %1 Network Interception (NetI): %1 - + 네트워크 차단 (NetI): %1 Sandboxie Desktop (Desk): %1 - + Sandboxie 데스크톱:% 1 @@ -5999,13 +5999,14 @@ This file is part of Sandboxie and all changed done to it will be reverted next Sandboxie-Plus - Get EVALUATION Certificate - + Sandboxie-Plus - 평가판 인증서 가져오기 Please enter your email address to receive a free %1-day evaluation certificate, which will be issued to %2 and locked to the current hardware. You can request up to %3 evaluation certificates for each unique hardware ID. - + %2로 발급되어 현재 하드웨어에 고정되는 무료 %1일 평가 인증서를 받으려면 이메일 주소를 입력하세요. +고유 하드웨어 ID별로 최대 %3개의 평가 인증서를 요청할 수 있습니다. @@ -6021,7 +6022,7 @@ You can request up to %3 evaluation certificates for each unique hardware ID. The evaluation certificate has been successfully applied. Enjoy your free trial! - + 평가 인증서가 성공적으로 신청되었습니다. 무료 평가판을 즐기세요! Retreiving certificate... @@ -10225,7 +10226,7 @@ Please note that this values are currently user specific and saved globally for Cert Info - + 인증 정보 diff --git a/SandboxiePlus/SandMan/sandman_ru.ts b/SandboxiePlus/SandMan/sandman_ru.ts index 5a59fdc8..ab1c55c0 100644 --- a/SandboxiePlus/SandMan/sandman_ru.ts +++ b/SandboxiePlus/SandMan/sandman_ru.ts @@ -736,17 +736,17 @@ Please browse to the correct user profile directory. Start evaluation without a certificate for a limited period of time. - Начать оценку без сертификата, в течение ограниченного периода времени. + Начать ознакомление без сертификата, в течение ограниченного периода времени. <b><a href="_"><font color='red'>Get a free evaluation certificate</font></a> and enjoy all premium features for %1 days.</b> - + <b><a href="_"><font color='red'>Получите бесплатный ознакомительный сертификат</font></a> и пользуйтесь всеми премиум-функциями в течение %1 дн.</b> You can request a free %1-day evaluation certificate up to %2 times for any one Hardware ID - + Вы можете запросить бесплатный %1-дневный ознакомительный сертификат не более %2 раз для одного Hardware ID @@ -5387,17 +5387,17 @@ This file is part of Sandboxie and all change done to it will be reverted next t <b>You have used %1/%2 evaluation certificates. No more free certificates can be generated.</b> - + <b>Вы использовали %1/%2 ознакомительных сертификатов. Больше бесплатные сертификаты генерироваться не будут.</b> <b><a href="_">Get a free evaluation certificate</a> and enjoy all premium features for %1 days.</b> - + <b><a href="_">Получите бесплатный ознакомительный сертификат</a> и пользуйтесь всеми премиум-функциями в течение %1 дня.</b> You can request a free %1-day evaluation certificate up to %2 times for any one Hardware ID - + Вы можете запросить бесплатный %1-дневный ознакомительный сертификат не более %2 раз для одного Hardware ID @@ -5417,22 +5417,22 @@ This file is part of Sandboxie and all change done to it will be reverted next t Expires in: %1 Days - + Истекает через: %1 дн Expires: %1 Days ago - + Истек: %1 дн. назад Options: %1 - + Опции: %1 Security/Privacy Enhanced & App Boxes (SBox): %1 - + Песочницы для приложений с улучшенной безопасностью и конф-тью (SBox): %1 @@ -5440,7 +5440,7 @@ This file is part of Sandboxie and all change done to it will be reverted next t Enabled - + Включено @@ -5448,22 +5448,22 @@ This file is part of Sandboxie and all change done to it will be reverted next t Disabled - Отключено + Отключено Encrypted Sandboxes (EBox): %1 - + Зашифрованные песочницы (EBox): %1 Network Interception (NetI): %1 - + Перехват сети (NetI): %1 Sandboxie Desktop (Desk): %1 - + @@ -5488,13 +5488,14 @@ This file is part of Sandboxie and all change done to it will be reverted next t Sandboxie-Plus - Get EVALUATION Certificate - + Sandboxie-Plus - Получить ОЗНАКОМИТЕЛЬНЫЙ сертификат Please enter your email address to receive a free %1-day evaluation certificate, which will be issued to %2 and locked to the current hardware. You can request up to %3 evaluation certificates for each unique hardware ID. - + Введите адрес электронной почты, чтобы получить бесплатный ознакомительный сертификат на %1 дней, который будет выдан на %2 и привязан к текущему оборудованию. +Вы можете запросить до %3 ознакомительных сертификатов для каждого уникального Hardware ID. @@ -5715,7 +5716,7 @@ You can request up to %3 evaluation certificates for each unique hardware ID. The evaluation certificate has been successfully applied. Enjoy your free trial! - + Ознакомительный сертификат успешно применен. Наслаждайтесь бесплатной пробной версией! @@ -8202,7 +8203,7 @@ The process match level has a higher priority than the specificity and describes Don't allow sandboxed processes to see processes running outside any boxes - Не позволять изолированным процессам видеть процессы, запущенные за пределами песочницы. + Не позволять изолированным процессам видеть процессы, запущенные за пределами песочницы @@ -9554,7 +9555,7 @@ Please note that this values are currently user specific and saved globally for Cert Info - + Информация о сертификате diff --git a/SandboxiePlus/SandMan/sandman_zh_CN.ts b/SandboxiePlus/SandMan/sandman_zh_CN.ts index 24136e5f..a7e07a0a 100644 --- a/SandboxiePlus/SandMan/sandman_zh_CN.ts +++ b/SandboxiePlus/SandMan/sandman_zh_CN.ts @@ -1740,18 +1740,18 @@ Note: The update check is often behind the latest GitHub release to ensure that bytes (unlimited) - + 字节(无限制) bytes (%1) - + 字节 (%1) unlimited - + 无限制 @@ -4387,19 +4387,19 @@ This file is part of Sandboxie and all changed done to it will be reverted next The value is not an existing directory or executable. - + 该目录不存在或不可执行 You typed a wrong box name! Nothing was changed. - + 你输出了错误的沙盘名称！没有做出任何更改 User canceled this operation. - + 用户取消操作 @@ -5508,7 +5508,7 @@ Error: %1 Please enter a new alias for the Sandbox. - + 请输入沙盒的新别名。 @@ -5585,7 +5585,7 @@ Error: %1 This sandbox is currently disabled or restricted to specific groups or users. Would you like to allow access for everyone? This sandbox is disabled or restricted to a group/user, do you want to allow box for everybody ? - 此沙盒已禁用或仅限于特定组/用户，确定要编辑它吗？ + 此沙盒已禁用或仅限于特定组/用户，确定要编辑它吗？ @@ -5767,7 +5767,7 @@ Error: %1 You can request a free %1-day evaluation certificate up to %2 times for any one Hardware ID - + 对于任何一个硬件ID，您最多可以请求%2次免费的%1天评估证书 @@ -5777,12 +5777,12 @@ Error: %1 Expires in: %1 Days - + 过期时间：%1天 Expires: %1 Days ago - + 过期时间：%1天前 diff --git a/TRANSLATING.md b/TRANSLATING.md index c469b85b..1d87058c 100644 --- a/TRANSLATING.md +++ b/TRANSLATING.md @@ -33,7 +33,7 @@ To achieve this goal, Sandboxie has established a translation program that enabl |Polish|Yes|Yes - Apr 27, 2024|No| |Portuguese|Yes|Yes - May 30, 2023|No| |PortugueseBr|Yes - Feb 14, 2023|Yes - Feb 14, 2023|No| -|Russian|Yes - Aug 22, 2024|Yes - Aug 22, 2024|Yes - Aug 22, 2024| +|Russian|Yes - Aug 26, 2024|Yes - Aug 26, 2024|Yes - Aug 22, 2024| |SimpChinese|Yes - May 20, 2024|Yes - Jun 19, 2024|Yes - Jun 20, 2024| |Slovak|Yes|No|No| |Spanish|Yes|Yes - Jun 17, 2024|Yes - Jan 5, 2024|