Commit Graph

1735 Commits

Author SHA1 Message Date
DavidXanatos 51b03496a1 Merge branch 'master' into next 2022-06-17 08:59:09 +02:00
DavidXanatos cb8d74d438 Merge branch 'master' into next 2022-06-14 20:59:15 +02:00
DavidXanatos 63ab162597 Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie 2022-06-14 20:58:41 +02:00
DavidXanatos 1c22889f32 1.1.3 2022-06-14 20:58:13 +02:00
isaak654 a00f150ca3
Rename Imminent to Immediate Recovery
For greater consistency with other strings
2022-06-14 20:10:12 +02:00
DavidXanatos d8e5371465 1.1.3 2022-06-14 19:45:52 +02:00
DavidXanatos 838ce6553f 1.1.3 2022-06-14 19:43:23 +02:00
DavidXanatos e768d47e5b 1.1.2 2022-06-13 20:49:53 +02:00
DavidXanatos f61ac60b2e 1.1.2 2022-06-13 20:12:53 +02:00
isaak654 bab9bc38b4
Update CHANGELOG.md 2022-06-11 14:49:33 +02:00
Zerorigin 27b68dec72
lupdate sandman_zh_CN.ts 2022-06-11 11:47:36 +02:00
DavidXanatos 39835729ab Update sxs.c 2022-06-11 11:26:45 +02:00
DavidXanatos e26d98744c Update guienum.c 2022-06-09 22:15:11 +02:00
DavidXanatos a72637dfa8 Update sysinfo.c 2022-06-09 21:29:18 +02:00
DavidXanatos e8ef632592 Update sysinfo.c 2022-06-09 21:00:41 +02:00
DavidXanatos 2d0f626aab Update SbieView.cpp 2022-06-09 20:30:52 +02:00
DavidXanatos fce57b72ed Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie 2022-06-09 20:26:41 +02:00
DavidXanatos 3f784238d1 1.1.2 2022-06-09 20:26:36 +02:00
DavidXanatos 744e725c9b
1.1.2 2022-06-08 22:21:00 +02:00
DavidXanatos 1e7210fe40 1.1.2 2022-06-08 21:54:41 +02:00
DavidXanatos be560fadff 1.1.2 2022-06-08 21:30:29 +02:00
DavidXanatos 7a2e840c89 1.1.2 2022-06-08 17:23:19 +02:00
DavidXanatos b331bd9d1b Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie 2022-06-08 11:54:08 +02:00
DavidXanatos 2859471549 1.1.2 2022-06-08 11:53:59 +02:00
DavidXanatos d804cd5a31 Update SandMan.h 2022-06-07 21:58:29 +02:00
DavidXanatos 4e129512c3 Merge branch 'next' of https://github.com/sandboxie-plus/Sandboxie into next 2022-06-07 21:25:21 +02:00
DavidXanatos 088094669d Update SboxDll32.def 2022-06-07 21:25:15 +02:00
dependabot[bot] 47e14617b9
Bump actions/cache from 3.0.3 to 3.0.4
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.3...v3.0.4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-07 12:58:36 +02:00
DavidXanatos fa7f3fb53d
Update CHANGELOG.md 2022-06-07 07:51:28 +02:00
DavidXanatos e806da601b Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie 2022-06-07 07:48:38 +02:00
DavidXanatos 15b1b626ba 1.1.2 2022-06-07 07:48:33 +02:00
isaak654 4924f87028
new lupdate 2022-06-07 01:14:30 +02:00
isaak654 92115ade2e
new lupdate 2022-06-07 01:06:12 +02:00
isaak654 8fd537a5ef
Revert "lupdate"
This reverts commit c2de9c7bc0.
Reason: the introduced strings have not yet been merged into the respective source files.
2022-06-07 00:54:16 +02:00
isaak654 a23ff8e9ef
Update OptionsWindow.ui 2022-06-07 00:54:15 +02:00
isaak654 7e34251017
Update SetupWizard.cpp 2022-06-07 00:54:15 +02:00
isaak654 998fba7d64
Revert "lupdate"
This reverts commit c2de9c7bc0.
Reason: the introduced strings have not yet been merged into the respective source files.
2022-06-07 00:49:20 +02:00
isaak654 2b16e41d2e
Update OptionsWindow.ui 2022-06-06 20:38:16 +02:00
isaak654 2748de80f1
Update SetupWizard.cpp 2022-06-06 20:30:19 +02:00
isaak654 1600fd66f8
Update CHANGELOG.md 2022-06-06 20:15:09 +02:00
DavidXanatos 3c7ca09720 Update SandMan.h 2022-06-06 19:59:17 +02:00
DavidXanatos cee3185409 Merge branch 'master' into next 2022-06-06 19:49:24 +02:00
DavidXanatos c2de9c7bc0 lupdate 2022-06-06 19:47:32 +02:00
DavidXanatos 25dede5734 1.1.1 2022-06-06 19:46:03 +02:00
isaak654 62baa1ed58
Update Italian translation 2022-06-06 02:06:33 +02:00
isaak654 b79a5181a8
Update Italian translation 2022-06-06 01:00:28 +02:00
isaak654 82ec52fbb4
Update SetupWizard.cpp 2022-06-06 00:41:55 +02:00
isaak654 845f7869de
Update SetupWizard.cpp 2022-06-06 00:40:31 +02:00
DavidXanatos 3a02783b5c Merge branch 'master' of https://github.com/sandboxie-plus/Sandboxie 2022-06-05 23:32:03 +02:00
DavidXanatos 8e87dea3cf Update key.c 2022-06-05 23:32:01 +02:00