svn commit: r1039651 [1/38] - in /ofbiz/branches/jquery: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/ applications/commonext/config/ applications/content/config/ applications/content/we...

Author: jleroux
Date: Sat Nov 27 10:59:21 2010
New Revision: 1039651

URL: http://svn.apache.org/viewvc?rev=1039651&view=rev
Log:
Merges the trunk at r1039574

Added:
    ofbiz/branches/jquery/applications/product/config/promotext_zh_TW.properties
      - copied unchanged from r1039648, ofbiz/trunk/applications/product/config/promotext_zh_TW.properties
Modified:
    ofbiz/branches/jquery/   (props changed)
    ofbiz/branches/jquery/applications/accounting/config/AccountingEntityLabels.xml
    ofbiz/branches/jquery/applications/accounting/config/AccountingErrorUiLabels.xml
    ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
    ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java
    ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AuthorizeResponse.java
    ofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java
    ofbiz/branches/jquery/applications/commonext/config/SetupUiLabels.xml
    ofbiz/branches/jquery/applications/content/config/ContentEntityLabels.xml
    ofbiz/branches/jquery/applications/content/config/ContentErrorUiLabels.xml
    ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml
    ofbiz/branches/jquery/applications/content/webapp/content/survey/SurveyForms.xml
    ofbiz/branches/jquery/applications/content/webapp/content/website/WebSiteForms.xml
    ofbiz/branches/jquery/applications/content/widget/SurveyScreens.xml
    ofbiz/branches/jquery/applications/content/widget/WebSiteScreens.xml
    ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml
    ofbiz/branches/jquery/applications/content/widget/content/ContentMenus.xml
    ofbiz/branches/jquery/applications/content/widget/content/ContentScreens.xml
    ofbiz/branches/jquery/applications/content/widget/content/DataResourceForms.xml
    ofbiz/branches/jquery/applications/humanres/config/HumanResUiLabels.xml
    ofbiz/branches/jquery/applications/manufacturing/config/ManufacturingEntityLabels.xml
    ofbiz/branches/jquery/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
    ofbiz/branches/jquery/applications/manufacturing/config/ManufacturingUiLabels.xml
    ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
    ofbiz/branches/jquery/applications/marketing/config/MarketingEntityLabels.xml
    ofbiz/branches/jquery/applications/marketing/config/MarketingUiLabels.xml
    ofbiz/branches/jquery/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml
    ofbiz/branches/jquery/applications/order/config/OrderEntityLabels.xml
    ofbiz/branches/jquery/applications/order/config/OrderErrorUiLabels.xml
    ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml
    ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml   (props changed)
    ofbiz/branches/jquery/applications/order/servicedef/services_cart.xml
    ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java
    ofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
    ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordernotes.ftl
    ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
    ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryOrderScreens.xml
    ofbiz/branches/jquery/applications/party/config/PartyEntityLabels.xml
    ofbiz/branches/jquery/applications/party/config/PartyErrorUiLabels.xml
    ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml
    ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml
    ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy   (props changed)
    ofbiz/branches/jquery/applications/product/config/ProductEntityLabels.xml
    ofbiz/branches/jquery/applications/product/config/ProductErrorUiLabels.xml
    ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
    ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml   (props changed)
    ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/CategoryServices.java
    ofbiz/branches/jquery/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.groovy
    ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
    ofbiz/branches/jquery/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
    ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductAssoc.ftl
    ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductParties.ftl
    ofbiz/branches/jquery/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
    ofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml
    ofbiz/branches/jquery/applications/securityext/build.xml
    ofbiz/branches/jquery/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java
    ofbiz/branches/jquery/applications/workeffort/config/WorkEffortEntityLabels.xml
    ofbiz/branches/jquery/applications/workeffort/config/WorkEffortUiLabels.xml
    ofbiz/branches/jquery/framework/base/config/DateTimeLabels.xml
    ofbiz/branches/jquery/framework/common/config/CommonEntityLabels.xml
    ofbiz/branches/jquery/framework/common/config/CommonErrorUiLabels.xml
    ofbiz/branches/jquery/framework/common/config/CommonHelpUiLabels.xml
    ofbiz/branches/jquery/framework/common/config/CommonPortalEntityLabels.xml
    ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml
    ofbiz/branches/jquery/framework/common/config/SecurityextUiLabels.xml
    ofbiz/branches/jquery/framework/common/config/TemporalExpressionUiLabels.xml
    ofbiz/branches/jquery/framework/common/webcommon/includes/countries.ftl
    ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml   (props changed)
    ofbiz/branches/jquery/framework/minilang/config/DefaultMessages.xml
    ofbiz/branches/jquery/framework/minilang/config/MiniLangErrorUiLabels.xml
    ofbiz/branches/jquery/framework/security/config/SecurityEntityLabels.xml
    ofbiz/branches/jquery/framework/security/config/security.properties
    ofbiz/branches/jquery/framework/service/config/ServiceErrorUiLabels.xml
    ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java
    ofbiz/branches/jquery/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java
    ofbiz/branches/jquery/framework/webapp/config/WebappEntityLabels.xml
    ofbiz/branches/jquery/framework/webapp/config/WebappUiLabels.xml
    ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java
    ofbiz/branches/jquery/framework/webtools/config/WebtoolsErrorUiLabels.xml
    ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/service/AvailableServices.groovy
    ofbiz/branches/jquery/framework/widget/config/conditional.xml
    ofbiz/branches/jquery/framework/widget/dtd/widget-form.xsd
    ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
    ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
    ofbiz/branches/jquery/specialpurpose/ebaystore/lib/   (props changed)
    ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy   (props changed)
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy   (props changed)
    ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy   (props changed)
    ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml
    ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl

Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 27 10:59:21 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-1036339
+/ofbiz/trunk:951708-1039648