You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/02/16 10:23:21 UTC

svn commit: r1446859 [1/5] - in /ofbiz/branches/webhelp-2012-12-07: ./ applications/accounting/config/ applications/accounting/data/ applications/humanres/config/ applications/manufacturing/config/ applications/marketing/config/ applications/order/scri...

Author: jleroux
Date: Sat Feb 16 09:23:20 2013
New Revision: 1446859

URL: http://svn.apache.org/r1446859
Log:
Merges trunk HEAD
Maybe the last time I do that. The Neogia came up with a addon for this... to be tested....

Modified:
    ofbiz/branches/webhelp-2012-12-07/   (props changed)
    ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/applications/accounting/data/AccountingTypeData.xml
    ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResEntityLabels.xml
    ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
    ofbiz/branches/webhelp-2012-12-07/applications/order/servicedef/services_quote.xml
    ofbiz/branches/webhelp-2012-12-07/applications/product/widget/catalog/ProductForms.xml
    ofbiz/branches/webhelp-2012-12-07/framework/bi/config/BiUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonEntityLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonErrorUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonPortalEntityLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/common/config/SecurityUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/common/config/SecurityextUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java
    ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml
    ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
    ofbiz/branches/webhelp-2012-12-07/framework/widget/templates/htmlFormMacroLibrary.ftl
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/birt/config/BirtUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/ebay/config/EbayUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/customer/viewreviews.ftl
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/config/ExampleEntityLabels.xml
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/config/ExampleUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/googlecheckout/config/GoogleCheckoutUiLabels.xml
    ofbiz/branches/webhelp-2012-12-07/specialpurpose/myportal/config/MyPortalUiLabels.xml

Propchange: ofbiz/branches/webhelp-2012-12-07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1441729-1446857

Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingEntityLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingEntityLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingEntityLabels.xml Sat Feb 16 09:23:20 2013
@@ -4889,6 +4889,7 @@
         <value xml:lang="fr">Prix moyen</value>
         <value xml:lang="ja">平均支払レート</value>
         <value xml:lang="vi">Tỷ lệ thanh toán trung bình</value>
+        <value xml:lang="zh">平均支付费率</value>
     </property>
     <property key="RateType.description.DISCOUNTED">
         <value xml:lang="de">Ermäßigter Satz</value>
@@ -4896,6 +4897,7 @@
         <value xml:lang="fr">Réduit</value>
         <value xml:lang="ja">割引レート</value>
         <value xml:lang="vi">Tỷ lệ giảm giá</value>
+        <value xml:lang="zh">贴现率</value>
     </property>
     <property key="RateType.description.HIGH_PAY_RATE">
         <value xml:lang="de">Höchster Satz</value>
@@ -4903,6 +4905,7 @@
         <value xml:lang="fr">Prix haut</value>
         <value xml:lang="ja">最高支払レート</value>
         <value xml:lang="vi">Tỷ lệ thanh toán cao nhất</value>
+        <value xml:lang="zh">最高支付费率</value>
     </property>
     <property key="RateType.description.LOW_PAY_RATE">
         <value xml:lang="de">Günstigster Satz</value>
@@ -4910,6 +4913,7 @@
         <value xml:lang="fr">Prix bas</value>
         <value xml:lang="ja">最低支払レート</value>
         <value xml:lang="vi">Tỷ lệ thanh toán thấp nhất</value>
+        <value xml:lang="zh">最低支付费率</value>
     </property>
     <property key="RateType.description.OVERTIME">
         <value xml:lang="de">Satz für Überstunden</value>
@@ -4917,6 +4921,7 @@
         <value xml:lang="fr">Majoré</value>
         <value xml:lang="ja">残業レート</value>
         <value xml:lang="vi">Tỷ lệ làm ngoài giờ</value>
+        <value xml:lang="zh">加班费率</value>
     </property>
     <property key="RateType.description.STANDARD">
         <value xml:lang="de">Standard-Satz</value>
@@ -4924,6 +4929,7 @@
         <value xml:lang="fr">Standard</value>
         <value xml:lang="ja">標準レート</value>
         <value xml:lang="vi">Tỷ lệ chuẩn</value>
+        <value xml:lang="zh">标准费率</value>
     </property>
     <property key="TaxAuthorityAssocType.description.COLLECT_AGENT">
         <value xml:lang="de">Inkassobevollmächtigter</value>

Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/config/AccountingUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -757,6 +757,7 @@
     </property>
     <property key="AccountingAgreementItemFacilitiesForReport">
         <value xml:lang="en">Agreement Item Facilities For Report</value>
+        <value xml:lang="zh">合同条款场所报表</value>
     </property>
     <property key="AccountingAgreementItemSeqId">
         <value xml:lang="ar">رمز التسلسلي لبند إتفاق</value>
@@ -4193,6 +4194,7 @@
         <value xml:lang="fr">Date d'ouverture</value>
         <value xml:lang="ja">オープン日</value>
         <value xml:lang="vi">Ngày đã mở</value>
+        <value xml:lang="zh">营业日期</value>
     </property>
     <property key="AccountingDebitAmount">
         <value xml:lang="de">Sollbetrag</value>
@@ -6936,6 +6938,7 @@
         <value xml:lang="fr">Correspondances comptables</value>
         <value xml:lang="ja">GLマッピング</value>
         <value xml:lang="vi">Tham chiếu sổ cái</value>
+        <value xml:lang="zh">总账映射关系</value>
     </property>
     <property key="AccountingGlobalGLSettings">
         <value xml:lang="de">Hauptbuch-Einstellungen, global</value>
@@ -7869,6 +7872,7 @@
         <value xml:lang="en">Invoice Per Shipment</value>
         <value xml:lang="ja">発送ごとの請求書</value>
         <value xml:lang="vi">Hóa đơn với mỗi Chuyển vận</value>
+        <value xml:lang="zh">每次运输的发票</value>
     </property>
     <property key="AccountingInvoicePurchase">
         <value xml:lang="ar">فاتورة الشراء</value>
@@ -17825,6 +17829,7 @@
         <value xml:lang="fr">Prochain montant de la dépréciation</value>
         <value xml:lang="ja">次回減価償却額</value>
         <value xml:lang="vi">Giá trị khấu hao tiếp theo</value>
+        <value xml:lang="zh">下次折旧额</value>
     </property>
     <property key="FormFieldTitle_notApplied">
         <value xml:lang="en">Not Applied</value>
@@ -19902,6 +19907,7 @@
         <value xml:lang="fr">Historique de la dépréciation</value>
         <value xml:lang="ja">減価償却履歴</value>
         <value xml:lang="vi">Lịch sử mong muốn</value>
+        <value xml:lang="zh">折旧历史记录</value>
     </property>
     <property key="PageTitleEditAgreement">
         <value xml:lang="de">Vereinbarung ändern</value>
@@ -19994,6 +20000,7 @@
     </property>
     <property key="PageTitleEditAgreementItemFacility">
         <value xml:lang="en">Edit Agreement Item Facility</value>
+        <value xml:lang="zh">编辑合同条款场所</value>
     </property>
     <property key="PageTitleEditAgreementPromoAppl">
         <value xml:lang="en">Edit Agreement Promo Appl</value>
@@ -20909,6 +20916,7 @@
     </property>
     <property key="PageTitleListAgreementItemFacilities">
         <value xml:lang="en">List Agreement Item Facilities</value>
+        <value xml:lang="zh">列出合同条款场所</value>
     </property>
     <property key="PageTitleListAgreementItems">
         <value xml:lang="en">List Agreement Items</value>

Modified: ofbiz/branches/webhelp-2012-12-07/applications/accounting/data/AccountingTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/accounting/data/AccountingTypeData.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/accounting/data/AccountingTypeData.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/accounting/data/AccountingTypeData.xml Sat Feb 16 09:23:20 2013
@@ -955,7 +955,7 @@ under the License.
     <CustomMethod customMethodId="INV_HOOK_RES_YR" customMethodTypeId="INVOICE_HOOK" customMethodName="invoiceSequenceRestart" description="Restart on Fiscal Year (no gaps, per org, reset to 1 each year)"/>
     <!-- quote sequencing mode for accounting preferences -->
     <CustomMethodType customMethodTypeId="QUOTE_HOOK" parentTypeId="HOOK" hasTable="N" description="Quote Sequence methods"/>
-    <CustomMethod customMethodId="QUOTE_HOOK_ENF_SEQ" customMethodTypeId="QUOTE_HOOK" customMethodName="quoteSequence-enforced" description="Enforced Sequence (no gaps, per organization)"/>
+    <CustomMethod customMethodId="QUOTE_HOOK_ENF_SEQ" customMethodTypeId="QUOTE_HOOK" customMethodName="quoteSequenceEnforced" description="Enforced Sequence (no gaps, per organization)"/>
     <!-- order sequencing mode for accounting preferences -->
     <CustomMethodType customMethodTypeId="ORDER_HOOK" parentTypeId="HOOK" hasTable="N" description="Order Sequence methods"/>
     <CustomMethod customMethodId="ORDER_HOOK_ENF_SEQ" customMethodTypeId="ORDER_HOOK" customMethodName="orderSequence_enforced" description="Enforced Sequence (no gaps, per organization)"/>

Modified: ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResEntityLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResEntityLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResEntityLabels.xml Sat Feb 16 09:23:20 2013
@@ -25,35 +25,41 @@
         <value xml:lang="fr">Convenance</value>
         <value xml:lang="ja">私事</value>
         <value xml:lang="vi">Tình cờ</value>
+        <value xml:lang="zh">临时</value>
     </property>
     <property key="EmplLeaveReasonType.description.MEDICAL">
         <value xml:lang="en">Medical</value>
         <value xml:lang="fr">Maladie</value>
         <value xml:lang="ja">疾病</value>
         <value xml:lang="vi">Y tế</value>
+        <value xml:lang="zh">疾病</value>
     </property>
     <property key="EmplLeaveType.description.INLAND_EARNED">
         <value xml:lang="en">Inland earned</value>
         <value xml:lang="fr">Congé payé</value>
         <value xml:lang="ja">国内取得</value>
         <value xml:lang="vi">Thu nhập quốc nội</value>
+        <value xml:lang="zh">国内收入</value>
     </property>
     <property key="EmplLeaveType.description.LOSS_OF_PAY">
         <value xml:lang="en">Loss of pay</value>
         <value xml:lang="fr">Sans solde</value>
         <value xml:lang="ja">無給</value>
         <value xml:lang="vi">Mất thanh toán</value>
+        <value xml:lang="zh">无薪</value>
     </property>
     <property key="EmplLeaveType.description.RESTRICTED_HOLIDAY">
         <value xml:lang="en">Restricted holiday</value>
         <value xml:lang="fr">Jour férié</value>
         <value xml:lang="ja">制限日</value>
         <value xml:lang="vi">Kỳ nghỉ hạn chế</value>
+        <value xml:lang="zh">受限的假期</value>
     </property>
     <property key="EmplLeaveType.description.SPECIAL_DAY_OFF">
         <value xml:lang="en">Special day off</value>
         <value xml:lang="fr">Congé</value>
         <value xml:lang="ja">特別休暇</value>
         <value xml:lang="vi">Ngày nghỉ đặc biệt</value>
+        <value xml:lang="zh">特殊休假</value>
     </property>
 </resource>
\ No newline at end of file

Modified: ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/humanres/config/HumanResUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -1853,6 +1853,7 @@
         <value xml:lang="fr">Demande de congés créée avec succès</value>
         <value xml:lang="ja">休暇リクエストが正しく作成されました</value>
         <value xml:lang="vi">Yêu cầu Nghỉ phép đã được gửi đi thành công</value>
+        <value xml:lang="zh">离职请求创建成功</value>
     </property>
     <property key="HumanResListEmployments">
         <value xml:lang="en">List Employment</value>
@@ -2166,12 +2167,14 @@
         <value xml:lang="fr">Mes congés</value>
         <value xml:lang="ja">私の休暇</value>
         <value xml:lang="vi">Nghỉ phép của Bạn</value>
+        <value xml:lang="zh">我的休假</value>
     </property>
     <property key="HumanResMyTrainings">
         <value xml:lang="en">My Trainings</value>
         <value xml:lang="fr">Mes formations</value>
         <value xml:lang="ja">私のトレーニング</value>
         <value xml:lang="vi">Đào tạo của Bạn</value>
+        <value xml:lang="zh">我的培训</value>
     </property>
     <property key="HumanResNewEmplPosition">
         <value xml:lang="de">Stelle anlegen</value>
@@ -3178,6 +3181,7 @@
         <value xml:lang="fr">Calendrier de formation</value>
         <value xml:lang="ja">トレーニングのカレンダを検索</value>
         <value xml:lang="vi">Tra cứu lịch đào tạo</value>
+        <value xml:lang="zh">查找培训日历</value>
     </property>
     <property key="PageTitleFindTrainingStatus">
         <value xml:lang="en">Find Training Status</value>

Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/config/ManufacturingUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -3657,6 +3657,7 @@
         <value xml:lang="it">Configurazione non valida</value>
         <value xml:lang="ja">製品設定が無効です</value>
         <value xml:lang="vi">Cấu hình sản phẩm không đúng định dạng</value>
+        <value xml:lang="zh">产品配置无效</value>
     </property>
     <property key="ManufacturingProductionRunId">
         <value xml:lang="de">Produktionsauftrags-Nr.</value>
@@ -3677,6 +3678,7 @@
         <value xml:lang="it">Nessun ordine di produzione è richiesto per il prodotto ${productId} in data ${startDate}; verificare le date di validità dei materiali.</value>
         <value xml:lang="ja">製品ID ${productId} 日付 ${startDate} の生産実行は必要ではありません、部品表の日付を確認して経路制御してください。</value>
         <value xml:lang="vi">Không có Chế tác lô hàng với sản phẩm id ${productId} trong ngày ${startDate}; bạn hãy xem xét lại ngày kiểm hàng (validity date) trên Chào giá và Quy trình</value>
+        <value xml:lang="zh">对标识为${productId}的产品，在日期${startDate}，没有必须的生产运行；请验证物料和工序的日期。</value>
     </property>
     <property key="ManufacturingProductionRunName">
         <value xml:lang="de">Produktionsauftrags-Name</value>
@@ -3888,6 +3890,7 @@
         <value xml:lang="it">Compito ordine di produzione ${productionRunTaskId} non può restituire più righe ${quantity} di quelle allocate attualmente ${quantityAllocated}</value>
         <value xml:lang="ja">ID ${productionRunTaskId} の生産実行タスクは現在割り当てられた ${quantityAllocated} より多いアイテム ${quantity} を戻すことはできません</value>
         <value xml:lang="vi">Tác vụ - Đầu việc với Id ${productionRunTaskId} không thể trả về nhiều hơn số hàng hóa ${quantity} hơn số lượng đang được phân bổ ${quantityAllocated}</value>
+        <value xml:lang="zh">标识为${productionRunTaskId}的生产运行任务，与当前分配的${quantityAllocated}比，没有返回更多明细${quantity}</value>
     </property>
     <property key="ManufacturingProductionRunTaskCannotStartDocsNotPrinted">
         <value xml:lang="en">Production Run Task Cannot Start Docs Not Printed</value>
@@ -3912,6 +3915,7 @@
         <value xml:lang="it">Non è possibile trovare il compito dell'ordine di produzione: ${productionRunTaskId}</value>
         <value xml:lang="ja">ID ${productionRunTaskId} の生産実行タスクが見つかりません</value>
         <value xml:lang="vi">Không tìm thấy Tác vụ - Đầu việc với Id: ${productionRunTaskId}</value>
+        <value xml:lang="zh">无法找到生产运行任务，标识为：${productionRunTaskId}</value>
     </property>
     <property key="ManufacturingProductionRunTaskNotExists">
         <value xml:lang="en">Production Run Task Not Exists</value>
@@ -3936,6 +3940,7 @@
         <value xml:lang="it">Errore durante l'esecuzione di productionRunTaskProduce: </value>
         <value xml:lang="ja">productionRunTaskProduce の呼び出し中にエラー: </value>
         <value xml:lang="vi">Lỗi khi thực thi dịch vụ productionRunTaskProduce: </value>
+        <value xml:lang="zh">调用productionRunTaskProduce时出错：</value>
     </property>
     <property key="ManufacturingProductionRunTaskStatusChanged">
         <value xml:lang="en">Production Run Task Status Changed</value>
@@ -3964,48 +3969,56 @@
         <value xml:lang="it">Errore durante il tentativo di creazione associazione impegno di lavoro</value>
         <value xml:lang="ja">作業成果関連付け作成中にエラー</value>
         <value xml:lang="vi">Lỗi khi tạo Lượng giá nguồn lực kết hợp</value>
+        <value xml:lang="zh">尝试创建人工服务关联时出错</value>
     </property>
     <property key="ManufacturingProductionRunTryToGetBomListError">
         <value xml:lang="en">Error try to get BOM list from productAssoc</value>
         <value xml:lang="it">Errore durante il tentativo di ottenere la lista della distinta base da productAssoc</value>
         <value xml:lang="ja">製品関連付けからBOM一覧を取得中にエラー</value>
         <value xml:lang="vi">Lỗi khi lấy thông tin danh sách Chào giá từ Sản phẩm</value>
+        <value xml:lang="zh">尝试从产品关联（productAssoc）获得物料清单时出错</value>
     </property>
     <property key="ManufacturingProductionRunUnableToCreateMaterialsCosts">
         <value xml:lang="en">Unable to create materials costs for the production run task ${productionRunTaskId}: ${errorString}</value>
         <value xml:lang="it">Non è possibile create i costi dei materiali per il compito dell'ordine di produzione ${productionRunTaskId}: ${errorString}</value>
         <value xml:lang="ja">生産実行タスク ${productionRunTaskId} に対する部品原価が作成できません: ${errorString}</value>
         <value xml:lang="vi">Không thể tạo Chi phí vật liệu cho Tác vụ - Đầu việc ${productionRunTaskId}: ${errorString}</value>
+        <value xml:lang="zh">不能为生产运行任务${productionRunTaskId}创建物料成本：${errorString}</value>
     </property>
     <property key="ManufacturingProductionRunUnableToCreateRoutingCosts">
         <value xml:lang="en">Unable to create routing costs for the production run task ${productionRunTaskId}: ${errorString}</value>
         <value xml:lang="it">Non è possibile create i costi per il compito dell'ordine di produzione ${productionRunTaskId}: ${errorString}</value>
         <value xml:lang="ja">生産実行タスク ${productionRunTaskId} に対する経路制御原価が作成できません: ${errorString}</value>
         <value xml:lang="vi">Không thể tạo Chi phí quy trình cho Tác vụ - Đầu việc ${productionRunTaskId}: ${errorString}</value>
+        <value xml:lang="zh">不能为生产运行任务${productionRunTaskId}创建加工成本：${errorString}</value>
     </property>
     <property key="ManufacturingProductionRunUnableToFindCosts">
         <value xml:lang="en">Unable to find a currency for production run costs</value>
         <value xml:lang="it">Non è possibile trovare una valuta per i costi dell'ordine di produzione</value>
         <value xml:lang="ja">生産実行原価に対する通貨を見つけることができません</value>
         <value xml:lang="vi">Không thể tìm thấy kiểu Tiền tệ cho Chi phí</value>
+        <value xml:lang="zh">无法找到生产运行成本的币种</value>
     </property>
     <property key="ManufacturingProductionRunUnableToFindCostsForWorkEffort">
         <value xml:lang="en">Cannot retrieve costs for work effort ${workEffortId}: ${errorString}</value>
         <value xml:lang="it">Non è possibile ricavare i costi per l'impegno di lavoro ${workEffortId}: ${errorString}</value>
         <value xml:lang="ja">作業成果 ${workEffortId} に対する原価が取得できません: ${errorString}</value>
         <value xml:lang="vi">Không thể lấy thông tin Chi phí cho Lượng giá nguồn lực ${workEffortId}: ${errorString}</value>
+        <value xml:lang="zh">无法获得人工服务${workEffortId}的成本：${errorString}</value>
     </property>
     <property key="ManufacturingProductionRunUnableToFindOverheadCosts">
         <value xml:lang="en">Unable to compute overhead costs for production run: ${errorString}</value>
         <value xml:lang="it">Non è possibile elaborare gli ulteriori costo dell'ordine di produzione: ${errorString}</value>
         <value xml:lang="ja">生産実行に対する間接原価が計算できません: ${errorString}</value>
         <value xml:lang="vi">Không thể tính Chi phí phát sinh cho Chế tác lô hàng: ${errorString}</value>
+        <value xml:lang="zh">无法计算生产运行的间接成本：${errorString}</value>
     </property>
     <property key="ManufacturingProductionRunUnableToProgressTaskStatus">
         <value xml:lang="en">Unable to progress from status ${prevStatusId} for task ${taskId}</value>
         <value xml:lang="it">Non è possibile cambiare lo stato da 'in corso' ${prevStatusId} per il compito ${taskId}</value>
         <value xml:lang="ja">タスク ${taskId} に対するステータス ${prevStatusId} から進めることができません</value>
         <value xml:lang="vi">Không thể tiến hành từ trạng thái ${prevStatusId} cho Tác vụ - Đầu việc ${taskId}</value>
+        <value xml:lang="zh">不能把任务${taskId}从状态${prevStatusId}继续进行</value>
     </property>
     <property key="ManufacturingProposedOrder">
         <value xml:lang="en">Proposed Order</value>
@@ -4326,6 +4339,7 @@
         <value xml:lang="it">Errore durante la ricerca del ciclo per il compito: ${taskId}</value>
         <value xml:lang="ja">ID ${taskId} の経路制御タスク検索時にエラー</value>
         <value xml:lang="vi">Lỗi tìm tác vụ quy trình với Id: ${taskId}</value>
+        <value xml:lang="zh">查找规程任务时出错，标识：${taskId}</value>
     </property>
     <property key="ManufacturingRoutingHasNoRoutingTask">
         <value xml:lang="de">Arbeitsplan besitzt keinen Arbeitsgang</value>
@@ -4927,12 +4941,14 @@
         <value xml:lang="it">Errore durante la ricerca dei records di WorkEffort: ${errorString}</value>
         <value xml:lang="ja">要求された作業成果レコードの検索中にエラー: ${errorString}</value>
         <value xml:lang="vi">Lỗi tìm dữ liệu Lượng giá nguồn lực mong muốn: ${errorString}</value>
+        <value xml:lang="zh">查找期望的人工服务（WorkEffort）记录时出错：${errorString}</value>
     </property>
     <property key="ManufacturingTechDataWorkEffortAssocNotExist">
         <value xml:lang="en">Error finding desired WorkEffortAssoc records: ${errorString}</value>
         <value xml:lang="it">Errore durante la ricerca dei records di WorkEffortAssoc: ${errorString}</value>
         <value xml:lang="ja">要求された作業成果関連付けレコードの検索中にエラー: ${errorString}</value>
         <value xml:lang="vi">Lỗi tìm dữ liệu Lượng giá nguồn lực kết hợp mong muốn: ${errorString}</value>
+        <value xml:lang="zh">查找期望的人工服务关联（WorkEffortAssoc）记录时出错：${errorString}</value>
     </property>
     <property key="ManufacturingTimePeriod">
         <value xml:lang="de">Zeitraum</value>
@@ -5172,6 +5188,7 @@
         <value xml:lang="it">Errore durante la letture di WorkOrderItemFulfillment: ${errorString}</value>
         <value xml:lang="ja">作業注文アイテム執行の読み込み中にエラー: ${errorString}</value>
         <value xml:lang="vi">Lỗi khi đọc thông tin Đáp ứng hàng hóa của Đặt hàng (WorkOrderItemFulfillment) : ${errorString}</value>
+        <value xml:lang="zh">读取WorkOrderItemFulfillment时出错：${errorString}</value>
     </property>
     <property key="ManufacturingWorkWithShipmentPlans">
         <value xml:lang="de">Versandpläne</value>

Modified: ofbiz/branches/webhelp-2012-12-07/applications/marketing/config/MarketingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/marketing/config/MarketingUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/marketing/config/MarketingUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/marketing/config/MarketingUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -589,12 +589,14 @@
         <value xml:lang="it">Nessun codice di verifica Opt-in specificato, ma uno è obbligatorio.</value>
         <value xml:lang="ja">選択確認コードが指定されていません。１つは必須です。</value>
         <value xml:lang="vi">Mã xác nhận (Opt-In) chưa được nhập.</value>
+        <value xml:lang="zh">没有指定兴趣验证码，但是必须有一个。</value>
     </property>
     <property key="MarketingContactListOptInVerifyCodeNotCorrect">
         <value xml:lang="en">The Opt-in Verify Code specified [${parameters.optInVerifyCode}] was not correct. Please check the code you were sent.</value>
         <value xml:lang="it">Il codice di verifia Opt-in specificato [${parameters.optInVerifyCode}] non era corretto. Per favore verificare il codice che ti è stato inviato.</value>
         <value xml:lang="ja">指定された選択確認コード [${parameters.optInVerifyCode}] は正しくありません。コードを確認してください。</value>
         <value xml:lang="vi">Mã xác nhận (Opt-In) có giá trị [${parameters.optInVerifyCode}] không đúng. Bạn hãy kiểm tra lại mã xác nhận đã gửi.</value>
+        <value xml:lang="zh">指定的兴趣验证码[${parameters.optInVerifyCode}]不正确。请检查你发送的验证码。</value>
     </property>
     <property key="MarketingContactListOwnerPartyId">
         <value xml:lang="de">Ersteller ID</value>
@@ -660,6 +662,7 @@
         <value xml:lang="ja">取引先をインポート</value>
         <value xml:lang="th">นำเข้ากลุ่มผู้ใช้</value>
         <value xml:lang="vi">Nhập vào các Tác nhân</value>
+        <value xml:lang="zh">导入会员</value>
     </property>
     <property key="MarketingContactListPreferredContactMech">
         <value xml:lang="en">Preferred Contact Mechanism</value>
@@ -740,6 +743,7 @@
         <value xml:lang="it">Il contatto preferito [${preferredContactMechType.description}] non era la giusta lista [${listContactMechType.description}].</value>
         <value xml:lang="ja">通常の連絡方法 [${preferredContactMechType.description}] は一覧 [${listContactMechType.description}] の正しい種類ではありません。</value>
         <value xml:lang="vi">Cơ chế liên lạc ưa thích [${preferredContactMechType.description}] không nằm trong loại của danh sách [${listContactMechType.description}].</value>
+        <value xml:lang="zh">首选联系方式 [${preferredContactMechType.description}] 不是用于列表 [${listContactMechType.description}] 的正确类型。</value>
     </property>
     <property key="MarketingConversionRate">
         <value xml:lang="de">Konversationsrate</value>
@@ -762,6 +766,7 @@
         <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso MARKETING_CREATE o MARKETING_ADMIN</value>
         <value xml:lang="ja">セキュリティエラー: ${resourceDescription} の実行には MARKETING_CREATE または MARKETING_ADMIN 権限が必要です。</value>
         <value xml:lang="vi">Lỗi phân quyền: để thực thi ${resourceDescription} bạn cần có quyền MARKETING_CREATE hoặc quyền MARKETING_ADMIN</value>
+        <value xml:lang="zh">安全错误：要运行${resourceDescription}，你必须有 MARKETING_CREATE 或 MARKETING_ADMIN 权限</value>
     </property>
     <property key="MarketingDateRange">
         <value xml:lang="en">Date Range</value>
@@ -783,6 +788,7 @@
         <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso MARKETING_DELETE o MARKETING_ADMIN</value>
         <value xml:lang="ja">セキュリティエラー: ${resourceDescription} の実行には MARKETING_DELETE または MARKETING_ADMIN 権限が必要です。</value>
         <value xml:lang="vi">Lỗi phân quyền: để thực thi ${resourceDescription} bạn cần có quyền MARKETING_DELETE hoặc quyền MARKETING_ADMIN</value>
+        <value xml:lang="zh">安全错误：要运行${resourceDescription}，你必须有 MARKETING_DELETE 或 MARKETING_ADMIN 权限</value>
     </property>
     <property key="MarketingEmailStatusReport">
         <value xml:lang="de">E-Mail Statusbericht</value>
@@ -792,6 +798,7 @@
         <value xml:lang="ja">Eメールステータスレポート</value>
         <value xml:lang="pt_BR">Relatório de estado de e-mail</value>
         <value xml:lang="vi">Báo cáo tình trạng thư điện tử</value>
+        <value xml:lang="zh">电子邮件状态报表</value>
     </property>
     <property key="MarketingFindAccounts">
         <value xml:lang="en">Find SFA Accounts</value>
@@ -811,6 +818,7 @@
         <value xml:lang="pt_BR">Encontrar contatos da equipe de vendas</value>
         <value xml:lang="th">ค้นหา Contact</value>
         <value xml:lang="vi">Tìm kiếm Liên hệ</value>
+        <value xml:lang="zh">查找销售管理联系人</value>
     </property>
     <property key="MarketingFindLeads">
         <value xml:lang="en">Find SFA Leads</value>
@@ -819,6 +827,7 @@
         <value xml:lang="pt_BR">Buscar Leads da equipe de vendas</value>
         <value xml:lang="th">ค้นหา Lead</value>
         <value xml:lang="vi">Tìm Đầu mối</value>
+        <value xml:lang="zh">查找销售管理线索</value>
     </property>
     <property key="MarketingMainPage">
         <value xml:lang="de">Haupt</value>
@@ -934,6 +943,7 @@
         <value xml:lang="ja">取引先ステータスレポート</value>
         <value xml:lang="pt_BR">Relatório de estado de participante</value>
         <value xml:lang="vi">Báo cáo tình trạng Tác nhân</value>
+        <value xml:lang="zh">会员状态报表</value>
     </property>
     <property key="MarketingReports">
         <value xml:lang="de">Berichte</value>
@@ -1732,6 +1742,7 @@
         <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso MARKETING_UPDATE o MARKETING_ADMIN</value>
         <value xml:lang="ja">セキュリティエラー: ${resourceDescription} の実行には MARKETING_UPDATE または MARKETING_ADMIN 権限が必要です。</value>
         <value xml:lang="vi">Lỗi phân quyền: để thực thi ${resourceDescription} bạn cần quyền MARKETING_UPDATE hoặc quyền MARKETING_ADMIN</value>
+        <value xml:lang="zh">安全错误：要运行${resourceDescription}，你必须有 MARKETING_UPDATE 或 MARKETING_ADMIN 权限</value>
     </property>
     <property key="MarketingViewPermissionError">
         <value xml:lang="en">View Permission Error</value>
@@ -1764,18 +1775,21 @@
         <value xml:lang="fr">Sites Web</value>
         <value xml:lang="ja">Webサイト</value>
         <value xml:lang="vi">Trang thông tin (website)</value>
+        <value xml:lang="zh">网站</value>
     </property>
     <property key="MarketingWebSiteContactListCreate">
         <value xml:lang="en">Create WebSite</value>
         <value xml:lang="fr">Créer un site Web</value>
         <value xml:lang="ja">Webサイトを作成</value>
         <value xml:lang="vi">Tạo mới trang thông tin</value>
+        <value xml:lang="zh">创建网站</value>
     </property>
     <property key="MarketingWebSiteContactListView">
         <value xml:lang="en">WebSites View</value>
         <value xml:lang="fr">Visualiser les sites Web</value>
         <value xml:lang="ja">Webサイト表示</value>
         <value xml:lang="vi">Xem Trang thông tin</value>
+        <value xml:lang="zh">网站视图</value>
     </property>
     <property key="PageTitleAccountSummary">
         <value xml:lang="en">Account Summary</value>
@@ -1846,6 +1860,7 @@
         <value xml:lang="pt_BR">Designar uma conta existente</value>
         <value xml:lang="th">กำหนด Account ที่มีอยู่</value>
         <value xml:lang="vi">Gán Tài khoản đã có</value>
+        <value xml:lang="zh">指派存在的账户</value>
     </property>
     <property key="PageTitleAssignLeadFromExisting">
         <value xml:lang="en">Assign Existing Lead</value>
@@ -1854,6 +1869,7 @@
         <value xml:lang="pt_BR">Designar um Lead existente</value>
         <value xml:lang="th">กำหนด Lead ที่มีอยู่</value>
         <value xml:lang="vi">Gán Đầu mối đã có</value>
+        <value xml:lang="zh">指派存在的线索</value>
     </property>
     <property key="PageTitleCreateAccount">
         <value xml:lang="en">Create New Account</value>
@@ -2154,6 +2170,7 @@
         <value xml:lang="ja">インポート連絡リスト取引先を検索</value>
         <value xml:lang="th">ค้นหารายการติดต่อกลุ่มผู้ใช้เพื่อการนำเข้า</value>
         <value xml:lang="vi">Tìm Danh sách liên hệ của Tác nhân đã nhập khẩu</value>
+        <value xml:lang="zh">查找导入联系列表会员</value>
     </property>
     <property key="PageTitleFindMarketingCampaignRole">
         <value xml:lang="en">Find Marketing Campaign Role</value>
@@ -2555,6 +2572,7 @@
         <value xml:lang="pt_BR">Todas contas</value>
         <value xml:lang="th">Account ทั้งหมด</value>
         <value xml:lang="vi">Tất cả Tài khoản</value>
+        <value xml:lang="zh">全部账户</value>
     </property>
     <property key="SfaAllContacts">
         <value xml:lang="de">Alle Kontakte</value>
@@ -2564,6 +2582,7 @@
         <value xml:lang="pt_BR">Todos contatos</value>
         <value xml:lang="th">Contact ทั้งหมด</value>
         <value xml:lang="vi">Tất cả Liên hệ</value>
+        <value xml:lang="zh">全部联系人</value>
     </property>
     <property key="SfaAllLeads">
         <value xml:lang="en">All Leads</value>
@@ -2572,6 +2591,7 @@
         <value xml:lang="pt_BR">Todos Leads</value>
         <value xml:lang="th">Lead ทั้งหมด</value>
         <value xml:lang="vi">Tất cả Đầu mối</value>
+        <value xml:lang="zh">全部线索</value>
     </property>
     <property key="SfaAssignToMe">
         <value xml:lang="de">Zugewiesen an mich</value>
@@ -2581,6 +2601,7 @@
         <value xml:lang="pt_BR">Designar para mim</value>
         <value xml:lang="th">กำหนดให้ฉัน</value>
         <value xml:lang="vi">Giao cho Tôi</value>
+        <value xml:lang="zh">指派给我</value>
     </property>
     <property key="SfaAssignedBy">
         <value xml:lang="de">Zugewiesen von</value>
@@ -2590,6 +2611,7 @@
         <value xml:lang="pt_BR">Designada por</value>
         <value xml:lang="th">กำหนดโดย</value>
         <value xml:lang="vi">Giao bởi</value>
+        <value xml:lang="zh">指派者</value>
     </property>
     <property key="SfaAutoCreateContactByImportingVCard">
         <value xml:lang="de">Automatisches Erstellen eines neuen Kontaktes bei dem Import einer vCard</value>
@@ -2697,6 +2719,7 @@
         <value xml:lang="pt_BR">Completo</value>
         <value xml:lang="th">เสร็จสิ้น</value>
         <value xml:lang="vi">Hoàn thành</value>
+        <value xml:lang="zh">完成</value>
     </property>
     <property key="SfaContact">
         <value xml:lang="de">Kontakt</value>
@@ -2831,6 +2854,7 @@
         <value xml:lang="it">Errore durante l'esportazione dei dati da VCard: ${errorString}</value>
         <value xml:lang="ja">vCardからデータをエクスポート中にエラー: ${errorString}</value>
         <value xml:lang="vi">Lỗi xảy ra khi kết xuất dữ liệu từ VCard: ${errorString}</value>
+        <value xml:lang="zh">从VCard导出数据时出错：${errorString}</value>
     </property>
     <property key="SfaExportVCardErrorOpeningFile">
         <value xml:lang="en">Error during export data from VCard, unable to open file for writing: ${errorString}</value>
@@ -2838,6 +2862,7 @@
         <value xml:lang="it">Errore durante l'esportazione dei dati da VCard, non è possibile aprire il file in scrittura: ${errorString}</value>
         <value xml:lang="ja">vCardからデータをエクスポート中にエラー。書き込みファイルをオープンできません: ${errorString}</value>
         <value xml:lang="vi">Lỗi xảy ra khi kết xuất dữ liệu từ VCard, không thể mở tập tin để ghi: ${errorString}</value>
+        <value xml:lang="zh">从VCard导出数据时出错，无法为写数据而打开文件：${errorString}</value>
     </property>
     <property key="SfaExportVCardErrorWritingFile">
         <value xml:lang="en">Error during export data from VCard, unable to write data to: ${errorString}</value>
@@ -2845,6 +2870,7 @@
         <value xml:lang="it">Errore durante l'esportazione dei dati da VCard, non è possibile scrivere i dati in: ${errorString}</value>
         <value xml:lang="ja">vCardからデータをエクスポート中にエラー。ファイルにデータを書き込みできません: ${errorString}</value>
         <value xml:lang="vi">Lỗi xảy ra khi kết xuất dữ liệu từ VCard, không thể ghi dữ liệu tới: ${errorString}</value>
+        <value xml:lang="zh">从VCard导出数据时出错，无法写数据：${errorString}</value>
     </property>
     <property key="SfaFindAccountLeads">
         <value xml:lang="en">Find Account Leads</value>
@@ -2853,6 +2879,7 @@
         <value xml:lang="pt_BR">Buscar contas de Leads</value>
         <value xml:lang="th">ค้นหา Account Leads</value>
         <value xml:lang="vi">Tìm kiếm Tài khoản đầu mối</value>
+        <value xml:lang="zh">查找账户线索</value>
     </property>
     <property key="SfaFindAccounts">
         <value xml:lang="de">Finde Konten</value>
@@ -2862,6 +2889,7 @@
         <value xml:lang="pt_BR">Buscar contas</value>
         <value xml:lang="th">ค้นหา Accounts</value>
         <value xml:lang="vi">Tìm kiếm Tài khoản</value>
+        <value xml:lang="zh">查找账户</value>
     </property>
     <property key="SfaFindContacts">
         <value xml:lang="de">Finde Kontakte</value>
@@ -2926,6 +2954,7 @@
         <value xml:lang="ja">姓(FN)、名(LN)、または会社名を入力してください</value>
         <value xml:lang="pt_BR">Por favor, digite o nome da pessoa, sobrenome ou nome da empresa</value>
         <value xml:lang="vi">Bạn hãy nhập Tên hoặc Họ hoặc Tên công ty</value>
+        <value xml:lang="zh">请输入人员的姓或名，或机构名称</value>
     </property>
     <property key="SfaForecasts">
         <value xml:lang="de">Prognose</value>
@@ -2956,6 +2985,7 @@
         <value xml:lang="it">Errore durante l'importazione dei dati da VCard: ${errorString}</value>
         <value xml:lang="ja">vCardからデータのインポート中にエラー: ${errorString}</value>
         <value xml:lang="vi">Lỗi xảy ra khi nhập khẩu dữ liệu từ VCard: ${errorString}</value>
+        <value xml:lang="zh">从VCard导入数据时出错：${errorString}</value>
     </property>
     <property key="SfaInitialAccount">
         <value xml:lang="en">Initial Account</value>
@@ -3088,6 +3118,7 @@
         <value xml:lang="pt_BR">Minhas contas</value>
         <value xml:lang="th">Account ของฉัน</value>
         <value xml:lang="vi">Tài khoản Riêng</value>
+        <value xml:lang="zh">我的账户</value>
     </property>
     <property key="SfaMyContacts">
         <value xml:lang="de">Meine Kontakte</value>
@@ -3097,6 +3128,7 @@
         <value xml:lang="pt_BR">Meus contatos</value>
         <value xml:lang="th">Contact ของฉัน</value>
         <value xml:lang="vi">Liên hệ Riêng</value>
+        <value xml:lang="zh">我的联系人</value>
     </property>
     <property key="SfaMyLeads">
         <value xml:lang="en">My Leads</value>
@@ -3105,6 +3137,7 @@
         <value xml:lang="pt_BR">Meus Leads</value>
         <value xml:lang="th">Lead ของฉัน</value>
         <value xml:lang="vi">Đầu mối Riêng</value>
+        <value xml:lang="zh">我的线索</value>
     </property>
     <property key="SfaNewSalesForecast">
         <value xml:lang="de">Neue Verkaufsprognose</value>
@@ -3133,6 +3166,7 @@
         <value xml:lang="en">Next Step Date</value>
         <value xml:lang="ja">次の段階の日付</value>
         <value xml:lang="vi">Ngày thực hiện bước tiếp theo</value>
+        <value xml:lang="zh">下一步的日期</value>
     </property>
     <property key="SfaNoLeadsSelectedToMerged">
         <value xml:lang="en">No leads selected to merge</value>
@@ -3159,6 +3193,7 @@
         <value xml:lang="ja">機会通信</value>
         <value xml:lang="pt_BR">Comunicação de oportunidades</value>
         <value xml:lang="vi">Truyền thông</value>
+        <value xml:lang="zh">机会的沟通</value>
     </property>
     <property key="SfaOpportunityId">
         <value xml:lang="en">Opportunity ID</value>
@@ -3269,6 +3304,7 @@
         <value xml:lang="ja">リード所有者を選択</value>
         <value xml:lang="pt_BR">Selecionar donos do Lead</value>
         <value xml:lang="vi">Chọn Sở hữu Đầu mối</value>
+        <value xml:lang="zh">选择线索拥有者</value>
     </property>
     <property key="SfaTaskAssignedByMe">
         <value xml:lang="de">Öffne Aufgaben die ich zugeteilt habe.</value>
@@ -3278,6 +3314,7 @@
         <value xml:lang="pt_BR">Tarefas em aberto designadas para mim.</value>
         <value xml:lang="th">งานที่ฉันมอบหมาย</value>
         <value xml:lang="vi">Tác vụ đang Mở đã được Gán bởi Tôi</value>
+        <value xml:lang="zh">我指派的、处于打开状态的任务。</value>
     </property>
     <property key="SfaTaskAssignedToMe">
         <value xml:lang="de">Öffne Aufgaben die mir zugeteilt sind.</value>
@@ -3287,6 +3324,7 @@
         <value xml:lang="pt_BR">Tarefas em aberto designadas para mim.</value>
         <value xml:lang="th">งานที่มอบหมายให้ฉัน</value>
         <value xml:lang="vi">Tác vụ đang Mở đã được Gán đến Tôi</value>
+        <value xml:lang="zh">指派给我的、处于打开状态的任务</value>
     </property>
     <property key="SfaType">
         <value xml:lang="de">Art</value>
@@ -3318,5 +3356,6 @@
         <value xml:lang="ja">vCard</value>
         <value xml:lang="pt_BR">vCard</value>
         <value xml:lang="vi">vCard</value>
+        <value xml:lang="zh">vCard</value>
     </property>
 </resource>
\ No newline at end of file

Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Sat Feb 16 09:23:20 2013
@@ -43,7 +43,7 @@ under the License.
             <set field="customMethodName" from-field="customMethod.customMethodName"/>
             <else><!-- retreive service from deprecated enumeration -->
                 <if-compare operator="equals" value="QUOSQ_ENF_SEQ" field="partyAcctgPreference.oldQuoteSequenceEnumId">
-                    <set field="customMethodName" value="quoteSequence-enforced"/>
+                    <set field="customMethodName" value="quoteSequenceEnforced"/>
                 </if-compare>
             </else>
         </if-not-empty>
@@ -75,7 +75,7 @@ under the License.
         <field-to-result field="quoteId" result-name="quoteId"/>
     </simple-method>
 
-    <simple-method method-name="quoteSequence-enforced" short-description="Enforced Sequence (no gaps, per organization)">
+    <simple-method method-name="quoteSequenceEnforced" short-description="Enforced Sequence (no gaps, per organization)">
         <log level="info" message="In getNextQuoteId sequence enum Enforced"/> 
         <set field="partyAcctgPreference" from-field="parameters.partyAcctgPreference"/>
         <!-- this is sequential sequencing, we can't skip a number, also it must be a unique sequence per partyIdFrom -->

Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/servicedef/services_quote.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/servicedef/services_quote.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/order/servicedef/services_quote.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/order/servicedef/services_quote.xml Sat Feb 16 09:23:20 2013
@@ -33,8 +33,8 @@ under the License.
         <attribute name="quoteId" type="String" mode="OUT" optional="false"/>
     </service>
 
-    <service name="quoteSequence-enforced" engine="simple"
-        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="quoteSequence-enforced">
+    <service name="quoteSequenceEnforced" engine="simple"
+        location="component://order/script/org/ofbiz/order/quote/QuoteServices.xml" invoke="quoteSequenceEnforced">
         <implements service="getNextQuoteId" optional="true"/>
         <attribute name="partyAcctgPreference" type="org.ofbiz.entity.GenericValue" mode="IN"/>
         <override name="quoteId" type="Long" mode="OUT"/>

Modified: ofbiz/branches/webhelp-2012-12-07/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/product/widget/catalog/ProductForms.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/applications/product/widget/catalog/ProductForms.xml Sat Feb 16 09:23:20 2013
@@ -229,17 +229,17 @@ under the License.
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
 
-        <field position="1" name="returnable" title="${uiLabelMap.ProductReturnable}">
+        <field position="1" name="returnable" title="${uiLabelMap.ProductReturnable}" use-when="product==null">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}">
+        <field position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}" use-when="product==null">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
 
-        <field position="3" name="taxable" title="${uiLabelMap.ProductTaxable}">
+        <field position="3" name="taxable" title="${uiLabelMap.ProductTaxable}" use-when="product==null">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
-        <field position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}">
+        <field position="4" name="autoCreateKeywords" title="${uiLabelMap.ProductAutoCreateKeywords}" use-when="product==null">
             <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
 
@@ -265,7 +265,7 @@ under the License.
         <field use-when="product!=null" position="2" name="createdByText" title="${uiLabelMap.CommonCreatedBy}:">
             <display description="[${product.createdByUserLogin}] ${uiLabelMap.CommonOn} ${product.createdDate}" also-hidden="false"/>
         </field>
-        <field name="orderDecimalQuantity" >
+        <field name="orderDecimalQuantity" use-when="product==null">
             <drop-down allow-empty="true" ><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
         </field>
         <sort-order>

Modified: ofbiz/branches/webhelp-2012-12-07/framework/bi/config/BiUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/bi/config/BiUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/bi/config/BiUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/bi/config/BiUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -96,6 +96,7 @@
         <value xml:lang="en">The natural key: ${naturalKeyFields} is empty in value: ${dimensionValue}</value>
         <value xml:lang="it">La chiave naturale: ${naturalKeyFields} è vuota nel valore: ${dimensionValue}</value>
         <value xml:lang="ja">自然キー: ${naturalKeyFields} が値: ${dimensionValue} で空です</value>
+        <value xml:lang="zh">值：${dimensionValue} 中的自然键：${naturalKeyFields} 是空的</value>
     </property>
     <property key="BusinessIntelligenceNote10">
         <value xml:lang="en">The best practices for datawarehouses are mainly taken from the great book "The Data Warehouse Toolkit - Second Edition" by Ralph Kimball.</value>
@@ -413,5 +414,6 @@
         <value xml:lang="en">The update mode: ${updateMode} is still not supported.</value>
         <value xml:lang="it">Il metodo di aggiornamento: ${updateMode} non è ancora supportato.</value>
         <value xml:lang="ja">更新モード: ${updateMode} はまだサポートされていません。</value>
+        <value xml:lang="zh">还不支持更新状态：${updateMode}。</value>
     </property>
 </resource>

Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonEntityLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonEntityLabels.xml Sat Feb 16 09:23:20 2013
@@ -2304,6 +2304,7 @@
         <value xml:lang="ja">配送完了</value>
         <value xml:lang="pt_BR">Envio Completado</value>
         <value xml:lang="vi">Hoàn thành chuyển hàng</value>
+        <value xml:lang="zh">完成送货</value>
     </property>
     <property key="Enumeration.description.PRDS_PAY_AUTH">
         <value xml:lang="de">Zahlung Autorisierungs Dienst</value>
@@ -2470,6 +2471,7 @@
         <value xml:lang="ja">見積作成</value>
         <value xml:lang="pt_BR">Cotação criada</value>
         <value xml:lang="vi">Tạo báo giá</value>
+        <value xml:lang="zh">新建了询价</value>
     </property>
     <property key="Enumeration.description.PRDS_RTN_ACCEPT">
         <value xml:lang="de">Retoure angenommen</value>
@@ -8841,6 +8843,7 @@
         <value xml:lang="ja">原稿</value>
         <value xml:lang="pt_BR">Projeto</value>
         <value xml:lang="vi">Nháp</value>
+        <value xml:lang="zh">草稿</value>
         <value xml:lang="zh_TW">初稿</value>
     </property>
     <property key="StatusItem.description.CRQ_PENDING">
@@ -8850,6 +8853,7 @@
         <value xml:lang="ja">保留顧客</value>
         <value xml:lang="pt_BR">Pendente</value>
         <value xml:lang="vi">Yêu cầu từ khách hàng đang đợi xử lý</value>
+        <value xml:lang="zh">等待中的客户</value>
         <value xml:lang="zh_TW">等待客戶</value>
     </property>
     <property key="StatusItem.description.CRQ_REJECTED">
@@ -9196,6 +9200,7 @@
         <value xml:lang="ja">テスト済</value>
         <value xml:lang="pt_BR">Testado</value>
         <value xml:lang="vi">Đã kiểm thử</value>
+        <value xml:lang="zh">已测试</value>
     </property>
     <property key="StatusItem.description.FAM_CANCELLED">
         <value xml:lang="de">Annulliert</value>
@@ -9935,18 +9940,21 @@
         <value xml:lang="fr">Créé</value>
         <value xml:lang="ja">作成</value>
         <value xml:lang="vi">Đã tạo</value>
+        <value xml:lang="zh">已新建</value>
     </property>
     <property key="StatusItem.description.LEAVE_APPROVED">
         <value xml:lang="en">Approved</value>
         <value xml:lang="fr">Validé</value>
         <value xml:lang="ja">承認</value>
         <value xml:lang="vi">Đã duyệt</value>
+        <value xml:lang="zh">已批准</value>
     </property>
     <property key="StatusItem.description.LEAVE_REJECTED">
         <value xml:lang="en">Rejected</value>
         <value xml:lang="fr">Rejeté</value>
         <value xml:lang="ja">否認</value>
         <value xml:lang="vi">Từ chối</value>
+        <value xml:lang="zh">已拒绝</value>
     </property>
     <property key="StatusItem.description.MKTG_CAMP_APPROVED">
         <value xml:lang="de">Genehmigt</value>
@@ -11847,6 +11855,7 @@
     <property key="StatusItem.description.TRAINING_APPLIED">
         <value xml:lang="en">Applied</value>
         <value xml:lang="fr">Postulée</value>
+        <value xml:lang="zh">已申请</value>
     </property>
     <property key="StatusItem.description.TRAINING_APPROVED">
         <value xml:lang="en">Approved</value>
@@ -11864,6 +11873,7 @@
         <value xml:lang="fr">Affecté</value>
         <value xml:lang="ja">割当</value>
         <value xml:lang="vi">Đã giao việc</value>
+        <value xml:lang="zh">已指派</value>
     </property>
     <property key="StatusItem.description.TRAINING_PROPOSED">
         <value xml:lang="de">Vorgeschlagen</value>
@@ -15083,6 +15093,7 @@
         <value xml:lang="it">Stampa</value>
         <value xml:lang="ja">印刷済</value>
         <value xml:lang="pt_BR">Impresso</value>
+        <value xml:lang="zh">已打印</value>
     </property>
     <property key="StatusValidChange.transitionName.PICKLIST_INPUT.PICKLIST_ASSIGNED">
         <value xml:lang="de">Zuweisen</value>
@@ -15136,6 +15147,7 @@
         <value xml:lang="it">Stampa</value>
         <value xml:lang="ja">印刷</value>
         <value xml:lang="pt_BR">Imprimir</value>
+        <value xml:lang="zh">打印</value>
     </property>
     <property key="StatusValidChange.transitionName.PICKLIST_PRINTED.PICKLIST_CANCELLED">
         <value xml:lang="en">Cancel</value>
@@ -15145,6 +15157,7 @@
         <value xml:lang="ja">取消</value>
         <value xml:lang="pt_BR">Cancelar</value>
         <value xml:lang="vi">Hủy bỏ</value>
+        <value xml:lang="zh">取消</value>
     </property>
     <property key="StatusValidChange.transitionName.PICKLIST_PRINTED.PICKLIST_PICKED">
         <value xml:lang="en">Pick</value>
@@ -15154,6 +15167,7 @@
         <value xml:lang="ja">ピッキング</value>
         <value xml:lang="pt_BR">Recolher</value>
         <value xml:lang="vi">Chọn ra (pick)</value>
+        <value xml:lang="zh">分拣</value>
     </property>
     <property key="StatusValidChange.transitionName.PMNT_NOT_PAID.PMNT_CANCELLED">
         <value xml:lang="de">Zahlung annullieren</value>
@@ -20523,6 +20537,7 @@
         <value xml:lang="ja">さあ仕事をしよう。自分自身うまく言えない。このテーマはやめた</value>
         <value xml:lang="pt_BR">É Bizzness, é hora Bizzness. Eu não poderia ter dito melhor sozinho. Este tema fica para baixo</value>
         <value xml:lang="vi">It's bizzness, it's bizzness time.  I couldn't have said it better myself. This theme gets down</value>
+        <value xml:lang="zh">商务时代。我不能自己说它是最好的。本风格搞定</value>
     </property>
     <property key="VisualTheme.description.BLUELIGHT">
         <value xml:lang="en">BlueLight Theme: Breadcrumbs, drop-down menus and rounded corners</value>
@@ -20531,6 +20546,7 @@
         <value xml:lang="ja">ブルーライト: パンくずリスト、ドロップダウンメニュー、そして丸いコーナー</value>
         <value xml:lang="pt_BR">Bluelight Tema: Breadcrumbs, menus drop-down e cantos arredondados</value>
         <value xml:lang="vi">BlueLight Theme: Breadcrumbs, drop-down menus and rounded corners</value>
+        <value xml:lang="zh">浅蓝风格：自动的多级导航，下拉式菜单，以及圆角</value>
     </property>
     <property key="VisualTheme.description.DROPPINGCRUMBS">
         <value xml:lang="en">Dropping Crumbs: Evolution of Blue-Light, includes a drop down menu embedded in the breadcrumbs bar</value>
@@ -20539,6 +20555,7 @@
         <value xml:lang="ja">パンくず: ブルーライトの改良。パンくずリストバーに組み込まれたドロップダウンメニューを含む</value>
         <value xml:lang="pt_BR">Descartando Migalhas: Evolução da azul-luz, inclui um menu drop-down incorporado na barra de farinha de rosca</value>
         <value xml:lang="vi">Dropping Crumbs: Evolution of Blue-Light, includes a drop down menu embedded in the breadcrumbs bar</value>
+        <value xml:lang="zh">下拉多级：浅蓝风格的演化版，包括一个嵌入多级导航条的下拉式菜单</value>
     </property>
     <property key="VisualTheme.description.FLAT_GREY">
         <value xml:lang="en">Flat Grey - Floating Layout, Sight-Impaired Accessible, Bidirectional</value>
@@ -20547,6 +20564,7 @@
         <value xml:lang="ja">フラットグレー: 以前のOFBiz標準フローティングレイアウト</value>
         <value xml:lang="pt_BR">Apartamento Grey - Layout padrão antigo OFBiz flutuante</value>
         <value xml:lang="vi">Flat Grey - Floating Layout, Sight-Impaired Accessible, Bidirectional</value>
+        <value xml:lang="zh">浅灰－浮动样式，视觉阻挡，双向</value>
     </property>
     <property key="VisualTheme.description.MULTIFLEX">
         <value xml:lang="en">Alternative VisualTheme for Ecommerce</value>
@@ -20555,6 +20573,7 @@
         <value xml:lang="ja">マルチフレックス: 別のEコマース向けテーマ</value>
         <value xml:lang="pt_BR">Alternativa para VisualTheme Ecommerce</value>
         <value xml:lang="vi">Giao diện trực quan thay thế khác cho trang thương mại điện tử</value>
+        <value xml:lang="zh">电子商务的替代视觉风格</value>
     </property>
     <property key="VisualTheme.description.TOMAHAWK">
         <value xml:lang="en">Tomahawk: the evolution of the Dropping Crumbs theme</value>
@@ -20563,5 +20582,6 @@
         <value xml:lang="ja">トマホーク: パンくずの改良</value>
         <value xml:lang="pt_BR">Tomahawk: a evolução do tema Migalhas Descartando</value>
         <value xml:lang="vi">Tomahawk: Ôi võ đức trí djjava ơi. evolution of the Dropping Crumbs theme</value>
+        <value xml:lang="zh">印第安战斧：下拉多级风格的演化版</value>
     </property>
 </resource>

Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonErrorUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonErrorUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonErrorUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -25,6 +25,7 @@
         <value xml:lang="fr">Clé dupliquée. Cette valeur est déjà présente.</value>
         <value xml:lang="ja">重複キー。キーはすでに存在します。</value>
         <value xml:lang="vi">Khóa đã tồn tại và bị trùng.</value>
+        <value xml:lang="zh">键重复了。该键已存在。</value>
     </property>
     <property key="ImageTransform.error_occurs_during_reading">
         <value xml:lang="da">Der opstår en fejl under læsning</value>

Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonPortalEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonPortalEntityLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonPortalEntityLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/common/config/CommonPortalEntityLabels.xml Sat Feb 16 09:23:20 2013
@@ -26,12 +26,14 @@
         <value xml:lang="ja">メイン</value>
         <value xml:lang="pt_BR">Principal</value>
         <value xml:lang="vi">Trang chủ</value>
+        <value xml:lang="zh">首页</value>
     </property>
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE0">
         <value xml:lang="en">My Comms</value>
         <value xml:lang="fr">Mes communications</value>
         <value xml:lang="ja">私の通信</value>
         <value xml:lang="vi">Truyền thông Riêng</value>
+        <value xml:lang="zh">我的沟通</value>
     </property>
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE1">
         <value xml:lang="en">My Profile</value>
@@ -40,12 +42,14 @@
         <value xml:lang="ja">私のプロファイル</value>
         <value xml:lang="pt_BR">Meu Perfil</value>
         <value xml:lang="vi">Hồ sơ Riêng</value>
+        <value xml:lang="zh">我的简介</value>
     </property>
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE2">
         <value xml:lang="en">Other Party Comms</value>
         <value xml:lang="fr">Autres communications</value>
         <value xml:lang="ja">その他取引先の通信</value>
         <value xml:lang="vi">Truyền thông của Tác nhân liên quan</value>
+        <value xml:lang="zh">其他会员的沟通</value>
     </property>
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE4">
         <value xml:lang="en">My Time Sheet</value>
@@ -54,30 +58,35 @@
         <value xml:lang="ja">私の予定表</value>
         <value xml:lang="pt_BR">Minha folha de tempo</value>
         <value xml:lang="vi">Khai báo công việc Riêng</value>
+        <value xml:lang="zh">我的工单</value>
     </property>
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE5">
         <value xml:lang="en">My Tasks</value>
         <value xml:lang="fr">Mes tâches</value>
         <value xml:lang="ja">私のタスク</value>
         <value xml:lang="vi">Tác vụ - Đầu việc Riêng</value>
+        <value xml:lang="zh">我的任务</value>
     </property>
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE6">
         <value xml:lang="en">My Leave</value>
         <value xml:lang="fr">Mes congés</value>
         <value xml:lang="ja">私の休暇</value>
         <value xml:lang="vi">Nghỉ phép Riêng</value>
+        <value xml:lang="zh">我的休假</value>
     </property>
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE7">
         <value xml:lang="en">My trainings</value>
         <value xml:lang="fr">Mes formations</value>
         <value xml:lang="ja">私のトレーニング</value>
         <value xml:lang="vi">Đào tạo Riêng</value>
+        <value xml:lang="zh">我的培训</value>
     </property>
     <property key="PortalPage.portalPageName.MYPORTAL_EMPLOYEE8">
         <value xml:lang="en">My Payments</value>
         <value xml:lang="fr">Mes paiements</value>
         <value xml:lang="ja">私の支払</value>
         <value xml:lang="vi">Thanh toán Riêng</value>
+        <value xml:lang="zh">我的支付</value>
     </property>
     <property key="PortalPage.portalPageName.ProductStoreFacility">
         <value xml:lang="de">Lager</value>