|
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> |
| Free forum by Nabble | Edit this page |
