diff --git a/MoquiConf.xml b/MoquiConf.xml
index 15d6911..0c8f84c 100644
--- a/MoquiConf.xml
+++ b/MoquiConf.xml
@@ -7,9 +7,9 @@
location="component://PopCommerce/screen/PopCommerceRoot.xml"/>
-
-
diff --git a/data/PopCommerceAaaSetupData.xml b/data/PopCommerceAaaSetupData.xml
index 0b6b25a..653de79 100644
--- a/data/PopCommerceAaaSetupData.xml
+++ b/data/PopCommerceAaaSetupData.xml
@@ -21,15 +21,15 @@ along with this software (see the LICENSE.md file). If not, see
-->
-
+
-
-
+
+
@@ -38,7 +38,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -47,7 +47,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -56,7 +56,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -65,36 +65,36 @@ along with this software (see the LICENSE.md file). If not, see
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -105,7 +105,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -124,7 +124,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -134,7 +134,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -151,7 +151,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -171,7 +171,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -190,7 +190,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -213,7 +213,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -242,7 +242,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -267,7 +267,7 @@ along with this software (see the LICENSE.md file). If not, see
-
+
@@ -276,9 +276,9 @@ along with this software (see the LICENSE.md file). If not, see
-
+
+ description="电商默认主题"/>
-
+ fromAddress="noreply@moqui.org" fromName="电商演示" ccAddresses="" bccAddresses="" sendPartial="Y"
+ subject="${fromName} 订单 ${orderId}"/>
-
-
-
-
+
-
-
+
-
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="wang.popc@upservce.com">
-
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="chen.accounting@upservce.com">
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="li.catalog@upservce.com">
-
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="zhou.purchasing@upservce.com">
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="liu.sales@upservce.com">
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="lin.sales.sup@upservce.com">
-
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="zhang.warehouse@upservce.com">
-
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="wang.wh.clerical@upservce.com">
-
-
+
+
+
-
+
-
+ passwordHint="莫基框架名，小写字母" currencyUomId="USD" locale="en_US" timeZone="US/Pacific"
+ emailAddress="Yang.wh.general@upservce.com">
diff --git a/data/PopCommerceL10nData.xml b/data/PopCommerceL10nData.xml
new file mode 100755
index 0000000..e38fb38
--- /dev/null
+++ b/data/PopCommerceL10nData.xml
@@ -0,0 +1,1334 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/screen/PopCommerceRoot.xml b/screen/PopCommerceRoot.xml
index e32f2da..7771447 100644
--- a/screen/PopCommerceRoot.xml
+++ b/screen/PopCommerceRoot.xml
@@ -116,7 +116,7 @@ along with this software (see the LICENSE.md file). If not, see
]]>
-
+