Skip to content

Commit 9c30cf2

Browse files
Bambu-Pomfretlanewei120
authored andcommitted
FIX: user program web conflict
1 parent 488350f commit 9c30cf2

File tree

2 files changed

+8
-88
lines changed

2 files changed

+8
-88
lines changed

resources/web/guide/3/index.html

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
<!doctype html>
32
<html>
43
<head>
@@ -20,55 +19,17 @@
2019
<div class="trans" tid="t6">We kindly request your help to improve everyone's printing.<br/>Come and Join our Customer Experience Improvement Program</div>
2120
</div>
2221
<div id="Content">
23-
<div id="PolicyTxt" class="TextS2 TextArea1 ZScrol">
24-
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" onClick="OpenPrivacyPolicy()">Privacy Policy</a><a class="trans" tid="t56">
22+
<div id="PolicyTxt" class="TextS2 TextArea1 ZScrol" style="text-indent:2em;">
23+
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="javascript:void(0)">Privacy Policy</a><a class="trans" tid="t56">
2524
. We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.
2625
</a>
27-
<p class="trans" tid="t113" style="text-indent:2em;">You may change your choice in preference anytime.</p>
2826
</div>
2927
<br/>
3028
</div>
3129
<div id="AcceptArea">
3230
<div class="GrayBtn trans" tid="t8" id="PreBtn" onclick="window.open('../11/index.html','_self')">Back</div>
3331
<div class="GrayBtn trans" tid="t52" id="SkipBtn" onclick="GotoSkipPage()">Skip</div>
34-
<div class="NormalBtn trans" tid="t112" id="AcceptBtn" onclick="GotoNextPage()">Join the Program</div>
32+
<div class="GrayBtn trans" tid="t112" id="AcceptBtn" onclick="GotoNextPage()">Join the Program</div>
3533
</div>
3634
</body>
3735
</html>
38-
=======
39-
<!doctype html>
40-
<html>
41-
<head>
42-
<meta charset="utf-8">
43-
<meta http-equiv="Cache-Control" content="max-age=7200" />
44-
<title>引导_P1</title>
45-
<link rel="stylesheet" type="text/css" href="../css/common.css" />
46-
<link rel="stylesheet" type="text/css" href="3.css" />
47-
<link rel="stylesheet" type="text/css" href="../css/dark.css" />
48-
<script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
49-
<script type="text/javascript" src="../js/json2.js"></script>
50-
<script type="text/javascript" src="../../data/text.js"></script>
51-
<script type="text/javascript" src="../js/globalapi.js"></script>
52-
<script type="text/javascript" src="../js/common.js"></script>
53-
<script type="text/javascript" src="./3.js"></script>
54-
</head>
55-
<body onLoad="OnInit()">
56-
<div id="Title">
57-
<div class="trans" tid="t6">We kindly request your help to improve everyone's printing.<br/>Come and Join our Customer Experience Improvement Program</div>
58-
</div>
59-
<div id="Content">
60-
<div id="PolicyTxt" class="TextS2 TextArea1 ZScrol" style="text-indent:2em;">
61-
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="javascript:void(0)">Privacy Policy</a><a class="trans" tid="t56">
62-
. We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.
63-
</a>
64-
</div>
65-
<br/>
66-
</div>
67-
<div id="AcceptArea">
68-
<div class="GrayBtn trans" tid="t8" id="PreBtn" onclick="window.open('../11/index.html','_self')">Back</div>
69-
<div class="GrayBtn trans" tid="t52" id="SkipBtn" onclick="GotoSkipPage()">Skip</div>
70-
<div class="GrayBtn trans" tid="t112" id="AcceptBtn" onclick="GotoNextPage()">Join the Program</div>
71-
</div>
72-
</body>
73-
</html>
74-
>>>>>>> bdd57e7219 (ENH: update User Experience Program)

resources/web/guide/31/index.html

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
<!doctype html>
32
<html>
43
<head>
@@ -16,13 +15,12 @@
1615
</head>
1716
<body onLoad="OnInit()">
1817
<div id="Title">
19-
<div class="trans" tid="t6">We kindly request your help to improve<br/> everyone's printing</div>
18+
<div class="trans" tid="t6">Help improve 3D printing for everyone by joining our User<br/>
19+
Experience Improvement Program.</div>
2020
</div>
2121
<div id="Content">
22-
<div id="PolicyTxt">
23-
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="https://bambulab.com/policies/privacy" target="_blank">Privacy Policy</a><a class="trans" tid="t56">
24-
. We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.
25-
</a>
22+
<div id="PolicyTxt" style="text-indent:2em;">
23+
<a class="trans" tid="t54" style="white-space: pre-line;">By learning from real prints, successes and failures, Bambu Studio can improve print quality, reliability, and overall performance.<br/><br/><span style='display:inline-block;width:2em;'></span>If you join our program, your printer and software will share your usage data and performance data, such as device information, settings, connectivity, and print behavior. This helps us identify issues faster and improve our products.<br/><br/><span style='display:inline-block;width:2em;'></span>Participation is optional, and you can leave at any time in <b>Preferences &gt; User Experience</b>. For more details, visit the </a><a class="HyperLink trans" tid="t55" href="javascript:void(0)">User Experience Improvement Program</a><a class="trans" tid="t56"> page.</a>
2624
</div>
2725
<br/>
2826

@@ -33,46 +31,7 @@
3331
</div>
3432
<div id="AcceptArea">
3533
<div class="GrayBtn trans" tid="t8" id="PreBtn" onclick="window.open('../11/index.html','_self')">Back</div>
36-
<div class="NormalBtn trans" tid="t9" id="AcceptBtn" onclick="GotoNextPage()">Next</div>
34+
<div class="GrayBtn trans" tid="t9" id="AcceptBtn" onclick="GotoNextPage()">Next</div>
3735
</div>
3836
</body>
3937
</html>
40-
=======
41-
<!doctype html>
42-
<html>
43-
<head>
44-
<meta charset="utf-8">
45-
<meta http-equiv="Cache-Control" content="max-age=7200" />
46-
<title>引导_P1</title>
47-
<link rel="stylesheet" type="text/css" href="../css/common.css" />
48-
<link rel="stylesheet" type="text/css" href="31.css" />
49-
<script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
50-
<script type="text/javascript" src="../js/json2.js"></script>
51-
<script type="text/javascript" src="../../data/text.js"></script>
52-
<script type="text/javascript" src="../js/globalapi.js"></script>
53-
<script type="text/javascript" src="../js/common.js"></script>
54-
<script type="text/javascript" src="./31.js"></script>
55-
</head>
56-
<body onLoad="OnInit()">
57-
<div id="Title">
58-
<div class="trans" tid="t6">Help improve 3D printing for everyone by joining our User<br/>
59-
Experience Improvement Program.</div>
60-
</div>
61-
<div id="Content">
62-
<div id="PolicyTxt" style="text-indent:2em;">
63-
<a class="trans" tid="t54" style="white-space: pre-line;">By learning from real prints, successes and failures, Bambu Studio can improve print quality, reliability, and overall performance.<br/><br/><span style='display:inline-block;width:2em;'></span>If you join our program, your printer and software will share your usage data and performance data, such as device information, settings, connectivity, and print behavior. This helps us identify issues faster and improve our products.<br/><br/><span style='display:inline-block;width:2em;'></span>Participation is optional, and you can leave at any time in <b>Preferences &gt; User Experience</b>. For more details, visit the </a><a class="HyperLink trans" tid="t55" href="javascript:void(0)">User Experience Improvement Program</a><a class="trans" tid="t56"> page.</a>
64-
</div>
65-
<br/>
66-
67-
<div>
68-
<input id="ChoosePrivacy" type="checkbox" checked onClick="SendPrivacySelect()" onChange="SendPrivacySelect()" />
69-
<span class="trans" tid="t7">Join our Customer Experience Improvement Program</span>
70-
</div>
71-
</div>
72-
<div id="AcceptArea">
73-
<div class="GrayBtn trans" tid="t8" id="PreBtn" onclick="window.open('../11/index.html','_self')">Back</div>
74-
<div class="GrayBtn trans" tid="t9" id="AcceptBtn" onclick="GotoNextPage()">Next</div>
75-
</div>
76-
</body>
77-
</html>
78-
>>>>>>> bdd57e7219 (ENH: update User Experience Program)

0 commit comments

Comments
 (0)