svn commit: r1207005 [1/9] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/servicedef/ applications/commonext/config/ applications/commonext/data/ applications/commonext/widget/ applications/content/ ...

[sa...@apache.org]

Author: sascharodekamp
Date: Mon Nov 28 08:04:21 2011
New Revision: 1207005

URL: http://svn.apache.org/viewvc?rev=1207005&view=rev
Log:
Update the Jackrabbit branch with the current trunk version to keep the branch up to date

Added:
    ofbiz/branches/jackrabbit20100709/applications/content/widget/WebAnalyticsScreens.xml
      - copied unchanged from r1207000, ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml
    ofbiz/branches/jackrabbit20100709/applications/content/widget/website/WebAnalyticsForms.xml
      - copied unchanged from r1207000, ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml
    ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml
      - copied unchanged from r1207000, ofbiz/trunk/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml
    ofbiz/branches/jackrabbit20100709/applications/product/testdef/GroupOrderTest.xml
      - copied unchanged from r1207000, ofbiz/trunk/applications/product/testdef/GroupOrderTest.xml
    ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.22.annotations-api.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.22.annotations-api.jar
    ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.22.el-api.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.22.el-api.jar
    ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.22.jsp-api.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.22.jsp-api.jar
    ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-7.0.22.servlet-api.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-7.0.22.servlet-api.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/ecj-3.7.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/ecj-3.7.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22-tomcat-juli-adapters.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22-tomcat-juli-adapters.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22-tomcat-juli.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22-tomcat-juli.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.catalina-ant.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.catalina-ant.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.catalina-ha.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.catalina-ha.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.catalina-tribes.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.catalina-tribes.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.catalina.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.catalina.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.jasper-el.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.jasper-el.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.jasper.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.jasper.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-api.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.tomcat-api.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-coyote.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.tomcat-coyote.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-dbcp.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.tomcat-dbcp.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-es.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-es.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-fr.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-fr.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-ja.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.tomcat-i18n-ja.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-7.0.22.tomcat-util.jar
      - copied unchanged from r1207000, ofbiz/trunk/framework/catalina/lib/tomcat-7.0.22.tomcat-util.jar
    ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy
      - copied unchanged from r1207000, ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy
Removed:
    ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/WebAnalyticsForms.xml
    ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/WebAnalyticsScreens.xml
    ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.33.annotations-api.jar
    ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.33.el-api.jar
    ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.33.jsp-api.jar
    ofbiz/branches/jackrabbit20100709/framework/base/lib/j2eespecs/tomcat-6.0.33.servlet-api.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/ecj-3.3.1.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33-tomcat-juli-adapters.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33-tomcat-juli.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.catalina-ant.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.catalina-ha.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.catalina-tribes.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.catalina.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.jasper-el.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.jasper.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-coyote.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-dbcp.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-es.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-fr.jar
    ofbiz/branches/jackrabbit20100709/framework/catalina/lib/tomcat-6.0.33.tomcat-i18n-ja.jar
Modified:
    ofbiz/branches/jackrabbit20100709/   (props changed)
    ofbiz/branches/jackrabbit20100709/.classpath
    ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingErrorUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/accounting/servicedef/secas_olap.xml
    ofbiz/branches/jackrabbit20100709/applications/commonext/config/CommonExtUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/commonext/config/SetupUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/commonext/data/EntityDiagramGroupData.xml
    ofbiz/branches/jackrabbit20100709/applications/commonext/widget/CommonScreens.xml
    ofbiz/branches/jackrabbit20100709/applications/content/build.xml
    ofbiz/branches/jackrabbit20100709/applications/content/config/ContentEntityLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/content/config/ContentErrorUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/content/config/ContentUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/content/data/ContentTypeData.xml
    ofbiz/branches/jackrabbit20100709/applications/content/entitydef/entitymodel.xml
    ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/search/ContentDocument.java
    ofbiz/branches/jackrabbit20100709/applications/content/src/org/ofbiz/content/search/SearchWorker.java
    ofbiz/branches/jackrabbit20100709/applications/content/template/mime-type/image.ftl
    ofbiz/branches/jackrabbit20100709/applications/content/webapp/content/WEB-INF/controller.xml
    ofbiz/branches/jackrabbit20100709/applications/content/widget/CommonScreens.xml
    ofbiz/branches/jackrabbit20100709/applications/content/widget/content/ContentMenus.xml
    ofbiz/branches/jackrabbit20100709/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/marketing/entitydef/entitymodel.xml
    ofbiz/branches/jackrabbit20100709/applications/marketing/widget/sfa/forms/OpportunityForms.xml
    ofbiz/branches/jackrabbit20100709/applications/order/config/OrderEntityLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml
    ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml
    ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml
    ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml
    ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml
    ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
    ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml
    ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
    ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml
    ofbiz/branches/jackrabbit20100709/applications/product/entitydef/eecas.xml
    ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml
    ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml
    ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductServices.xml
    ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
    ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml
    ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml
    ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml
    ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml
    ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductScreens.xml
    ofbiz/branches/jackrabbit20100709/build.xml
    ofbiz/branches/jackrabbit20100709/framework/base/config/ofbiz-containers.xml
    ofbiz/branches/jackrabbit20100709/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
    ofbiz/branches/jackrabbit20100709/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java
    ofbiz/branches/jackrabbit20100709/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java
    ofbiz/branches/jackrabbit20100709/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java
    ofbiz/branches/jackrabbit20100709/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/jackrabbit20100709/framework/entity/dtd/entitymodel.xsd
    ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
    ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java
    ofbiz/branches/jackrabbit20100709/framework/testtools/src/org/ofbiz/testtools/seleniumxml/RemoteRequest.java
    ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
    ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlFormMacroLibrary.ftl
    ofbiz/branches/jackrabbit20100709/framework/widget/templates/htmlScreenMacroLibrary.ftl
    ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/data/DemoProduct.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
    ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
    ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CustomerScreens.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/entitydef/entitymodel.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/CommonScreens.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/ResourceForms.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/ResourceScreens.xml
    ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/widget/scrumMenus.xml
    ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl
    ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl
    ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl
    ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
    ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl
    ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/maincss.css
    ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl
    ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css

Propchange: ofbiz/branches/jackrabbit20100709/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 28 08:04:21 2011
@@ -2,4 +2,4 @@
 /ofbiz/branches/dojo1.4:951708-952957
 /ofbiz/branches/jquery:952958-1044489
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:962442-1202158
+/ofbiz/trunk:962442-1207000

Modified: ofbiz/branches/jackrabbit20100709/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/.classpath?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/.classpath (original)
+++ ofbiz/branches/jackrabbit20100709/.classpath Mon Nov 28 08:04:21 2011
@@ -88,10 +88,10 @@
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.33.annotations-api.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.33.el-api.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.33.jsp-api.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.33.servlet-api.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.annotations-api.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.el-api.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.jsp-api.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-7.0.22.servlet-api.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/>
@@ -121,17 +121,19 @@
     <classpathentry kind="lib" path="framework/birt/lib/saaj.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/scriptapi.jar"/>
     <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.3.1.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33-tomcat-juli-adapters.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33-tomcat-juli.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.catalina-ant.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.catalina-ha.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.catalina-tribes.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.catalina.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.jasper-el.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.jasper.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.tomcat-coyote.jar"/>
-    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.33.tomcat-dbcp.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/ecj-3.7.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22-tomcat-juli-adapters.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22-tomcat-juli.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-ant.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-ha.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina-tribes.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.catalina.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.jasper-el.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.jasper.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-coyote.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-dbcp.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-api.jar"/>
+    <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.22.tomcat-util.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar"/>
     <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
     <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingEntityLabels.xml Mon Nov 28 08:04:21 2011
@@ -3562,6 +3562,7 @@
         <value xml:lang="nl">eBay</value>
         <value xml:lang="pt">eBay</value>
         <value xml:lang="th">อีเบย์</value>
+        <value xml:lang="zh">eBay</value>
     </property>
     <property key="PaymentMethodType.description.EXT_OFFLINE">
         <value xml:lang="de">Zahlung nicht im Netz</value>

Modified: ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingErrorUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/accounting/config/AccountingErrorUiLabels.xml Mon Nov 28 08:04:21 2011
@@ -23,302 +23,362 @@
         <value xml:lang="en">Could not find RateAmount record to be deleted</value>
         <value xml:lang="it">Non è possibile trovare un record di RateAmount che deve essere cancellato</value>
         <value xml:lang="pt">Não foi possível localizar o registro a ser excluído RateAmount</value>
+        <value xml:lang="zh">找不到要删除的费率金额（RateAmount）记录</value>
     </property>
     <property key="AccountingEftAccountCannotBeCreated">
         <value xml:lang="en">ERROR: Could not create payment method Id (id generation failure)</value>
         <value xml:lang="it">ERRORE: Non è possibile creare il metodo pagamento (fallimento generazione id)</value>
         <value xml:lang="pt">ERRO: Não foi possível criar Id de étodo de pagamento (falha ao gerar ID)</value>
+        <value xml:lang="zh">错误：无法创建支付方法标识（生成标识时失败）</value>
     </property>
     <property key="AccountingEftAccountCannotBeCreatedWriteFailure">
         <value xml:lang="en">ERROR: Could not create EFT account (write failure): ${errorString}</value>
         <value xml:lang="it">ERRORE: Non è possibile creare il conto EFT (fallita scrittura): ${errorString}</value>
         <value xml:lang="pt">ERRO: Não foi possível criar conta de EFT (falha de escrita): ${errorString}</value>
+        <value xml:lang="zh">错误：无法创建电子资金转账账户（写操作失败）：${errorString}</value>
     </property>
     <property key="AccountingEftAccountCannotBeUpdated">
         <value xml:lang="en">ERROR: Could not update EFT Account (write failure): ${errorString}</value>
         <value xml:lang="it">ERRORE: Non è possibile aggiornare il conto EFT (scrittura fallita): ${errorString}</value>
         <value xml:lang="pt">ERRO: Não foi possível atualizar Conta EFT (falha de escrita): ${errorString}</value>
+        <value xml:lang="zh">错误：无法更新电子资金转账账户（写操作失败）：${errorString}</value>
     </property>
     <property key="AccountingEftAccountCannotBeUpdatedReadFailure">
         <value xml:lang="en">ERROR: Could not update EFT Account (read error): ${errorString}</value>
         <value xml:lang="it">ERRORE: Non è possibile aggiornare il conto EFT (fallita lettura): ${errorString}</value>
         <value xml:lang="pt">ERRO: Não foi possível atualizar Conta EFT (erro de leitura): ${errorString}</value>
+        <value xml:lang="zh">错误：无法更新电子资金转账账户（读取时出错）：${errorString}</value>
     </property>
     <property key="AccountingEftPartyNotAuthorized">
         <value xml:lang="en">Party Id ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
         <value xml:lang="it">Il soggetto ${partyId} non è il propretario del metodo di pagamento ${paymentMethodId} non hai il permesso per cambiarlo.</value>
         <value xml:lang="pt">Participante com ID ${partyId} não é o proprietário do método de pagamento de US ${paymentMethodId} e não têm permissão para alterá-lo.</value>
+        <value xml:lang="zh">会员标识 ${partyId} 不是支付方法 ${paymentMethodId} 的拥有者，无权修改它。</value>
     </property>
     <property key="AccountingFinAccountAuthorizationExpired">
         <value xml:lang="en">Authorization transaction ${paymentGatewayResponseId} has expired as of ${authExpiration}</value>
         <value xml:lang="it">Autorizzazione transazione ${paymentGatewayResponseId} ha una scadenza del ${authExpiration}</value>
         <value xml:lang="pt">Autorização de transação de ${paymentGatewayResponseId} expirou como de ${authExpiration}</value>
+        <value xml:lang="zh">授权交易 ${paymentGatewayResponseId} 已过期，原因是 ${authExpiration}</value>
     </property>
     <property key="AccountingFinAccountCancelled">
         <value xml:lang="en">Account has been cancelled</value>
         <value xml:lang="it">Il conto è stato cancellato</value>
         <value xml:lang="pt">Conta foi cancelada</value>
+        <value xml:lang="zh">账户已被取消了</value>
     </property>
     <property key="AccountingFinAccountCannotBeAuthorized">
         <value xml:lang="en">Cannot authorize financial account due to: ${errorString}</value>
         <value xml:lang="it">Non è possibile autorizzare il conto finanziario per: ${errorString}</value>
         <value xml:lang="pt">Não é possível autorizar a conta financeira decorrente de: ${errorString}</value>
+        <value xml:lang="zh">无法授权财务账目，原因是：${errorString}</value>
     </property>
     <property key="AccountingFinAccountCannotBeExpired">
         <value xml:lang="en">Unable to expire financial account authorization: </value>
         <value xml:lang="it">Non è possibile cancellare l'autorizzazione per il conto finanziario: </value>
         <value xml:lang="pt">Incapaz de expirar a autorização da conta financeira:</value>
+        <value xml:lang="zh">无法过期财务账目授权：</value>
     </property>
     <property key="AccountingFinAccountCannotBeRefunded">
         <value xml:lang="en">Available balance does not match the actual balance; pending authorizations; cannot refund FinAccount at this time.</value>
         <value xml:lang="it">Bilancio disponibilie non corrisponde all'attuale bilancio; autorizzazioni in attesa; non è possibile rimborsare il conto finanziario in questo momento.</value>
         <value xml:lang="pt">Saldo disponível não corresponde ao saldo real, autorizações pendentes; não é possível reembolsar FinAccount neste momento.</value>
+        <value xml:lang="zh">可动用结余与实际结余不一致；暂停授权；本次无法退款到财务账目。</value>
     </property>
     <property key="AccountingFinAccountCannotBeReplenish">
         <value xml:lang="en">Cannot locate product store from previous deposits; product store cannot be empty</value>
         <value xml:lang="it">Non è possibile localizzare il negozio dei precedenti depositi; il negozio non può essere vuoto</value>
         <value xml:lang="pt">Não é possível localizar loja de produtos de depósitos anteriores; loja de produtos não pode estar vazia</value>
+        <value xml:lang="zh">无法从以前的存款确定产品店铺；产品店铺不能为空</value>
     </property>
     <property key="AccountingFinAccountCannotCapture">
         <value xml:lang="en">No authorization transaction found for the OrderPaymentPreference; cannot capture</value>
         <value xml:lang="it">Nessuna transazione di autorizzazione trovata per le preferenze pagamento ordine; non è possibile catturare</value>
         <value xml:lang="pt">Nenhuma autorização de transação encontrado para a OrderPaymentPreference; não é possível capturar</value>
+        <value xml:lang="zh">找不到用于这个订单支付引用（OrderPaymentPreference）的授权交易；无法捕捉</value>
     </property>
     <property key="AccountingFinAccountCannotCreate">
         <value xml:lang="en">Unable to create financial accout; no productStoreId on OrderHeader: ${orderId}</value>
         <value xml:lang="it">Non è possibile creare conto finanziario; nessun negozio impostato sulla testata ordine: ${orderId}</value>
         <value xml:lang="pt">Não é possível criar accout financeira; sem productStoreId em OrderHeader: ${orderId}</value>
+        <value xml:lang="zh">无法创建财务账目；订单头（OrderHeader）中没有产品店铺标识（productStoreId），订单编号：${orderId}</value>
     </property>
     <property key="AccountingFinAccountCannotCreateTransaction">
         <value xml:lang="en">Unable to create financial account transaction!</value>
         <value xml:lang="it">Non è possibile creare un transazione di un conto finanziario!</value>
         <value xml:lang="pt">Não é possível criar transação na conta de financeiras!</value>
+        <value xml:lang="zh">无法执行创建财务账目事务！</value>
     </property>
     <property key="AccountingFinAccountCannotCreditAccount">
         <value xml:lang="en">Could not find or create a service credit account</value>
         <value xml:lang="it">Non è possibile trovare o creare un servizio di accredito conto</value>
         <value xml:lang="pt">Não foi possível encontrar ou criar um serviço de conta de crédito</value>
+        <value xml:lang="zh">无法找到或创建一个服务信用账户</value>
     </property>
     <property key="AccountingFinAccountCannotFindAuthorization">
         <value xml:lang="en"> Could not find authorization transaction.</value>
         <value xml:lang="it"> Non è possibile trovare la transazione di autorizzazione.</value>
         <value xml:lang="pt">Não foi possível encontrar autorização para a transação.</value>
+        <value xml:lang="zh">无法找到授权事务。</value>
     </property>
     <property key="AccountingFinAccountCannotLocateItFromAccountCode">
         <value xml:lang="en">Unable to locate financial account from account code</value>
         <value xml:lang="it">Non è possibile localizzare il conto finanziario dal codice conto</value>
         <value xml:lang="pt">Não foi possível localizar a conta financeira do código de conta</value>
+        <value xml:lang="zh">无法从账目代码得到财务账目</value>
     </property>
     <property key="AccountingFinAccountCannotPost">
         <value xml:lang="en">Cannot post FinAccountTrans with ID ${parameters.finAccountTransId} to GL, could not find ${creditDebit} ${requiredField}</value>
         <value xml:lang="it">Non post FinAccountTrans con ID ${parameters.finAccountTransId} in GL, could not find ${creditDebit} ${requiredField}</value>
         <value xml:lang="pt">Não é possível enviar FinAccountTrans com ID ${parameters.finAccountTransId} para conntabilidade, não foi possível encontrar ${creditDebit} ${requiredField}</value>
+        <value xml:lang="zh">无法把标识为 ${parameters.finAccountTransId} 的财务账目交易提交到普通日记账中，无法找到 ${creditDebit} ${requiredField}</value>
     </property>
     <property key="AccountingFinAccountExpired">
         <value xml:lang="en">Account has expired as of ${thruDate}</value>
         <value xml:lang="it">Conto scaduto dal ${thruDate}</value>
         <value xml:lang="pt">Conta expirou a partir de ${thruDate}</value>
+        <value xml:lang="zh">账目已过期，过期日期为 ${thruDate}</value>
     </property>
     <property key="AccountingFinAccountFrozen">
         <value xml:lang="en">Account is currently frozen</value>
         <value xml:lang="it">Il conto è attualmente congelato</value>
         <value xml:lang="pt">Conta está congelada</value>
+        <value xml:lang="zh">账目目前已被冻结</value>
     </property>
     <property key="AccountingFinAccountIdAndFinAccountCodeAreNull">
         <value xml:lang="en">Both finAccountId and finAccountCode cannot be null; at least one is required</value>
         <value xml:lang="it">Entrambi finAccountId e finAccountCode non possono essere nulli; al minimo uno è richiesto</value>
         <value xml:lang="pt">Ambos finAccountId e finAccountCode não podem ser nulos, pelo menos um é necessário</value>
+        <value xml:lang="zh">财务账目标识（finAccountId）和财务账目代码（finAccountCode）不能同时为空；至少要提供一个</value>
     </property>
     <property key="AccountingFinAccountIdInvalid">
         <value xml:lang="en">Invalid financial account; cannot locate account</value>
         <value xml:lang="it">Conto finanziario invalido; non è possibile localizzare il conto</value>
         <value xml:lang="pt">Conta financeira Inválida, não é possível localizar a conta</value>
+        <value xml:lang="zh">无效的财务账目；无法找到账目</value>
     </property>
     <property key="AccountingFinAccountInactiveStatusError">
         <value xml:lang="en">FinAccount must be in active status</value>
         <value xml:lang="fr">Le compte financier doit être dans un état actif</value>
         <value xml:lang="pt">FinAccount deve estar no estado ativo</value>
+        <value xml:lang="zh">财务账目（FinAccount）必须处于有效状态</value>
     </property>
     <property key="AccountingFinAccountIsNotRefundable">
         <value xml:lang="en">Account is not refunable</value>
         <value xml:lang="it">Il conto non è rimborsabile</value>
         <value xml:lang="pt">Conta não é reembolsável</value>
+        <value xml:lang="zh">账目是不可偿还的</value>
     </property>
     <property key="AccountingFinAccountMustBePositive">
         <value xml:lang="en">Amount should be a positive number.</value>
         <value xml:lang="it">L'importo dovrebbe essere un numero positivo.</value>
         <value xml:lang="pt">Quantia deve ser um número positivo.</value>
+        <value xml:lang="zh">金额应该是个正数。</value>
     </property>
     <property key="AccountingFinAccountNegative">
         <value xml:lang="en">Account is currently negative and pending replenishment</value>
         <value xml:lang="it">Il conto è attualmente negativo e in attesa di rifornimento</value>
         <value xml:lang="pt">Conta está negativa e com reposição pendente</value>
+        <value xml:lang="zh">账目目前是负的，并且暂停补充</value>
     </property>
     <property key="AccountingFinAccountNoPaymentMethodAssociatedWithReplenishAccount">
         <value xml:lang="en">No payment method associated with replenish account</value>
         <value xml:lang="it">Nessun metodo pagamento associtao con il conto di rifornimento</value>
         <value xml:lang="pt">Nenhum método de pagamento associado à reposição de conta</value>
+        <value xml:lang="zh">补充账户没有关联支付方法</value>
     </property>
     <property key="AccountingFinAccountNotFound">
         <value xml:lang="en">No finAccountId found ${finAccountId}</value>
         <value xml:lang="it">Conto finanziario non trovato ${finAccountId}</value>
         <value xml:lang="pt">Não foi possível encontrar finAccountId ${finAccountId}</value>
+        <value xml:lang="zh">找不到财务账目标识（finAccountId） ${finAccountId}</value>
     </property>
     <property key="AccountingFinAccountPartiallyRefunded">
         <value xml:lang="en">FinAccount partially refunded; not enough replenish deposits to refund!</value>
         <value xml:lang="it">Conto finanziario parzialmente rimborsato; non ci sono abbastanza depositi per il rifornimento da rimborsare!</value>
         <value xml:lang="pt">FinAccount parcialmente reembolsada, não há depósitos de reposição suficiente para reembolsar!</value>
+        <value xml:lang="zh">财务账目（FinAccount）部分还款；补充储蓄不足以还款！</value>
     </property>
     <property key="AccountingFinAccountPinCodeCombinatorNotFound">
         <value xml:lang="en">Financial account PIN/CODE combination not found</value>
         <value xml:lang="it">Conto finanziario combinazione PIN/CODE non trovata</value>
         <value xml:lang="pt">Conta financeira PIN/Código não encontrada</value>
+        <value xml:lang="zh">无法找到财务账目的这个密码/代码（PIN/CODE）组合</value>
     </property>
     <property key="AccountingFinAccountSetting">
         <value xml:lang="en">No settings found for store ${productStoreId} for fin account type ${finAccountTypeId}</value>
         <value xml:lang="it">Nessuna configurazione trovata per il negozio ${productStoreId} per il tipo conto finanziario ${finAccountTypeId}</value>
         <value xml:lang="pt">Nenhuma configuração encontrada para a loja ${productStoreId} para conta financeira de tipo ${finAccountTypeId}</value>
+        <value xml:lang="zh">没有找到店铺 ${productStoreId} 的设置，用于财务账目类型 ${finAccountTypeId}</value>
     </property>
     <property key="AccountingFinAccountStatusNotValidError">
         <value xml:lang="en">FinAccount not in valid status</value>
         <value xml:lang="fr">Le compte financier n'est pas dans un état valide</value>
         <value xml:lang="pt">FinAccount não tem estado válido</value>
+        <value xml:lang="zh">财务账目（FinAccount）不处于有效状态</value>
     </property>
     <property key="AccountingFinAccountUnknownReplenishMethod">
         <value xml:lang="en">Unknown replenish method found</value>
         <value xml:lang="it">Metodo rifornimento sconosciuto</value>
         <value xml:lang="pt">Método desconhecido para reabastecer encontrados</value>
+        <value xml:lang="zh">找到的补充方法未知</value>
     </property>
     <property key="AccountingGiftCardCannotBeCreated">
         <value xml:lang="en">ERROR: Could not create GiftCard (id generation failure)</value>
         <value xml:lang="it">ERRORE: Non è possibile creare la carta regalo (fallita generazione id)</value>
         <value xml:lang="pt">ERRO: Não foi possível criar vale presente (falha ao gerar ID)</value>
+        <value xml:lang="zh">错误：无法创建礼品卡 (生成标识时出错）</value>
     </property>
     <property key="AccountingGiftCardCannotBeCreatedWriteFailure">
         <value xml:lang="en">ERROR: Could not create GiftCard (write failure): ${errorString}</value>
         <value xml:lang="it">ERRORE: Non è possibile creare la carta regalo (fallita scrittura): ${errorString}</value>
         <value xml:lang="pt">ERRO: Não foi possível criar vale presente (falha de escrita): ${errorString}</value>
+        <value xml:lang="zh">错误：无法创建礼品卡（写操作失败）：${errorString}</value>
     </property>
     <property key="AccountingGiftCardCannotBeUpdated">
         <value xml:lang="en">ERROR: Could not get GiftCard to update (read error): ${errorString}</value>
         <value xml:lang="it">ERRORE: Non è possibile aggiornare la carta regalo (fallita lettura): ${errorString}</value>
         <value xml:lang="pt">ERRO: Não foi possível obter vale presente para atualizar (erro de leitura): ${errorString}</value>
+        <value xml:lang="zh">错误：无法得到要更新的礼品卡（读取失败）：${errorString}</value>
     </property>
     <property key="AccountingGiftCardPartyNotAuthorized">
         <value xml:lang="en">Party Id ${partyId} is not the owner of payment method ${paymentMethodId} and does not have permission to change it.</value>
         <value xml:lang="it">Il soggetto ${partyId} non è il propretario del metodo di pagamento ${paymentMethodId} non hai il permesso per cambiarlo.</value>
         <value xml:lang="pt">ID de Participante ${partyId} não é o proprietário do método de pagamento de ${paymentMethodId} e não têm permissão para alterá-lo.</value>
+        <value xml:lang="zh">标识为 ${partyId} 的会员不是支付方法 ${paymentMethodId} 的拥有者，无权修改它。</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotAuthorize">
         <value xml:lang="en">Cannot authorize gift certificate due to: ${errorString}</value>
         <value xml:lang="it">Non è possibile autorizzare la carta regalo: ${errorString}</value>
         <value xml:lang="pt">Não é possível autorizar o certificado de presente devido a:  ${errorString}</value>
+        <value xml:lang="zh">无法授权礼券，原因：${errorString}</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotBeExpired">
         <value xml:lang="en">Unable to expire financial account authorization for Gift Certificate: </value>
         <value xml:lang="it">Non è possibile cancellare l'autorizzazione per il conto finanziario per il certificato regalo: </value>
         <value xml:lang="pt">Incapaz de expirar a autorização para a conta financeira para vale presente:</value>
+        <value xml:lang="zh">无法令礼券的财务账目授权失效，礼券为：</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotFulfill">
         <value xml:lang="en">No product associated with OrderItem, cannot fulfill gift card</value>
         <value xml:lang="it">Nessun prodotto associato alla riga ordine, non è possibile processare l'acquisto con carta regalo</value>
         <value xml:lang="pt">Nenhum produto associado OrderItem, não é possível honrar o cartão de presente</value>
+        <value xml:lang="zh">没有产品与订单明细关联，无法应用礼品卡</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotFulfillFromSurveyAnswers">
         <value xml:lang="en">Unable to get survey response answers from survey response; cannot fulfill gift card</value>
         <value xml:lang="it">Non è possibile ottenere la risposta sondaggio dalle domande; non è possibile caricare la carta regalo</value>
         <value xml:lang="pt">Não foi possível obter respostas da pesquisa, não pode atender ao cartão de presente</value>
+        <value xml:lang="zh">无法从调查答复中获得调查答复的回答；不能应用礼品卡</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotGetPaymentConfiguration">
         <value xml:lang="en">Unable to get payment configuration file</value>
         <value xml:lang="it">Non è possibile ottenere il file configurazione pagamento</value>
         <value xml:lang="pt">Impossível obter arquivo de configuração de pagamento</value>
+        <value xml:lang="zh">无法获得支付配置文件</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotLocateItFromOrderPaymentPreference">
         <value xml:lang="en">Unable to get GiftCard from OrderPaymentPreference</value>
         <value xml:lang="it">Non è possibile localizzare il certificato regalo dalla preferenze pagamento dell'ordine</value>
         <value xml:lang="pt">Não foi possível obter vale presente de OrderPaymentPreference</value>
+        <value xml:lang="zh">不能从订单支付设置中获得礼品卡</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotProcess">
         <value xml:lang="en">Unable to process gift card purchase; no productStoreId on OrderHeader: ${orderId}</value>
         <value xml:lang="it">Non è possibile processare l'acquisto con la carta regalo; nessun negozio impostato sulla testata ordine: ${orderId}</value>
         <value xml:lang="pt">Não é possível processar de compra com o cartão do presente, sem productStoreId em OrderHeader: ${orderId}</value>
+        <value xml:lang="zh">无法处理礼品卡购物；订单头中没有产品店铺标识，订单标识：${orderId}</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotRelease">
         <value xml:lang="en">Attempt to release GiftCard payment failed; not a valid GiftCard record</value>
         <value xml:lang="it">Tentivo di rilasciare il pagamento carta regalo fallito; non c'è un record valido</value>
         <value xml:lang="pt">Tentativa de liberar o pagamento GiftCard falhou; não é registro válido GiftCard</value>
+        <value xml:lang="zh">尝试释放礼品卡支付时失败；不是有效的礼品卡记录</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotReload">
         <value xml:lang="en">Unable to process gift card reload; no productStoreId on OrderHeader: ${orderId}</value>
         <value xml:lang="it">Non è possibile processare la ricarica con la carta regalo; nessun negozio impostato sulla testata ordine: ${orderId}</value>
         <value xml:lang="pt">Não foi possível processar a recarga do cartão de presente, sem productStoreId em OrderHeader: ${orderId}</value>
+        <value xml:lang="zh">无法处理礼品卡重新载入；订单头中没有产品店铺标识，订单标识：${orderId}</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotReloadFromSurveyAnswers">
         <value xml:lang="en">Unable to get survey response answers from survey response; cannot fulfill gift card reload</value>
         <value xml:lang="it">Non è possibile ottenere l'informazione relativa alla risposta sondaggio dalle domande; non è possibile ricaricare la carta regalo</value>
         <value xml:lang="pt">Não foi possível obter respostas da pesquisa, não é possível realizar recarga do cartão do presente</value>
+        <value xml:lang="zh">无法从调查答复中获得调查答复的回答；不能重新载入礼品卡</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotSendEmailNotice">
         <value xml:lang="en">Error sending Gift Card notice email:  ${errorString}</value>
         <value xml:lang="it">Non è possibile inviaria email di notifica carta regalo: ${errorString}</value>
         <value xml:lang="pt">Erro ao enviar e-mail de aviso do cartão de presente: ${errorString}</value>
+        <value xml:lang="zh">发送礼品卡通知邮件时出错：${errorString}</value>
     </property>
     <property key="AccountingGiftCerticateNumberCannotStoreFulfillmentInfo">
         <value xml:lang="en">Unable to store fulfillment info:  ${errorString}</value>
         <value xml:lang="it">Non è possibile registrazione le informazioni di ricarica: ${errorString}</value>
         <value xml:lang="pt">Não é possível armazenar informações de cumprimento: ${errorString}</value>
+        <value xml:lang="zh">无法存储执行信息：${errorString}</value>
     </property>
     <property key="AccountingGiftCerticateNumberCreationError">
         <value xml:lang="en">Unable to create gift certificate number.</value>
         <value xml:lang="it">Non è possibile creare un numero certificato regalo.</value>
         <value xml:lang="pt">Não é possível criar o número do vale presente.</value>
+        <value xml:lang="zh">无法新建礼券编号。</value>
     </property>
     <property key="AccountingGiftCerticateNumberExpired">
         <value xml:lang="en">Gift certificate has expired as of  ${thruDate}</value>
         <value xml:lang="it">Certificato regalo scaduto dal ${thruDate}</value>
         <value xml:lang="pt">O cartão de presente expirou a partir de ${thruDate}</value>
+        <value xml:lang="zh">礼券已过期，过期日期是 ${thruDate}</value>
     </property>
     <property key="AccountingGiftCerticateNumberNotFound">
         <value xml:lang="en">Gift certificate not found ${finAccountId}</value>
         <value xml:lang="it">Certificato regalo non trovato ${finAccountId}</value>
         <value xml:lang="pt">Cartão de presente não encontrado ${finAccountId}</value>
+        <value xml:lang="zh">找不到礼券 ${finAccountId}</value>
     </property>
     <property key="AccountingGiftCerticateNumberPinNotValid">
         <value xml:lang="en">PIN number is not valid</value>
         <value xml:lang="it">Numero PIN non è valido</value>
         <value xml:lang="pt">Número do PIN não é válido</value>
+        <value xml:lang="zh">PIN密码无效</value>
     </property>
     <property key="AccountingGiftCerticateNumberRefundCallError">
         <value xml:lang="en">Unable to call refund service!</value>
         <value xml:lang="it">Non è possibile eseguire il servizio refund!</value>
         <value xml:lang="pt">Não foi possível invocar serviço de reembolso!</value>
+        <value xml:lang="zh">无法调用偿还（refund）服务！</value>
     </property>
     <property key="AccountingOrbital">
         <value xml:lang="en">An error occurred while retreiving cart details</value>
         <value xml:lang="it">Un'errore è successo mentre ricavavo i dettagli del carrello</value>
         <value xml:lang="pt">Ocorreu um erro ao recuperar os detalhes carrinho</value>
+        <value xml:lang="zh">获取购物车详细信息时出错</value>
     </property>
     <property key="AccountingPartyAcctgPreferenceNotDefine">
         <value xml:lang="en">Acctg preference not define</value>
         <value xml:lang="fr">Aucune configuration sur les préférences de gestion encore définie pour votre société</value>
         <value xml:lang="pt">Acctg não definir preferência</value>
+        <value xml:lang="zh">没有定义账户设置</value>
     </property>
     <property key="AccountingPayPalCommunicationError">
         <value xml:lang="en">A problem occurred while communicating with PayPal, please try again or select a different checkout method</value>
         <value xml:lang="hi_IN">Paypal से संचार में समस्या, कृपया पुन: प्रयास करें या एक अलग Checkout पद्धति का चयन करें</value>
         <value xml:lang="it">Si è verificato un problema durante la comunicazione con PayPal, per favore provare di nuovo o selezionare un altro metodo di checkout</value>
         <value xml:lang="pt">Ocorreu um problema durante a comunicação com o PayPal, por favor tente novamente, ou selecione um método de pagamento diferente</value>
+        <value xml:lang="zh">与贝宝通讯时出错，请重试或选择其它结账方式</value>
     </property>
     <property key="AccountingPayPalErrorDuringRetrievingCartDetails">
         <value xml:lang="en">An error occurred while retreiving cart details</value>
         <value xml:lang="it">Un'errore è successo mentre ricavavo i dettagli del carrello</value>
         <value xml:lang="pt">Ocorreu um erro ao recuperar os detalhes do carrinho</value>
+        <value xml:lang="zh">获取购物车详细信息时出错</value>
     </property>
     <property key="AccountingPayPalPaymentGatewayConfigCannotFind">
         <value xml:lang="en">Couldn't retrieve a PaymentGatewayConfigPayPal record for Express Checkout, cannot continue.</value>
         <value xml:lang="it">Non è possibile ricavare un record PaymentGatewayConfigPayPal per Express Checkout, non è possibile continuare.</value>
         <value xml:lang="pt">Não foi possível recuperar um registro PaymentGatewayConfigPayPal para Checkout Express, não é possível continuar.</value>
+        <value xml:lang="zh">无法获取用于快速结账的贝宝支付网关配置（PaymentGatewayConfigPayPal）记录，不能继续。</value>
     </property>
     <property key="AccountingPayPalShoppingCartIsEmpty">
         <value xml:lang="en">Shopping cart is empty, cannot proceed with Express Checkout</value>
@@ -326,63 +386,76 @@
         <value xml:lang="hi_IN">शॉपिंग कार्ट खाली है, एक्सप्रेस चेकआउट के साथ आगे नहीं बढ़ सकते</value>
         <value xml:lang="it">Il carrello è vuoto, non posso procedere con il checkout Express</value>
         <value xml:lang="pt">Carrinho de Compras está vazio, não é possível prosseguir com o Pagamento expresso</value>
+        <value xml:lang="zh">购物车是空的，无法处理快速结账</value>
     </property>
     <property key="AccountingPayPalTokenNotFound">
         <value xml:lang="en">Express Checkout token not present in cart, cannot get checkout details</value>
         <value xml:lang="it">Il token per Express Checkout non è presente nel carrello, non è possibile ottenere i dettagli di checkout</value>
         <value xml:lang="pt">Token de pagamento expreso não presentes no carrinho, não é possível obter detalhes de checkout</value>
+        <value xml:lang="zh">购物车中没有快速结账标志，无法获得结账详细信息</value>
     </property>
     <property key="AccountingPayPalUnknownError">
         <value xml:lang="en">An unknown error occurred while contacting PayPal</value>
         <value xml:lang="it">Un'errore sconosciuto è accaduto mentre contattavi PayPal</value>
         <value xml:lang="pt">Um erro desconhecido ocorreu ao entrar em contato com PayPal</value>
+        <value xml:lang="zh">与贝宝联系时发生了一个未知的错误</value>
     </property>
     <property key="AccountingPaymentAmountIsNegative">
         <value xml:lang="en">Amount entered ${overrideAmount} is negative.</value>
         <value xml:lang="it">Importo inserito ${overrideAmount} è negativo.</value>
         <value xml:lang="pt">Quantia preenchida ${overrideAmount} é negativa.</value>
+        <value xml:lang="zh">输入的金额 ${overrideAmount} 为负。</value>
     </property>
     <property key="AccountingPaymentAmountIsZero">
         <value xml:lang="en">Amount entered ${overrideAmount} is zero.</value>
         <value xml:lang="it">Importo inserito ${overrideAmount} è zero.</value>
         <value xml:lang="pt">Quantia preenchida ${overrideAmount} é zero.</value>
+        <value xml:lang="zh">输入的金额 ${overrideAmount} 是零。</value>
     </property>
     <property key="AccountingPaymentCannotBeAuthorized">
         <value xml:lang="en">Error processing payment authorization: ${errorString}</value>
         <value xml:lang="it">Errore esecuione autorizzazione pagamento: ${errorString}</value>
         <value xml:lang="pt">Erro ao processar a autorização de pagamento: ${errorString}</value>
+        <value xml:lang="zh">处理支付授权时出错：${errorString}</value>
     </property>
     <property key="AccountingPaymentMethodCannotBeDeleted">
         <value xml:lang="en">ERROR: Could not find Payment Method to delete (read failure ${errorString})</value>
         <value xml:lang="it">ERRORE: Non è possibile trovare il metodo di pagmento da cancellare (lettura fallita ${errorString})</value>
         <value xml:lang="pt">ERRO: Não foi possível encontrar o método de pagamento para excluir (erro de leitura ${errorString})</value>
+        <value xml:lang="zh">错误：找不到要删除的支付方法（读取错误 ${errorString}）</value>
     </property>
     <property key="AccountingPaymentMethodCannotBeDeletedWriteFailure">
         <value xml:lang="en">ERROR: Could not find Payment Method to delete (write failure ${errorString})</value>
         <value xml:lang="it">ERRORE: Non è possibile trovare il metodo di pagmento da cancellare (scrittura fallita ${errorString})</value>
         <value xml:lang="pt">ERRO: Não foi possível encontrar o método de pagamento para excluir (erro de escrita ${errorString})</value>
+        <value xml:lang="zh">错误：找不到要删除的支付方法（写操作错误 ${errorString}）</value>
     </property>
     <property key="AccountingPaymentMethodNoPermissionToDelete">
         <value xml:lang="en">You do not have permission to delete Payment Method for this partyId</value>
         <value xml:lang="it">Non hai il permesso per cancellare il metodo di pagamento per questo soggetto</value>
         <value xml:lang="pt">Você não tem permissão para excluir este método de pagamento para partyId</value>
+        <value xml:lang="zh">你无权删除用户的支付方法，用户标识是</value>
     </property>
     <property key="AccountingPaymentReauthorizingError">
         <value xml:lang="en">You do not have permission to delete Payment Method for this partyId</value>
         <value xml:lang="it">Non hai il permesso per cancellare il metodo di pagamento per questo soggetto</value>
+        <value xml:lang="zh">你无权删除用户的支付方法，用户标识是</value>
     </property>
     <property key="AccountingPaymentStatusUpdatingError">
         <value xml:lang="en">Error updating payment status information: ${errorString}</value>
         <value xml:lang="it">Errore aggiornando lo stato del pagamento: ${errorString}</value>
+        <value xml:lang="zh">更新支付状态信息时出错：${errorString}</value>
     </property>
     <property key="AccountingTaxIdInvalidFormat">
         <value xml:lang="en">The tax ID ${parameters.partyTaxId} was not in a valid format for the selected tax authority ${taxAuthority.taxIdFormatPattern}</value>
         <value xml:lang="it">Id tasse ${parameters.partyTaxId} non è nel formato valido per l'autorità tasse selezionata ${taxAuthority.taxIdFormatPattern}</value>
         <value xml:lang="pt">O número de ID fiscal ${parameters.partyTaxId} não estava em um formato válido para a autoridade fiscal selecionada ${taxAuthority.taxIdFormatPattern}</value>
+        <value xml:lang="zh">税务标识 ${parameters.partyTaxId} 格式无效，不能用于所选定的税务机构 ${taxAuthority.taxIdFormatPattern}</value>
     </property>
     <property key="AccountingTaxSettingError">
         <value xml:lang="en">Data error getting tax settings: ${errorString}</value>
         <value xml:lang="it">Errore di lettura impostazioni tasse: ${errorString}</value>
+        <value xml:lang="zh">获取税务设置时数据错误：${errorString}</value>
     </property>
     <property key="payPalEvents.failedToExecuteServiceCreatePaymentFromPreference">
         <value xml:lang="en">Failed to execute service createPaymentFromPreference</value>
@@ -467,6 +540,7 @@
         <value xml:lang="hi_IN">सर्विस CreatePaymentFromPreference पर अमल(execute) करने में असफल</value>
         <value xml:lang="it">Fallita esecuzione servizio CreatePaymentFromPreference</value>
         <value xml:lang="pt">Falha ao executar o serviço CreatePaymentFromPreference</value>
+        <value xml:lang="zh">执行从设置创建支付（CreatePaymentFromPreference）这个服务时出错</value>
     </property>
     <property key="worldPayEvents.noValidOrderIdReturned">
         <value xml:lang="en">No Valid OrderId Returned</value>
@@ -474,6 +548,7 @@
         <value xml:lang="hi_IN">मान्य OrderId वापस नहीं लौटा</value>
         <value xml:lang="it">Nessun numero ordine restituito</value>
         <value xml:lang="pt">Nenhuma OrderId válida retornada</value>
+        <value xml:lang="zh">返回的订单标识无效</value>
     </property>
     <property key="worldPayEvents.problemsConnectingWithWorldPay">
         <value xml:lang="en">Problems Connecting With WorldPay</value>
@@ -481,6 +556,7 @@
         <value xml:lang="hi_IN">WorldPay के साथ जोड़ने में समस्या</value>
         <value xml:lang="it">Problema nella connessione con WorldPay</value>
         <value xml:lang="pt">Problemas de conexão com WorldPay</value>
+        <value xml:lang="zh">连接 WorldPay 时出错</value>
     </property>
     <property key="worldPayEvents.problemsGettingAuthenticationUser">
         <value xml:lang="en">Problems Getting Authentication User</value>
@@ -488,6 +564,7 @@
         <value xml:lang="hi_IN">उपयोगकर्ता(user) के प्रमाणीकरण में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema durante l'autenticazione utente</value>
         <value xml:lang="pt">Problemas Obtendo Autenticação de Usuário</value>
+        <value xml:lang="zh">获取认证用户时出错</value>
     </property>
     <property key="worldPayEvents.problemsGettingInstId">
         <value xml:lang="en">Problems Getting Inst Id</value>
@@ -495,6 +572,7 @@
         <value xml:lang="hi_IN">Inst Id में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema nel ricavare il parametro Inst Id</value>
         <value xml:lang="pt">Problemas ao obter ID de inst</value>
+        <value xml:lang="zh">获取实例标识时出错</value>
     </property>
     <property key="worldPayEvents.problemsGettingInstIdToInteger">
         <value xml:lang="en">Problems Getting Inst Id To Integer</value>
@@ -502,6 +580,7 @@
         <value xml:lang="hi_IN">Inst Id से Integer में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema nel convertire il parametro Inst Id ad intero</value>
         <value xml:lang="pt">Problemas Obtendo Id Inst para Integer</value>
+        <value xml:lang="zh">获取实例标识转为整数时出错</value>
     </property>
     <property key="worldPayEvents.problemsGettingMerchantConfiguration">
         <value xml:lang="en">Problems Getting Merchant Configuration</value>
@@ -509,6 +588,7 @@
         <value xml:lang="hi_IN">व्यापारी विन्यास में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema nel ricavare la configurazione del negoziante</value>
         <value xml:lang="pt">Problemas Obtendo Configuração de comerciante</value>
+        <value xml:lang="zh">获取商户配置时出错</value>
     </property>
     <property key="worldPayEvents.problemsGettingOrderHeader">
         <value xml:lang="en">Problems Getting OrderHeader</value>
@@ -516,41 +596,48 @@
         <value xml:lang="hi_IN">OrderHeader में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema nel ricavare la testata ordine</value>
         <value xml:lang="pt">Problemas Obtendo OrderHeader</value>
+        <value xml:lang="zh">获取订单头时出错</value>
     </property>
     <property key="idealEvents.failedToExecuteServiceCreatePaymentFromPreference">
         <value xml:lang="en">Failed To Execute Service CreatePaymentFromPreference</value>
         <value xml:lang="fr">Échec sur l'execution du service de création d'un payment suivant les préférence (CreatePaymentFromPreference)</value>
         <value xml:lang="hi_IN">सर्विस CreatePaymentFromPreference पर अमल(execute) करने में असफल</value>
         <value xml:lang="it">Fallita esecuzione servizio CreatePaymentFromPreference</value>
+        <value xml:lang="zh">执行从设置创建支付（CreatePaymentFromPreference）这个服务时出错</value>
     </property>
     <property key="idealEvents.noValidOrderIdReturned">
         <value xml:lang="en">No Valid OrderId Returned</value>
         <value xml:lang="fr">Référence commande retournée n'est pas valide</value>
         <value xml:lang="hi_IN">मान्य OrderId वापस नहीं लौटा</value>
         <value xml:lang="it">Nessun numero ordine restituito</value>
+        <value xml:lang="zh">返回的订单标识无效</value>
     </property>
     <property key="idealEvents.problemsConnectingWithIdeal">
         <value xml:lang="en">Problems Connecting With iDEAL</value>
         <value xml:lang="fr">Problème rencontré dans la connexion avec iDEAL</value>
         <value xml:lang="hi_IN">iDEAL के साथ जोड़ने में समस्या</value>
         <value xml:lang="it">Problema nella connessione con iDEAL</value>
+        <value xml:lang="zh">连接 iDEAL 时出错</value>
     </property>
     <property key="idealEvents.problemsGettingAuthenticationUser">
         <value xml:lang="en">Problems Getting Authentication User</value>
         <value xml:lang="fr">Problème sur l'authentification de l'utilisateur</value>
         <value xml:lang="hi_IN">उपयोगकर्ता(user) के प्रमाणीकरण में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema durante l'autenticazione utente</value>
+        <value xml:lang="zh">获取认证用户时出错</value>
     </property>
     <property key="idealEvents.problemsGettingMerchantConfiguration">
         <value xml:lang="en">Problems Getting Merchant Configuration</value>
         <value xml:lang="fr">Problème de récupération de la configuration marchand</value>
         <value xml:lang="hi_IN">व्यापारी विन्यास में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema nel ricavare la configurazione del negoziante</value>
+        <value xml:lang="zh">获取商户配置时出错</value>
     </property>
     <property key="idealEvents.problemsGettingOrderHeader">
         <value xml:lang="en">Problems Getting OrderHeader</value>
         <value xml:lang="fr">Problème de récupération de la commande</value>
         <value xml:lang="hi_IN">OrderHeader में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema nel ricavare la testata ordine</value>
+        <value xml:lang="zh">获取订单头时出错</value>
     </property>
 </resource>