update message

src/pages/authentication/auth-forms/BusCustomFormWizard.js

@@ -1432,7 +1432,7 @@ const BusCustomFormWizard = (props) => {
                                         </Grid>
                                         <Grid item xs={12} s={12} md={12} lg={12}>
                                             <Grid container>
-                                                <Grid item xs={6} s={6} md={2} lg={2}>
+                                                <Grid item xs={6} s={6} md={11} lg={11}>
                                                     <Grid container>
                                                         <Grid item sx={{ display: 'flex', alignItems: 'center' }}>
                                                             <Checkbox
@@ -1443,7 +1443,7 @@ const BusCustomFormWizard = (props) => {
                                                                 size="small"
                                                             />
                                                             <Typography variant="pnspsFormHeader">
-                                                                <FormattedMessage id="acceptTerms"/>
+                                                                <FormattedMessage id="iConfirm"/>
                                                             </Typography>
                                                         </Grid>
                                                     </Grid>

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -1770,7 +1770,7 @@ const CustomFormWizard = (props) => {
                                         </Grid>
                                         <Grid item xs={12} s={12} md={12} lg={12}>
                                             <Grid container>
-                                                <Grid item xs={6} s={6} md={2} lg={2}>
+                                                <Grid item xs={6} sm={6} md={11} lg={11}>
                                                     <Grid container>
                                                         <Grid item sx={{ display: 'flex', alignItems: 'center' }}>
                                                             <Checkbox
@@ -1781,7 +1781,7 @@ const CustomFormWizard = (props) => {
                                                                 size="small"
                                                             />
                                                             <Typography variant="pnspsFormHeader">
-                                                                <FormattedMessage id="acceptTerms" />
+                                                                <FormattedMessage id="iConfirm" />
                                                             </Typography>
                                                         </Grid>
                                                     </Grid>

src/pages/authentication/auth-forms/IAmSmartFormWizard.js

@@ -929,7 +929,7 @@ const CustomFormWizard = (props) => {
                                             </Grid>
                                             <Grid item xs={12} s={12} md={12} lg={12}>
                                                 <Grid container>
-                                                    <Grid item xs={6} s={6} md={2} lg={2}>
+                                                    <Grid item xs={6} s={6} md={11} lg={11}>
                                                         <Grid container>
                                                             <Grid item sx={{ display: 'flex', alignItems: 'center' }}>
                                                                 <Checkbox
@@ -940,7 +940,7 @@ const CustomFormWizard = (props) => {
                                                                     size="small"
                                                                 />
                                                                 <Typography variant="h5">
-                                                                    <FormattedMessage id="acceptTerms" />
+                                                                    <FormattedMessage id="iConfirm" />
                                                                 </Typography>
                                                             </Grid>
                                                         </Grid>

src/pages/extra-pages/ImportantNoticePage/ImportantNotice_cn.js

@@ -6,6 +6,18 @@ const ImportantNotice = () => {
       td.tnc { min-width: 24px; vertical-align: text-top; } div.tnc { text-align: justify; text-justify: inter-word; font-style: normal; } strong.tnc { font-size: large; } li.tnc { margin: 10px 0; }
     </style>
     <div class="tnc">
+      <strong class="tnc">注意事项</strong><br />
+      <ol>
+      <li class="tnc">
+      申请人在本申请表格内所提供的资料会供申请刊登公共启事及为承担法律责任用途。政府物流服务署可能会向其他政策局／部门披露你在此表格内填报的资料。申请人有权查阅及改正个人资料。如要查阅或改正个人资料，请向本署个人资料私隐主任提出，地址为香港北角渣华道333号北角政府合署十楼。 
+      </li>
+      <li class="tnc">
+      申请人必须确保递交的稿件内容正确，并且是最终的版本。在宪报上刊登公共启事一般是为符合香港法例或法院命令的规定。政府物流服务署署长有权拒收不适宜刊登的公共启事。 
+      </li>
+      <li class="tnc">
+      有关申请刊登详情，请参阅「<a href="https://pnsps.gld.gov.hk/aboutUs">透过系统于宪报刊登公共启事须知</a>」。 
+      </li>
+      </ol>
       <strong class="tnc">免责声明</strong><br />
       <ol>
         <li class="tnc">

src/pages/extra-pages/ImportantNoticePage/ImportantNotice_en.js

@@ -6,7 +6,19 @@ const ImportantNotice = () => {
       td.tnc { min-width: 24px; vertical-align: text-top; } div.tnc { text-align: justify; text-justify: inter-word; font-style: normal; } strong.tnc { font-size: large; } li.tnc { margin: 10px 0; }
     </style>
     <div class="tnc">
-      <strong class="tnc">Disclaimer</strong><br />
+      <strong class="tnc">Points to note</strong><br />
+      <ol>
+        <li class="tnc">
+          The information provided by the applicant in this form would be used for application of public notice publication and for assumption of liability. The information provided in this form may be disclosed to other bureaux / departments.  The applicant has a right of access and correction with respect to personal data.  Requests for access to or correction of personal data should be addressed to the Personal Data Privacy Officer, Government Logistics Department, 10/F, North Point Government Offices, 333 Java Road, North Point, Hong Kong.
+        </li>
+        <li class="tnc">
+          The applicant must ensure that the public notice submitted for publication in the Gazette is accurate and is the final version. The Director of Government Logistics reserves the right to reject public notices which are considered not suitable for publication.
+        </li>
+        <li class="tnc">
+          For further details, please refer to the “<a href="https://pnsps.gld.gov.hk/aboutUs">Notes on Publishing Public Notices in the Gazette through PNSPS</a>”.
+        </li>
+      </ol>
+    <strong class="tnc">Disclaimer</strong><br />
       <ol>
         <li class="tnc">
           The information provided by the Government Logistics Department of the

src/pages/extra-pages/ImportantNoticePage/ImportantNotice_zh.js

@@ -6,6 +6,18 @@ const ImportantNotice = () => {
       td.tnc { min-width: 24px; vertical-align: text-top; } div.tnc { text-align: justify; text-justify: inter-word; font-style: normal; } strong.tnc { font-size: large; } li.tnc { margin: 10px 0; }
     </style>
     <div class="tnc">
+      <strong class="tnc">注意事項</strong><br />
+      <ol>
+        <li class="tnc">
+          申請人在本申請表格內所提供的資料會供申請刊登公共啟事及為承擔法律責任用途。政府物流服務署可能會向其他政策局／部門披露你在此表格內填報的資料。申請人有權查閱及改正個人資料。如要查閱或改正個人資料，請向本署個人資料私隱主任提出，地址為香港北角渣華道333號北角政府合署十樓。
+        </li>
+        <li class="tnc">
+          申請人必須確保遞交的稿件內容正確，並且是最終的版本。在憲報上刊登公共啟事一般是為符合香港法例或法院命令的規定。政府物流服務署署長有權拒收不適宜刊登的公共啟事。
+        </li>
+        <li class="tnc">
+          有關申請刊登詳情，請參閱「<a href="https://pnsps.gld.gov.hk/aboutUs">透過系統於憲報刊登公共啟事須知</a>」。
+        </li>
+      </ol>
       <strong class="tnc">免責聲明</strong><br />
       <ol>
         <li class="tnc">

src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_cn.js

@@ -44,9 +44,7 @@ const AboutUs = () => {
           政府物流服务署<br />
           保障资料主任<br />
           <br />
-          ( 注：请以个人资料私隐专员指定的表格[link -
-          https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_c.pdf]
-          提出查阅资料的要求。)
+          ( 注：请以个人资料私隐专员指定的<a target="_blank" href="https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_c.pdf">表格</a>提出查阅资料的要求。)
         </li>
       </ol>
     </div>

src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_en.js

@@ -67,9 +67,7 @@ const Page = () => {
 			333 Java Road North Point<br />
 			Hong Kong<br />
 			<br />
-			(Note: Data access requests should be made on a form [link -
-			https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_e.pdf]
-			specified by the Privacy Commissioner for Personal Data.)
+			(Note: Data access requests should be made on a <a target="_blank" href="https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_e.pdf">form</a> specified by the Privacy Commissioner for Personal Data.)
 			</li>
 		</ol>
 		</div>

src/pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_zh.js

@@ -44,9 +44,7 @@ const AboutUs = () => {
           政府物流服務署<br />
           保障資料主任<br />
           <br />
-          ( 註：請以個人資料私隱專員指定的表格 [link -
-          https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_c.pdf]
-          提出查閱資料的要求。)
+          ( 註：請以個人資料私隱專員指定的<a target="_blank" href="https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_c.pdf">表格</a>提出查閱資料的要求。)
         </li>
       </ol>
     </div>

src/translations/en.json

@@ -42,7 +42,7 @@
   "atLeastNCharAccount": "{fieldname} Please enter at least {num} digits",
   "applyTickStr":"I acknowledge and confirm that the information provided above is correct.  I have also read and understood the above “Points to note”.",
   "applyTickUnderStr0":"Points to note:",
-  "applyTickUnderStr1":"<p>The applicant must ensure that the public notice submitted for publication in the Gazette is accurate and is the final version. The publication of a public notice in the Gazette reject public notices which are considered not suitable for publication. </p>",
+  "applyTickUnderStr1":"<p>The applicant must ensure that the public notice submitted for publication in the Gazette is accurate and is the final version. The Director of Government Logistics reserves the right to reject public notices which are considered not suitable for publication.</p>",
   "applyTickUnderStr2":"<p>For further details, please refer to the “<a href='/aboutUs' target= '_blank'>Notes on Publishing Public Notices in the Gazette through PNSPS</a>”.</p>",
   "applyTickUnderStr3":"<p>The personal data provided by the applicant in this form would be used for application of public notice publication and for assumption of liability. The personal data provided in this form may be disclosed to other bureaux / departments. The applicant has a right of access and correction with respect to personal data. Requests for access to or correction of personal data should be addressed to the Personal Data Privacy Officer, Government Logistics Department, 10/F, North Point Government Offices, 333 Java Road, North Point, Hong Kong. </p>",
   "submitted": "Submitted",
@@ -276,6 +276,7 @@
   "dnOverdueWarning": "Please settle the outstanding demand note(s) as soon as possible.",
   "noFile": "No file uploaded",
   "termsAndCondition": "Terms and Conditions",
+  "iConfirm": "I confirm that the information provided above is correct. I have also read and accepted the above terms and conditions.",
   "acceptTerms": "I accept",
   "rejectTerms": "I do not accept",
   "verify": "Verify",

src/translations/zh-CN.json

@@ -313,6 +313,7 @@
   "dnOverdueWarning": "请尽快缴付所有逾期未缴交的款項。",
   "noFile": "没有上传档案",
   "termsAndCondition": "条款和条件",
+  "iConfirm": "我确认上述提供的资料正确无误，和已阅读并接受上述条款和条件。",
   "acceptTerms": "我接受",
   "rejectTerms": "我不接受",
   "verify": "验证",

src/translations/zh-HK.json

@@ -311,6 +311,7 @@
   "dnOverdueWarning": "請盡快繳付所有逾期未繳交的款項。",
   "noFile": "沒有上傳檔案",
   "termsAndCondition": "條款和條件",
+  "iConfirm": "我確認上述提供的資料正確無誤，和已閱讀並接受上述條款和條件。",
   "acceptTerms": "我接受",
   "rejectTerms": "我不接受",
   "verify": "驗證",