From 2cc7870623aa1bbaa29b70c9261e494693dad373 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 19 Jan 2022 10:22:02 +0800
Subject: [PATCH 1/7] *Finish task #47951,47952,47953.

---
 module/bug/lang/en.php                     | 4 ++--
 module/report/lang/en.php                  | 1 +
 module/report/lang/zh-cn.php               | 1 +
 module/report/view/productsummary.html.php | 2 +-
 module/testreport/lang/de.php              | 2 +-
 module/testreport/lang/en.php              | 2 +-
 module/testreport/lang/fr.php              | 2 +-
 module/testreport/lang/vi.php              | 2 +-
 module/testtask/lang/de.php                | 2 +-
 module/testtask/lang/en.php                | 2 +-
 module/testtask/lang/fr.php                | 2 +-
 module/testtask/lang/vi.php                | 2 +-
 12 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index cceaed9529..8b8365bfa6 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -48,8 +48,8 @@ $lang->bug->confirmed        = 'Confirmed';
 $lang->bug->confirmedAB      = 'C';
 $lang->bug->toTask           = 'Convert to Task';
 $lang->bug->toStory          = 'Convert to Story';
-$lang->bug->feedbackBy       = 'From Name';
-$lang->bug->notifyEmail      = 'From Email';
+$lang->bug->feedbackBy       = 'Discover by';
+$lang->bug->notifyEmail      = 'Discoverer Email';
 $lang->bug->mailto           = 'Mailto';
 $lang->bug->openedBy         = 'ReportedBy';
 $lang->bug->openedByAB       = 'Reporter';
diff --git a/module/report/lang/en.php b/module/report/lang/en.php
index c7d84faebe..78310de1bc 100644
--- a/module/report/lang/en.php
+++ b/module/report/lang/en.php
@@ -18,6 +18,7 @@ $lang->report->undefined = 'Undefined';
 $lang->report->query     = 'Query';
 $lang->report->annual    = 'Annual Summary';
 $lang->report->project   = 'Project';
+$lang->report->PO        = 'PO';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php
index c88541dcd9..fda2ec11c4 100644
--- a/module/report/lang/zh-cn.php
+++ b/module/report/lang/zh-cn.php
@@ -18,6 +18,7 @@ $lang->report->undefined  = '未设定';
 $lang->report->query      = '查询';
 $lang->report->annual     = '年度总结';
 $lang->report->project    = '项目';
+$lang->report->PO         = 'PO';
 
 $lang->report->colors[]   = 'AFD8F8';
 $lang->report->colors[]   = 'F6BD0F';
diff --git a/module/report/view/productsummary.html.php b/module/report/view/productsummary.html.php
index ea2f786865..a0e07824e3 100644
--- a/module/report/view/productsummary.html.php
+++ b/module/report/view/productsummary.html.php
@@ -44,7 +44,7 @@
             <thead>
               <tr>
                 <th class='c-name'><?php echo $lang->product->name;?></th>
-                <th class='c-user'><?php echo $lang->product->PO;?></th>
+                <th class='c-user'><?php echo $lang->report->PO;?></th>
                 <th><?php echo $lang->productplan->common;?></th>
                 <th class="c-date"><?php echo $lang->productplan->begin;?></th>
                 <th class="c-date"><?php echo $lang->productplan->end;?></th>
diff --git a/module/testreport/lang/de.php b/module/testreport/lang/de.php
index 62ccfcc2e9..54686b680b 100644
--- a/module/testreport/lang/de.php
+++ b/module/testreport/lang/de.php
@@ -58,7 +58,7 @@ $lang->testreport->bugOpenedByGroups   = 'Nach Ersteller';
 $lang->testreport->bugResolvedByGroups = 'Nach Löser';
 $lang->testreport->bugResolutionGroups = 'Nach Lösung';
 $lang->testreport->bugModuleGroups     = 'Nach Modul';
-$lang->testreport->bugStageGroups      = 'Bug importance stage distribution';
+$lang->testreport->bugStageGroups      = 'Bug Priority distribution';
 $lang->testreport->bugHandleGroups     = 'Distribution of daily bug processing';
 $lang->testreport->legacyBugs          = 'Legacy Bugs';
 $lang->testreport->bugConfirmedRate    = 'Bestätigte Bugs Rate (Lösung ist gelöst oder verschoben / Status ist gelöst oder Geschlossen)';
diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php
index ccc73a6406..0b1ad805f7 100644
--- a/module/testreport/lang/en.php
+++ b/module/testreport/lang/en.php
@@ -59,7 +59,7 @@ $lang->testreport->bugOpenedByGroups   = 'Bug ReportedBy Distribution';
 $lang->testreport->bugResolvedByGroups = 'Bug ResolvedBy Distribution';
 $lang->testreport->bugResolutionGroups = 'Bug Resolution Distribution';
 $lang->testreport->bugModuleGroups     = 'Bug Module Distribution';
-$lang->testreport->bugStageGroups      = 'Bug importance stage distribution';
+$lang->testreport->bugStageGroups      = 'Bug Priority distribution';
 $lang->testreport->bugHandleGroups     = 'Distribution of daily bug processing';
 $lang->testreport->legacyBugs          = 'Left Bugs';
 $lang->testreport->bugConfirmedRate    = 'Confirmed-Bug Rate (Resolution is fixed or postponed / status is resolved or closed)';
diff --git a/module/testreport/lang/fr.php b/module/testreport/lang/fr.php
index 088f77044f..6fa0074fe7 100644
--- a/module/testreport/lang/fr.php
+++ b/module/testreport/lang/fr.php
@@ -58,7 +58,7 @@ $lang->testreport->bugOpenedByGroups   = 'Distribution Bug Signalé par';
 $lang->testreport->bugResolvedByGroups = 'Distribution Bug Résolu par';
 $lang->testreport->bugResolutionGroups = 'Distribution Bug Résolution';
 $lang->testreport->bugModuleGroups     = 'Distribution Bug Module';
-$lang->testreport->bugStageGroups      = 'Bug importance stage distribution';
+$lang->testreport->bugStageGroups      = 'Bug Priority distribution';
 $lang->testreport->bugHandleGroups     = 'Distribution of daily bug processing';
 $lang->testreport->legacyBugs          = 'Bugs Restants';
 $lang->testreport->bugConfirmedRate    = 'Taux de Bugs confirmés (Résolution est corrigée ou reportée / statut est résolu ou fermé)';
diff --git a/module/testreport/lang/vi.php b/module/testreport/lang/vi.php
index f5f273558e..d047eb4432 100644
--- a/module/testreport/lang/vi.php
+++ b/module/testreport/lang/vi.php
@@ -58,7 +58,7 @@ $lang->testreport->bugOpenedByGroups   = 'Phân chia người báo cáo Bug';
 $lang->testreport->bugResolvedByGroups = 'Phân chia người giải quyết Bug';
 $lang->testreport->bugResolutionGroups = 'Phân chia giải pháp Bug';
 $lang->testreport->bugModuleGroups     = 'Phân chia Module Bug';
-$lang->testreport->bugStageGroups      = 'Bug importance stage distribution';
+$lang->testreport->bugStageGroups      = 'Bug Priority distribution';
 $lang->testreport->bugHandleGroups     = 'Distribution of daily bug processing';
 $lang->testreport->legacyBugs          = 'Bug còn lại';
 $lang->testreport->bugConfirmedRate    = 'Đánh giá Bug đã xác nhận (Nghị quyết đã ban hành hoặc tạm hoãn / tình trạng được giải quyết hoặc đóng)';
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 080265c9a6..23ab812256 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -179,7 +179,7 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Bugersteller Bericht'
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Gelöst von Bericht';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Lösungsbersicht';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Bug Modul Bericht';
-$lang->testtask->report->charts['bugStageGroups']       = 'Bug importance stage distribution';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug Priority distribution';
 $lang->testtask->report->charts['bugHandleGroups']      = 'Distribution of daily bug processing';
 
 $lang->testtask->report->options = new stdclass();
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 3254494df6..2051aeaba3 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -189,7 +189,7 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Bug ReportedBy Distri
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Bug ResolvedBy Distribution';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Bug Resolution Distribution';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Bug Module Distribution';
-$lang->testtask->report->charts['bugStageGroups']       = 'Bug importance stage distribution';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug Priority distribution';
 $lang->testtask->report->charts['bugHandleGroups']      = 'Distribution of daily bug processing';
 
 $lang->testtask->report->options = new stdclass();
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 06c5692468..c9eabd8ac3 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -179,7 +179,7 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Distribution signalem
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Distribution Résolus par';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Distribution Résolution';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Distribution Bug Module';
-$lang->testtask->report->charts['bugStageGroups']       = 'Bug importance stage distribution';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug Priority distribution';
 $lang->testtask->report->charts['bugHandleGroups']      = 'Distribution of daily bug processing';
 
 $lang->testtask->report->options = new stdclass();
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index 500db063fd..7daac797f2 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -179,7 +179,7 @@ $lang->testtask->report->charts['bugOpenedByGroups']    = 'Phân chia người b
 $lang->testtask->report->charts['bugResolvedByGroups']  = 'Phân chia người giải quyết Bug';
 $lang->testtask->report->charts['bugResolutionGroups']  = 'Phân chia giải pháp Bug';
 $lang->testtask->report->charts['bugModuleGroups']      = 'Phân chia Module Bug';
-$lang->testtask->report->charts['bugStageGroups']       = 'Bug importance stage distribution';
+$lang->testtask->report->charts['bugStageGroups']       = 'Bug Priority distribution';
 $lang->testtask->report->charts['bugHandleGroups']      = 'Distribution of daily bug processing';
 
 $lang->testtask->report->options = new stdclass();

From 2b55df71abe4fba91d240f5fef693b8ae97c485d Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 19 Jan 2022 11:17:35 +0800
Subject: [PATCH 2/7] *Finish task #47951,47952,47953,47954.

---
 module/automation/css/browse.en.css | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/module/automation/css/browse.en.css b/module/automation/css/browse.en.css
index 99d720b04c..0fc3b5fa22 100644
--- a/module/automation/css/browse.en.css
+++ b/module/automation/css/browse.en.css
@@ -1,25 +1,14 @@
 .col-1, .col-xs-1 {width: 1%;}
 .col-10, .col-xs-10 {width: 98%;}
-
 .ztf-logo {width: 30%;}
 .zendata-logo { width: 30%;}
 .block-zendata {height:230px;}
-
-@media screen and (max-height: 768px)
-{
-  .qr-code {padding: 20px 0px 20px 43px;}
-  .block-details li {width: 50%;}
-  .block-details-line li {width: 100%;}
-  .ztf-download-trait div {width: 47%;}
-  .block-details {padding: 30px 60px;}
-  .block-zendata {padding: 30px 25px;}
-}
-
-@media screen and (max-height: 720px)
-{
-  .zendata-download {width: 68%;}
-  .ztf-download-trait {margin: 35px 0px 6px 0px;}
-  .block-zendata {padding: 30px 14px;}
-  .ztf-download {width: 58%;}
-  .qr-code {padding: 20px 0px 20px 32px;}
-}
+.block-details li {width: 50%;}
+.block-details-line li {width: 100%;}
+.ztf-download-trait div {width: 47%;}
+.block-details {padding: 30px 60px;}
+.zendata-download {width: 68%;}
+.ztf-download-trait {margin: 35px 0px 6px 0px;}
+.block-zendata {padding: 30px 14px;}
+.ztf-download {width: 58%;}
+.qr-code {padding: 20px 0px 20px 32px;}

From 8b511a77699469152c39e5993f91ce046966bea9 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 19 Jan 2022 15:28:00 +0800
Subject: [PATCH 3/7] *Finish task #47951,47952,47953,47954.

---
 module/automation/css/browse.en.css | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/module/automation/css/browse.en.css b/module/automation/css/browse.en.css
index 0fc3b5fa22..f13f6423ef 100644
--- a/module/automation/css/browse.en.css
+++ b/module/automation/css/browse.en.css
@@ -12,3 +12,23 @@
 .block-zendata {padding: 30px 14px;}
 .ztf-download {width: 58%;}
 .qr-code {padding: 20px 0px 20px 32px;}
+
+@media screen and (max-height: 768px)
+{
+  .qr-code {padding: 20px 0px 20px 43px;}
+  .block-details li {width: 50%;}
+  .block-details-line li {width: 100%;}
+  .ztf-download-trait div {width: 47%;}
+  .block-details {padding: 30px 60px;}
+  .block-zendata {padding: 30px 25px;}
+}
+
+@media screen and (max-height: 720px)
+{
+  .zendata-download {width: 68%;}
+  .ztf-download-trait {margin: 35px 0px 6px 0px;}
+  .block-zendata {padding: 30px 14px;}
+  .ztf-download {width: 58%;}
+  .qr-code {padding: 20px 0px 20px 32px;}
+}
+

From d3c427182ee32d8372c4bfc0568ff314b4fe1469 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 19 Jan 2022 15:32:43 +0800
Subject: [PATCH 4/7] *Finish task #47951,47952,47953,47954.

---
 module/automation/css/browse.en.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/automation/css/browse.en.css b/module/automation/css/browse.en.css
index f13f6423ef..8e017ae834 100644
--- a/module/automation/css/browse.en.css
+++ b/module/automation/css/browse.en.css
@@ -1,16 +1,17 @@
 .col-1, .col-xs-1 {width: 1%;}
 .col-10, .col-xs-10 {width: 98%;}
+
 .ztf-logo {width: 30%;}
 .zendata-logo { width: 30%;}
-.block-zendata {height:230px;}
+.block-zendata {height:230px; padding: 30px 14px;}
+.block-details {padding: 30px 60px;}
 .block-details li {width: 50%;}
 .block-details-line li {width: 100%;}
-.ztf-download-trait div {width: 47%;}
-.block-details {padding: 30px 60px;}
+
 .zendata-download {width: 68%;}
-.ztf-download-trait {margin: 35px 0px 6px 0px;}
-.block-zendata {padding: 30px 14px;}
 .ztf-download {width: 58%;}
+.ztf-download-trait {margin: 35px 0px 6px 0px;}
+.ztf-download-trait div {width: 47%;}
 .qr-code {padding: 20px 0px 20px 32px;}
 
 @media screen and (max-height: 768px)

From 84d17ed2492eb873e9b3b07512fff211fd091713 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 19 Jan 2022 15:43:11 +0800
Subject: [PATCH 5/7] *Finish task #47951,47952,47953,47954.

---
 module/automation/css/browse.en.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/automation/css/browse.en.css b/module/automation/css/browse.en.css
index 8e017ae834..82aed6fff5 100644
--- a/module/automation/css/browse.en.css
+++ b/module/automation/css/browse.en.css
@@ -32,4 +32,3 @@
   .ztf-download {width: 58%;}
   .qr-code {padding: 20px 0px 20px 32px;}
 }
-

From 638e65114b142b8496f98be53391fb38f21e2b0b Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 19 Jan 2022 16:36:28 +0800
Subject: [PATCH 6/7] *Finish task #47951,47952,47953,47954.

---
 module/automation/css/browse.en.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/automation/css/browse.en.css b/module/automation/css/browse.en.css
index 82aed6fff5..932989f227 100644
--- a/module/automation/css/browse.en.css
+++ b/module/automation/css/browse.en.css
@@ -10,9 +10,9 @@
 
 .zendata-download {width: 68%;}
 .ztf-download {width: 58%;}
-.ztf-download-trait {margin: 35px 0px 6px 0px;}
+.ztf-download-trait {margin: 35px 0 6px 0;}
 .ztf-download-trait div {width: 47%;}
-.qr-code {padding: 20px 0px 20px 32px;}
+.qr-code {padding: 20px 0 20px 32px;}
 
 @media screen and (max-height: 768px)
 {

From f458304c06f908b413ae82a79f3cd196a6bd7436 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 19 Jan 2022 16:43:20 +0800
Subject: [PATCH 7/7] *Finish task #47951,47952,47953,47954.

---
 module/bug/lang/en.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 8b8365bfa6..0acf9e744c 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -48,7 +48,7 @@ $lang->bug->confirmed        = 'Confirmed';
 $lang->bug->confirmedAB      = 'C';
 $lang->bug->toTask           = 'Convert to Task';
 $lang->bug->toStory          = 'Convert to Story';
-$lang->bug->feedbackBy       = 'Discover by';
+$lang->bug->feedbackBy       = 'Discovered by';
 $lang->bug->notifyEmail      = 'Discoverer Email';
 $lang->bug->mailto           = 'Mailto';
 $lang->bug->openedBy         = 'ReportedBy';