You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/02/20 00:08:32 UTC
svn commit: r746049 [1/2] - in /ofbiz/trunk:
applications/accounting/webapp/accounting/lookup/
applications/accounting/widget/ applications/content/config/
applications/content/webapp/content/cms/
applications/content/webapp/content/content/ applicatio...
Author: mrisaliti
Date: Thu Feb 19 23:08:30 2009
New Revision: 746049
URL: http://svn.apache.org/viewvc?rev=746049&view=rev
Log:
A lot of hardcoded labels cleaning and changes some wrong references
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
ofbiz/trunk/applications/accounting/widget/GlForms.xml
ofbiz/trunk/applications/content/config/ContentUiLabels.xml
ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl
ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
ofbiz/trunk/applications/content/widget/content/ContentForms.xml
ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl
ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl
ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/contact/ContactMechServices.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Visits.ftl
ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl
ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml
ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
ofbiz/trunk/applications/product/webapp/facility/facility/EditFacility.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentItems.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/forms/FacilityForms.xml
ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Thu Feb 19 23:08:30 2009
@@ -54,7 +54,7 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="BillingAccount" default-field-type="hidden" />
<field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}"><text-find/></field>
- <field name="description" title="${uiLabelMap.Description}"><text-find/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><text-find/></field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Thu Feb 19 23:08:30 2009
@@ -88,16 +88,16 @@
<if-has-permission permission="ACCOUNTING" action="_VIEW"/>
</condition>
<actions>
- <set field="title" value="Check"/>
+ <set field="titleProperty" value="AccountingPrintChecks"/>
</actions>
<widgets>
<platform-specific>
<xsl-fo><html-template location="component://accounting/webapp/accounting/payment/printCheck.fo.ftl"/></xsl-fo>
- </platform-specific>
+ </platform-specific>
</widgets>
<fail-widgets>
<label style="h3" text="${uiLabelMap.AccountingPrintChecksPermissionError}"/>
</fail-widgets>
</section>
- </screen>
+ </screen>
</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Thu Feb 19 23:08:30 2009
@@ -517,8 +517,8 @@
<field name="productId"><text size="20"/></field>
<field name="debitCreditFlag">
<drop-down current="selected">
- <option description="Credit" key="C"/>
- <option description="Debit" key="D"/>
+ <option description="${uilabelMap.FormFieldTitle_credit}" key="C"/>
+ <option description="${uilabelMap.FormFieldTitle_debit}" key="D"/>
</drop-down>
</field>
<field name="reconcileStatusId"><text size="30"/></field>
@@ -576,8 +576,8 @@
<field name="isSummary"><display/></field>
<field name="debitCreditFlag">
<drop-down current="selected">
- <option description="Credit" key="C"/>
- <option description="Debit" key="D"/>
+ <option description="${uilabelMap.FormFieldTitle_credit}" key="C"/>
+ <option description="${uilabelMap.FormFieldTitle_debit}" key="D"/>
</drop-down>
</field>
<field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field>
Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -123,6 +123,10 @@
<value xml:lang="en">Browse</value>
<value xml:lang="fr">Sfoglia</value>
</property>
+ <property key="ContentClip">
+ <value xml:lang="en">Clip</value>
+ <value xml:lang="it">Taglia</value>
+ </property>
<property key="ContentCMS">
<value xml:lang="ar">CMS</value>
<value xml:lang="de">CMS</value>
@@ -496,14 +500,22 @@
<value xml:lang="it">Tipo Dati</value>
<value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸à¹à¸à¸¡à¸¹à¸¥</value>
</property>
- <property key="ContentDocumentType">
- <value xml:lang="en">Document Type</value>
- <value xml:lang="it">Tipo documento</value>
+ <property key="ContentDecorator">
+ <value xml:lang="en">Decorator</value>
+ <value xml:lang="it">Decorazione</value>
</property>
<property key="ContentDeleteFolder">
<value xml:lang="en">Delete Folder</value>
<value xml:lang="th">ลà¸à¸à¸¥à¹à¸à¸</value>
</property>
+ <property key="ContentDocumentType">
+ <value xml:lang="en">Document Type</value>
+ <value xml:lang="it">Tipo documento</value>
+ </property>
+ <property key="ContentEditingLatestRevision">
+ <value xml:lang="en">Editing Latest Revision</value>
+ <value xml:lang="it">Aggiorna ultima revisione</value>
+ </property>
<property key="ContentEditProductStore">
<value xml:lang="ar">تØرÙر Ù
خز٠اÙÙ
ÙتÙج</value>
<value xml:lang="de">Produktladen bearbeiten</value>
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Thu Feb 19 23:08:30 2009
@@ -623,7 +623,7 @@
</drop-down>
</field>
-->
- <field name="submitButton" title="Check" widget-style="smallSubmit">
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
Modified: ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/content/EditContentTree.ftl Thu Feb 19 23:08:30 2009
@@ -25,7 +25,7 @@
<br/ <a class="buttontext" href="javascript:document.editContentTree.submit();">${uiLabelMap.ContentRenameFolder}</a><a class="buttontext" href="<@o...@ofbizUrl>">${uiLabelMap.CommonCancel}</a>
<#else>
<div class="h3">${uiLabelMap.ContentNewFolder}</div>
- ${uiLabelMap.ContentRootContent} : ${content.contentName}
+ ${uiLabelMap.ContentRoot} : ${content.contentName}
<input type="text" name="contentName">
<br/><a class="buttontext" href="javascript:document.editContentTree.submit();">${uiLabelMap.CommonCreate}</a><a class="buttontext" href="<@o...@ofbizUrl>">${uiLabelMap.CommonCancel}</a>
</#if>
Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Thu Feb 19 23:08:30 2009
@@ -159,7 +159,7 @@
<field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&drDataResourceId=${drDataResourceId}"/>
</field>
- <field name="dummy" title="Clip" widget-style="buttontext" map-name="dummy">
+ <field name="dummy" title="${uiLabelMap.ContentClip}" widget-style="buttontext" map-name="dummy">
<hyperlink also-hidden="false" description="${contentId}" target="clipFindLayout?contentId=${contentId}&drDataResourceId=${drDataResourceId}&viewSize=${viewSize}&viewIndex=${viewIndex}&entityName=${entityName}"/>
</field>
<field name="contentName"><display/></field>
Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl Thu Feb 19 23:08:30 2009
@@ -321,7 +321,7 @@
</tr>
<#elseif (dataResourceTypeId == 'URL_RESOURCE')>
<tr>
- <td class="label">${uiLabelMap.ContentURL}</td>
+ <td class="label">${uiLabelMap.ContentUrl}</td>
<td>
<input type="text" name="objectInfo" size="40" maxsize="255" value="${(dataResource.objectInfo)?if_exists}"/>
</td>
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Thu Feb 19 23:08:30 2009
@@ -386,30 +386,30 @@
<!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type" widget-style="tabletext"><display/></field> -->
<!-- <field name="contentTypeId" map-name="content" title="Content Type" widget-style="tabletext"><display/></field> -->
- <field name="relatedDetailId" map-name="dataResource" title="Survey ID"
+ <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}"
use-when="dataResource!=null && "SURVEY".equals(dataResource.getString("dataResourceTypeId"))">
<lookup target-form-name="LookupSurvey">
- <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="Edit Survey" link-style="buttontext"
+ <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="${uiLabelMap.PageTitleEditSurvey}" link-style="buttontext"
use-when="dataResource.get("relatedDetailId")!=null"/>
</lookup>
</field>
- <field name="relatedDetailId" map-name="dataResource" title="Survey Response ID"
+ <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurveyResponse}"
use-when="dataResource!=null && "SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId"))">
<lookup target-form-name="LookupSurveyResponse">
<sub-hyperlink target="EditSurveyResponse?surveyResponseId=${dataResource.relatedDetailId}"
- description="Edit Survey Response" link-style="buttontext" use-when="dataResource!=null && dataResource.get("relatedDetailId")!=null"/>
+ description="${uiLabelMap.PageTitleEditSurveyResponse}" link-style="buttontext" use-when="dataResource!=null && dataResource.get("relatedDetailId")!=null"/>
</lookup>
</field>
<field name="addSurveyResponse" map-name="dummy" widget-style="buttontext"
use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")==null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null">
- <hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}&dataResourceId=${dataResource.dataResourceId}&rootContentId=${rootContentId}" also-hidden="false" target-window="_blank"/>
+ <hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}&dataResourceId=${dataResource.dataResourceId}&rootContentId=${rootContentId}" also-hidden="false" target-window="_blank"/>
</field>
<field name="updateSurveyResponse" map-name="dummy" widget-style="buttontext"
use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")!=null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null">
- <hyperlink description="Update Response (for Survey ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}&surveyResponseId=${dataResource.relatedDetailId}&dataResourceId=${dataResource.dataResourceId}&rootContentId=${rootContentId}" also-hidden="false" target-window="_blank"/>
+ <hyperlink description="${uiLabelMap.CommonUpdate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}&surveyResponseId=${dataResource.relatedDetailId}&dataResourceId=${dataResource.dataResourceId}&rootContentId=${rootContentId}" also-hidden="false" target-window="_blank"/>
</field>
- <field name="objectInfo" title="Current File Name" map-name="dataResource" widget-style="tabletext"
+ <field name="objectInfo" map-name="dataResource" widget-style="tabletext"
use-when=""DOCUMENT".equals(contentTypeId) && mimeTypeId!=null && !"application/vnd.ofbiz.survey".equals(mimeTypeId)">
<display also-hidden="false"/>
</field>
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Thu Feb 19 23:08:30 2009
@@ -630,7 +630,7 @@
<if-compare-field field="mostRecentRevisionSeqId" operator="equals" to-field="rootContentRevisionSeqId"/>
</condition>
<widgets>
- <container><label style="tableheadtext" text="Editing Latest Revision [${mostRecentRevisionSeqId}]"/></container>
+ <container><label style="tableheadtext" text="${uiLabelMap.ContentEditingLatestRevision} [${mostRecentRevisionSeqId}]"/></container>
<include-form name="EditChildCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
<include-screen name="ContentViewLink"/>
<include-screen name="UploadCompDocContent"/>
Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Thu Feb 19 23:08:30 2009
@@ -207,11 +207,11 @@
<form name="mruLookupContent" default-entity-name="Content" list-name="mruList" target="" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="contentId" title="Id" widget-style="buttontext">
+ <field name="contentId" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${contentId}" target="javascript:set_value('${contentId}')"/>
</field>
- <field name="contentName" title="Content Name" widget-style="buttontext"><display/></field>
- <field name="description" title="Description" widget-style="buttontext"><display/></field>
+ <field name="contentName" widget-style="buttontext"><display/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}" widget-style="buttontext"><display/></field>
</form>
<!-- ContentAssoc forms -->
<form name="EditContentAssoc" target="updateContentAssoc" title="" type="single"
@@ -520,7 +520,7 @@
</field>
<field name="createdDate"><display description="${content.createdDate}"/></field>
<field name="delete">
- <hyperlink target="removeDocumentFromTree?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}" description="Delete"/>
+ <hyperlink target="removeDocumentFromTree?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
</field>
</form>
<form name="AddDocument" target="addDocumentToTree" title="" type="single"
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Thu Feb 19 23:08:30 2009
@@ -426,7 +426,7 @@
<field name="contentId" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="plain" description="${productFeatureId}" target="javascript:set_value('${productFeatureId}')"/>
</field>
- <field name="description" title="Name" widget-style="buttontext"><display/></field>
+ <field name="description" title="${uiLabelMap.FormFieldTitle_contentName}" widget-style="buttontext"><display/></field>
<field name="productFeatureTypeId" title="Type" widget-style="buttontext"><display/></field>
</form>
Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -638,6 +638,10 @@
<value xml:lang="fr">Modifier le profil</value>
<value xml:lang="it">Aggiorna profilo</value>
</property>
+ <property key="EcommerceEditThisComment">
+ <value xml:lang="en">Edit this comment</value>
+ <value xml:lang="it">Aggiorna questo commento</value>
+ </property>
<property key="EcommerceEmptyBody">
<value xml:lang="de">Leerer Meldungstext</value>
<value xml:lang="en">Empty Body</value>
@@ -3651,34 +3655,6 @@
<value xml:lang="th">à¸à¸²à¸£à¸à¸·à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸¥à¸à¸à¸°à¸à¸£à¹à¸²</value>
<value xml:lang="zh">è´ç©è½¦</value>
</property>
- <property key="PageTitleShowAllPromotions">
- <value xml:lang="de">Alle Aktionen anzeigen</value>
- <value xml:lang="en">Show All Promotions</value>
- <value xml:lang="es">Mostrar las promociones</value>
- <value xml:lang="fr">Montrer toutes les promotions</value>
- <value xml:lang="hi_IN">सारॠपà¥à¤°à¥à¤¤à¥à¤¸à¤¾à¤¹à¤¨ सामान दिà¤à¤¾à¤à¤¯à¥</value>
- <value xml:lang="it">Mostra tutte le promozioni</value>
- <value xml:lang="ja">Show All Promotions</value>
- <value xml:lang="nl">Bekijk alle promoties</value>
- <value xml:lang="ro">Afiseaza Toate Promotiile </value>
- <value xml:lang="ru">ÐоказаÑÑ Ð²Ñе акÑии</value>
- <value xml:lang="th">à¹à¸ªà¸à¸à¹à¸à¸£à¹à¸¡à¸à¸±à¹à¸à¸à¸±à¹à¸à¸«à¸¡à¸</value>
- <value xml:lang="zh">æ¾ç¤ºå
¨é¨ä¿é</value>
- </property>
- <property key="PageTitleShowPromotionDetails">
- <value xml:lang="de">Aktionsdetails anzeigen</value>
- <value xml:lang="en">Show Promotion Details</value>
- <value xml:lang="es">Mostrar Detalles de la promoción</value>
- <value xml:lang="fr">Montrer les détails de la promotion</value>
- <value xml:lang="hi_IN">पà¥à¤°à¥à¤¤à¥à¤¸à¤¾à¤¹à¤¨ विवरण दिà¤à¤¾à¤à¤¯à¥</value>
- <value xml:lang="it">Mostra dettagli promozioni</value>
- <value xml:lang="ja">Show Promotion Details</value>
- <value xml:lang="nl">Bekijk promotie detail</value>
- <value xml:lang="ro">Afiseaza Detalii Promotii </value>
- <value xml:lang="ru">ÐоказаÑÑ Ð´ÐµÑали акÑии</value>
- <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸à¸à¸à¸à¹à¸à¸£à¹à¸¡à¸à¸±à¹à¸</value>
- <value xml:lang="zh">æ¾ç¤ºä¿é详ç»ä¿¡æ¯</value>
- </property>
<property key="PageTitleSplitItemsForShipping">
<value xml:lang="de">Positionen aufteilen für Versand</value>
<value xml:lang="en">Split Items For Shipping</value>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl Thu Feb 19 23:08:30 2009
@@ -49,7 +49,7 @@
<td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="productName" value="${(product.productName)?if_exists}"/>*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.Description}</div></td>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ProductProductDescription}</div></td>
<td width="5"> </td>
<td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${(product.description)?if_exists}"/></td>
</tr>
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml Thu Feb 19 23:08:30 2009
@@ -349,7 +349,7 @@
</condition>
<widgets>
<container style="bloghr">
- <label text="Edit this comment: " style="blogtitle"/>
+ <label text="${uiLabelMap.EcommerceEditThisComment}: " style="blogtitle"/>
</container>
<include-screen name="EditBlogResponse"/>
</widgets>
@@ -543,7 +543,7 @@
</actions>
<widgets>
<container style="bloghr">
- <label text="Add Comment [${content.contentId}]: " style="blogtitle"/>
+ <label text="${uiLabelMap.CommonAdd} ${uiLabelMap.CommonComment} ${content.contentId}: " style="blogtitle"/>
<section>
<condition>
<if-service-permission service-name="genericContentPermission" main-action="CREATE"/>
Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Thu Feb 19 23:08:30 2009
@@ -72,7 +72,7 @@
<set field="partyId" value="Company"/>
</actions>
<widgets>
- <screenlet title="${uiLabelMap.Company}">
+ <screenlet title="${uiLabelMap.FormFieldTitle_company}">
<section>
<widgets>
<include-tree name="OrgTree" location="component://humanres/widget/PartyTrees.xml"/>
Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -605,6 +605,10 @@
<value xml:lang="it">Ordini di Produzione Associati</value>
<value xml:lang="th">สิà¸à¸à¹à¸²à¸à¸µà¹à¹à¸à¸µà¹à¸¢à¸§à¸à¹à¸à¸à¸à¸±à¸</value>
</property>
+ <property key="ManufacturingEngineeringBillOfMaterials">
+ <value xml:lang="en">Engineering Bill of Materials</value>
+ <value xml:lang="it">Distinta base ingegnerizzata</value>
+ </property>
<property key="ManufacturingBillOfMaterials">
<value xml:lang="de">Stückliste</value>
<value xml:lang="en">Bill Of Materials</value>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml Thu Feb 19 23:08:30 2009
@@ -128,8 +128,8 @@
<field name="productIdTo"><lookup target-form-name="LookupProduct"/></field>
<field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}">
<drop-down allow-empty="true">
- <option key="MANUF_COMPONENT" description="Manufacturing Bill of Materials"/>
- <option key="ENGINEER_COMPONENT" description="Engineering Bill of Materials"/>
+ <option key="MANUF_COMPONENT" description="${uiLabelMap.ManufacturingBillOfMaterials}"/>
+ <option key="ENGINEER_COMPONENT" description="${uiLabelMap.ManufacturingEngineeringBillOfMaterials}"/>
</drop-down>
</field>
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
@@ -151,8 +151,8 @@
<field name="productIdTo" title="${uiLabelMap.ProductProductIdTo}"><lookup target-form-name="LookupProduct" size="16"/></field>
<field name="productAssocTypeId" title="${uiLabelMap.ManufacturingBomType}">
<drop-down>
- <option key="MANUF_COMPONENT" description="Manufacturing Bill of Materials"/>
- <option key="ENGINEER_COMPONENT" description="Engineering Bill of Materials"/>
+ <option key="MANUF_COMPONENT" description="${uiLabelMap.ManufacturingBillOfMaterials}"/>
+ <option key="ENGINEER_COMPONENT" description="${uiLabelMap.ManufacturingEngineeringBillOfMaterials}"/>
</drop-down>
</field>
<field name="quantity" title="${uiLabelMap.ManufacturingQuantity}"><text size="6"/></field>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl Thu Feb 19 23:08:30 2009
@@ -49,7 +49,7 @@
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductHeight}</fo:block></fo:table-cell>
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductQuantity}</fo:block></fo:table-cell>
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProduct}</fo:block></fo:table-cell>
- <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.Description}</fo:block></fo:table-cell>
+ <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProductDescription}</fo:block></fo:table-cell>
</fo:table-row>
</fo:table-header>
<fo:table-body>
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Thu Feb 19 23:08:30 2009
@@ -43,13 +43,13 @@
<br/><br/>
</tr>
<tr width="100%">
- <td width="20%">${uiLabelMap.CommonFirstName}</td>
+ <td width="20%">${uiLabelMap.PartyFirstName}</td>
<td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td>
<td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td>
<td width="20%"></td>
</tr>
<tr width="100%">
- <td width="20%">${uiLabelMap.CommonLastName}</td>
+ <td width="20%">${uiLabelMap.PartyLastName}</td>
<td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td>
<td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td>
<td width="20%"></td>
@@ -58,39 +58,39 @@
<td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td>
<td width="30"></td>
<tr>
- <td width="20%" >${uiLabelMap.CommonAddress1}</td>
+ <td width="20%" >${uiLabelMap.PartyAddressLine1}</td>
<td width="30%">${contactInfo1.address1?if_exists}</td>
<td width="30%">${contactInfo2.address1?if_exists}</td>
<td width="20%"><input type="checkbox" name="useAddress2" value="Y"/></td>
</tr>
<tr>
- <td width="20%" >${uiLabelMap.CommonAddress2}</td>
+ <td width="20%" >${uiLabelMap.PartyAddressLine2}</td>
<td width="30%">${contactInfo1.address2?if_exists}</td>
<td width="30%">${contactInfo2.address2?if_exists}</td>
<td width="20%"></td>
</tr>
<tr>
- <td width="20%" >${uiLabelMap.CommonCity}</td>
+ <td width="20%" >${uiLabelMap.PartyCity}</td>
<td width="30%">${contactInfo1.city?if_exists}</td>
<td width="30%">${contactInfo2.city?if_exists}</td>
<td width="20%"></td>
</tr>
<tr>
- <td width="20%">${uiLabelMap.CommonState}</td>
+ <td width="20%">${uiLabelMap.PartyState}</td>
<td width="30%">${contactInfo1.state?if_exists}</td>
<td width="30%">${contactInfo2.state?if_exists}</td>
<td width="20%"></td>
</tr>
<tr>
- <td width="20%">${uiLabelMap.CommonZipPostalCode}</td>
+ <td width="20%">${uiLabelMap.PartyZipCode}</td>
<td width="30%">${contactInfo1.postalCode?if_exists}</td>
<td width="30%">${contactInfo2.postalCode?if_exists}</td>
<td width="20%"></td>
</tr>
<tr>
- <td width="20%" >${uiLabelMap.CommonCountry}</td>
+ <td width="20%" >${uiLabelMap.PartyCountry}</td>
<td width="30%">${contactInfo1.country?if_exists}</td>
<td width="30%">${contactInfo2.country?if_exists}</td>
<td width="20%"></td>
@@ -115,14 +115,14 @@
<td width="20%"></td>
</tr>
<tr>
- <td width="20%" >${uiLabelMap.CommonEmail}</td>
+ <td width="20%" >${uiLabelMap.PartyEmailAddress}</td>
<td width="30%">${contactInfo1.primaryEmail?if_exists}</td>
<td width="30%">${contactInfo2.primaryEmail?if_exists}</td>
<td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td>
</tr>
<tr>
<td colspan="4" align="center"><br/>
- <input type="submit" value="submit"/>
+ <input type="submit" value="${uiLabelMap.CommonSubmit}"/>
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Thu Feb 19 23:08:30 2009
@@ -28,13 +28,13 @@
<br/><br/>
</tr>
<tr width="100%">
- <td width="20%">${uiLabelMap.CommonFirstName}</td>
+ <td width="20%">${uiLabelMap.PartyFirstName}</td>
<td width="30%"><h3>${contactInfo1.firstName?if_exists}</h3></td>
<td width="30%"><h3>${contactInfo2.firstName?if_exists}</h3></td>
<td width="20%"></td>
</tr>
<tr width="100%">
- <td width="20%">${uiLabelMap.CommonLastName}</td>
+ <td width="20%">${uiLabelMap.PartyLastName}</td>
<td width="30%"><h3>${contactInfo1.lastName?if_exists}</h3></td>
<td width="30%"><h3>${contactInfo2.lastName?if_exists}</h3></td>
<td width="20%"></td>
@@ -43,39 +43,39 @@
<td width="30"><br/><h3>${uiLabelMap.PartyGeneralCorrespondenceAddress}</h3></td>
<td width="30"></td>
<tr>
- <td width="20%" >${uiLabelMap.CommonAddress1}</td>
+ <td width="20%" >${uiLabelMap.PartyAddressLine1}</td>
<td width="30%">${contactInfo1.address1?if_exists}</td>
<td width="30%">${contactInfo2.address1?if_exists}</td>
<td width="20%"><input type="checkbox" name="useAddress2" value="Y"/></td>
</tr>
<tr>
- <td width="20%" >${uiLabelMap.CommonAddress2}</td>
+ <td width="20%" >${uiLabelMap.PartyAddressLine2}</td>
<td width="30%">${contactInfo1.address2?if_exists}</td>
<td width="30%">${contactInfo2.address2?if_exists}</td>
<td width="20%"></td>
</tr>
<tr>
- <td width="20%" >${uiLabelMap.CommonCity}</td>
+ <td width="20%" >${uiLabelMap.PartyCity}</td>
<td width="30%">${contactInfo1.city?if_exists}</td>
<td width="30%">${contactInfo2.city?if_exists}</td>
<td width="20%"></td>
</tr>
<tr>
- <td width="20%">${uiLabelMap.CommonState}</td>
+ <td width="20%">${uiLabelMap.PartyState}</td>
<td width="30%">${contactInfo1.state?if_exists}</td>
<td width="30%">${contactInfo2.state?if_exists}</td>
<td width="20%"></td>
</tr>
<tr>
- <td width="20%">${uiLabelMap.CommonZipPostalCode}</td>
+ <td width="20%">${uiLabelMap.PartyZipCode}</td>
<td width="30%">${contactInfo1.postalCode?if_exists}</td>
<td width="30%">${contactInfo2.postalCode?if_exists}</td>
<td width="20%"></td>
</tr>
<tr>
- <td width="20%" >${uiLabelMap.CommonCountry}</td>
+ <td width="20%" >${uiLabelMap.PartyCountry}</td>
<td width="30%">${contactInfo1.country?if_exists}</td>
<td width="30%">${contactInfo2.country?if_exists}</td>
<td width="20%"></td>
@@ -100,14 +100,14 @@
<td width="20%"></td>
</tr>
<tr>
- <td width="20%" >${uiLabelMap.CommonEmail}</td>
+ <td width="20%" >${uiLabelMap.PartyEmailAddress}</td>
<td width="30%">${contactInfo1.primaryEmail?if_exists}</td>
<td width="30%">${contactInfo2.primaryEmail?if_exists}</td>
<td width="10%"><input type="checkbox" name="useEmail2" value="Y"/></td>
</tr>
<tr>
<td colspan="4" align="center"><br/>
- <input type="submit" value="submit"/>
+ <input type="submit" value="${uiLabelMap.CommonSubmit}"/>
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -843,6 +843,10 @@
<value xml:lang="th">ERROR : à¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸ ! à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸£à¸µà¸¢à¸à¸à¸±à¸à¸à¸¶à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸µà¹à¸à¸·à¸à¸à¹à¸²à¸à¸²à¸à¸«à¸±à¸§à¸à¹à¸à¸à¸²à¸£à¸à¸·à¸à¸à¹à¸²</value>
<value xml:lang="zh">é误ï¼æ æ³ä»é货头è·å¾éè´§æç»è®°å½</value>
</property>
+ <property key="OrderErrorUnableToGetTheItemReturnableProduct">
+ <value xml:lang="en">ERROR : Unable to get the item returnable product.</value>
+ <value xml:lang="it">ERRORE : Non è possibile ottenere il prodotto riga resa.</value>
+ </property>
<property key="OrderErrorUnableToGetTheItemReturnableQuantity">
<value xml:lang="en">ERROR : Unable to get the item returnable quantity.</value>
<value xml:lang="es">ERROR: No se pudo obtener la cantidad de Ãtem retornable.</value>
@@ -1485,6 +1489,10 @@
<value xml:lang="th">à¸à¸±à¸à¸«à¸²à¸à¹à¸§à¸¢à¸à¸²à¸£à¸ªà¸£à¹à¸²à¸à¹à¸à¸à¸³à¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²; à¹à¸¡à¹à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸´à¸à¸´à¸à¸à¸¥</value>
<value xml:lang="zh">å建å票æ¶åºç°é®é¢ï¼æ°åæç»æ²¡ææ§è¡ã </value>
</property>
+ <property key="OrderProblemWithInvoiceCreationServiceItems">
+ <value xml:lang="en">Problem with invoice creation service items</value>
+ <value xml:lang="it">Problema con il servizio di creazione righe fattura</value>
+ </property>
<property key="OrderProblemsAddingItemFromListToCart">
<value xml:lang="en">Problems adding item from list to cart</value>
<value xml:lang="es">Problemas agregando Ãtem de una lista hacia el carro</value>
@@ -1606,12 +1614,20 @@
<value xml:lang="th">à¸à¸±à¸à¸«à¸²à¸à¸²à¸£à¸à¸±à¸à¹à¸à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸à¸²à¸£à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸µà¹à¸¡à¸¥</value>
<value xml:lang="zh">åå¨è®¢åçµåé®ä»¶è系信æ¯æ¶åºç°é®é¢</value>
</property>
+ <property key="OrderProblemsWithCheckPaymentAmountForRefund">
+ <value xml:lang="en">Problems with check payment amount for refund</value>
+ <value xml:lang="it">Problema nel controllo importo pagamento per reso</value>
+ </property>
<property key="OrderProblemsWithGetPartyAcctgPreferences">
<value xml:lang="en">Problems with getting PartyAcctgPreference. </value>
<value xml:lang="es">Hay problemas al obtener preferencias de contabilidad de participante.</value>
<value xml:lang="fr">Problème à l'obtention des préférences comptabilité de l'acteur</value>
<value xml:lang="it">Problema nell'ottenere PartyAcctgPreference.</value>
</property>
+ <property key="OrderProblemsWithGetReturnAmountByOrder">
+ <value xml:lang="en">Problems with getting return amount by order</value>
+ <value xml:lang="it">Problema nell'ottenere importo reso dell'ordine</value>
+ </property>
<property key="OrderProblemsWithPaymentTypeLookup">
<value xml:lang="en">Problems with PaymentType lookup. </value>
<value xml:lang="es">Problemas con la consulta del tipo de pago.</value>
@@ -1686,6 +1702,14 @@
<value xml:lang="th">à¹à¸à¹à¸£à¸±à¸ NULL สำหรัà¸à¸£à¸²à¸¢à¸à¸²à¸£à¹à¸à¸à¸³à¸ªà¸±à¹à¸à¸à¸·à¹à¸à¸à¸±à¸à¸à¸¶à¸à¸£à¸«à¸±à¸ªà¹à¸à¸à¸³à¸ªà¸±à¹à¸à¸à¸·à¹à¸ : ${orderId}</value>
<value xml:lang="zh">æ¥æ¶å°ç订åæ è¯ä¸º ${orderId} ç订åæç»è®°å½æ¯ NULL</value>
</property>
+ <property key="OrderRefundAmountExceedsOrderTotal">
+ <value xml:lang="en">Refund Amount Exceeds Order Total</value>
+ <value xml:lang="it">Importo restituito eccede il totale ordine</value>
+ </property>
+ <property key="OrderRemoveCommunicationEventOrderPermissionError">
+ <value xml:lang="en">Remove Communication Event Order Permission Error</value>
+ <value xml:lang="it">Errore permesso durante la rimozione di un'evento comunicazione</value>
+ </property>
<property key="OrderRentalOrderItems">
<value xml:lang="en">Rental order items in the order, however no workEfforts with start/end date and number of persons</value>
<value xml:lang="es">Ãtems de alquiler en el pedido</value>
@@ -1791,6 +1815,14 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ addPaymentMethodToOrder à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_CREATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ addPaymentMethodToOrderï¼ä½ å¿
é¡»å
·æ ORDERMGR_CREATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunAutoCreateOrderAdjustments">
+ <value xml:lang="en">Security Error To Run Auto Create Order Adjustments</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione automatica aggiustamenti ordine</value>
+ </property>
+ <property key="OrderSecurityErrorToRunAutoCreateQuoteAdjustments">
+ <value xml:lang="en">Security Error To Run Auto Create Quote Adjustments</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione automatica aggiustamenti preventivo</value>
+ </property>
<property key="OrderSecurityErrorToRunAutoUpdateQuotePrice">
<value xml:lang="en">Security Error : to run autoUpdateQuotePrice you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar autoUpdateQuotePrice debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -1850,6 +1882,26 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ checkCreateStockRequirementà¸à¸¸à¸£à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_CREATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ checkCreateStockRequirementï¼ä½ å¿
é¡»å
·æ ORDERMGR_CREATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunCheckUpdateQuoteStatus">
+ <value xml:lang="en">Security Error To Run Check Update Quote Status</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione del controllo dello stato aggiornamento preventivo</value>
+ </property>
+ <property key="OrderSecurityErrorToRunCopyCustRequestItem">
+ <value xml:lang="en">Security Error To Run Copy Cust Request Item</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della copia riga richiesta cliente</value>
+ </property>
+ <property key="OrderSecurityErrorToRunCopyQuote">
+ <value xml:lang="en">Security Error To Run Copy Quote</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della copia preventivo</value>
+ </property>
+ <property key="OrderSecurityErrorToRunCopyQuoteItem">
+ <value xml:lang="en">Security Error To Run Copy Quote Item</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della copia riga preventivo</value>
+ </property>
+ <property key="OrderSecurityErrorToRunCreateCustRequest">
+ <value xml:lang="en">Security Error To Run Create Cust Request</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione richiesta cliente</value>
+ </property>
<property key="OrderSecurityErrorToRunCreateOrderAdjustement">
<value xml:lang="en">Security Error : to run createOrderAdjustment you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar createOrderAdjustment debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -1879,6 +1931,14 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ createOrderShipment à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_CREATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ createOrderShipmentï¼ä½ å¿
é¡»å
·æ ORDERMGR_CREATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunCreateOrderTerm">
+ <value xml:lang="en">Security Error To Run Create Order Term</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione termine ordine</value>
+ </property>
+ <property key="OrderSecurityErrorToRunCreateQuantityBreak">
+ <value xml:lang="en">Security Error To Run Create Quantity Break</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione intervallo quantità </value>
+ </property>
<property key="OrderSecurityErrorToRunCreateQuote">
<value xml:lang="en">Security Error : to run createQuote you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar createQuote debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -1889,6 +1949,10 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ createQuote à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_CREATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ createQuoteï¼ä½ å¿
é¡»å
·æ ORDERMGR_CREATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunCreateQuoteAdjustment">
+ <value xml:lang="en">Security Error To Run Create Quote Adjustment</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione aggiustamenti preventivo</value>
+ </property>
<property key="OrderSecurityErrorToRunCreateQuoteAndQuoteItemForRequest">
<value xml:lang="en">Security Error : to run createQuoteAndQuoteItemForRequest you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar createQuoteAndQuoteItemForRequest debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -1919,6 +1983,14 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ createQuoteCoefficient à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_CREATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ createQuoteCoefficientï¼ä½ å¿
é¡»å
·æ ORDERMGR_CREATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunCreateQuoteFromCart">
+ <value xml:lang="en">Security Error To Run Create Quote From Cart</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione preventivo dal carrello</value>
+ </property>
+ <property key="OrderSecurityErrorToRunCreateQuoteFromCustRequest">
+ <value xml:lang="en">Security Error To Run Create Quote From Cust Request</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione preventivo dalla richiesta cliente</value>
+ </property>
<property key="OrderSecurityErrorToRunCreateQuoteItem">
<value xml:lang="en">Security Error : to run createQuoteItem you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar createQuoteItem debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -1929,6 +2001,10 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ createQuoteItem à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_CREATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ createQuoteItemï¼ä½ å¿
é¡»å
·æ ORDERMGR_CREATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunCreateReturnItemShipment">
+ <value xml:lang="en">Security Error To Run Create Return Item Shipment</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione della creazione riga reso spedizione</value>
+ </property>
<property key="OrderSecurityErrorToRunCreateRequirementFromItemATP">
<value xml:lang="en">Security Error: to run createRequirementFromItemATP you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar createRequirementFromItemATP debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -2025,6 +2101,14 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ removeOrderContactMech à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_DELETE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ removeOrderContactMechï¼ä½ å¿
é¡»å
·æ ORDERMGR_DELETE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunRemoveOrderTerm">
+ <value xml:lang="en">Security Error while running removeOrderTerm</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione del servizio removeOrderTerm</value>
+ </property>
+ <property key="OrderSecurityErrorToRunRemoveQuantityBreak">
+ <value xml:lang="en">Security Error while running removeQuantityBreak</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione del servizio removeQuantityBreak</value>
+ </property>
<property key="OrderSecurityErrorToRunRemoveQuoteAttribute">
<value xml:lang="en">Security Error : to run removeQuoteAttribute you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar removeQuoteAttribute debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -2035,6 +2119,10 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ removeQuoteAttribute à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_CREATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ removeQuoteAttributeï¼ä½ å¿
é¡»å
·æ ORDERMGR_CREATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunRemoveQuoteAdjustment">
+ <value xml:lang="en">Security Error while running removeQuoteAdjustment</value>
+ <value xml:lang="it">Errore sicurezza durante l'esecuzione del servizio removeQuoteAdjustment</value>
+ </property>
<property key="OrderSecurityErrorToRunRemoveQuoteCoefficient">
<value xml:lang="en">Security Error : to run removeQuoteCoefficient you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar removeQuoteCoefficient debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -2100,6 +2188,16 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ updateOrderItemShipGroup à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_UPDATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ updateOrderItemShipGroupï¼ä½ å¿
é¡»å
·æ ORDERMGR_UPDATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunUpdateOrderNote">
+ <value xml:lang="de">Fehler beim Wechseln einer Anmerkung Privat/Ãffentlich</value>
+ <value xml:lang="en">Error in toggling notes to Private/Public</value>
+ <value xml:lang="es">Error al cambiar notas a privado/público</value>
+ <value xml:lang="fr">Erreur dans le basculement de notes entre privé et public</value>
+ <value xml:lang="it">Errore nella impostazione delle note a private/pubbliche</value>
+ <value xml:lang="ru">ÐÑибка пеÑеклÑÑÐµÐ½Ð¸Ñ Ð·Ð°Ð¼ÐµÑки в пÑиваÑнÑÑ/пÑблиÑнÑÑ</value>
+ <value xml:lang="th">Error in toggling notes to Private/Public</value>
+ <value xml:lang="zh">æ便笺åç§æ/å
¬å¼åæ¢æ¶åçé误</value>
+ </property>
<property key="OrderSecurityErrorToRunUpdateOrderStatusFromReceipt">
<value xml:lang="en">Security Error : to run updateOrderStatusFromReceipt you must have the ORDERMGR_UPDATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar updateOrderStatusFromReceipt debe contar con los permisos ORDERMGR_UPDATE o ORDERMGR_ADMIN</value>
@@ -2109,7 +2207,7 @@
<value xml:lang="ru">ÐÑибка безопаÑноÑÑи: Ð´Ð»Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ updateOrderStatusFromReceipt Ñ Ð²Ð°Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¿Ñава ORDERMGR_UPDATE или ORDERMGR_ADMIN </value>
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ updateOrderStatusFromReceipt à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_UPDATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ updateOrderStatusFromReceiptï¼ä½ å¿
é¡»å
·æ ORDERMGR_UPDATE æ ORDERMGR_ADMIN æé</value>
- </property>
+ </property>
<property key="OrderSecurityErrorToRunUpdateQuote">
<value xml:lang="en">Security Error : to run updateQuote you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
<value xml:lang="es">Error de seguridad: Para ejecutar updateQuote debe contar con los permisos ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
@@ -2160,6 +2258,18 @@
<value xml:lang="th">Security Error: à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัยà¸à¸´à¸à¸à¸¥à¸²à¸ ! à¸à¸¶à¸à¸à¸²à¸£à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£ updateReturnHeader à¸à¸¸à¸à¸à¹à¸à¸à¸¡à¸µ ORDERMGR_UPDATE หรืภORDERMGR_ADMIN à¸à¸à¸¸à¸à¸²à¸</value>
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡ updateReturnHeaderï¼ä½ å¿
é¡»å
·æ ORDERMGR_UPDATE æ ORDERMGR_ADMIN æé</value>
</property>
+ <property key="OrderSecurityErrorToRunUpdateOrderTerm">
+ <value xml:lang="en">Security Error while running service updateOrderTerm</value>
+ <value xml:lang="it">Errore Sicurezza durante l'esecuzione del servizio updateOrderTerm</value>
+ </property>
+ <property key="OrderSecurityErrorToRunUpdateQuantityBreak">
+ <value xml:lang="en">Security Error while running service updateQuantityBreak</value>
+ <value xml:lang="it">Errore Sicurezza durante l'esecuzione del servizio updateQuantityBreak</value>
+ </property>
+ <property key="OrderSecurityErrorToRunUpdateQuoteAdjustment">
+ <value xml:lang="en">Security Error while running service updateQuoteAdjustment</value>
+ <value xml:lang="it">Errore Sicurezza durante l'esecuzione del servizio updateQuoteAdjustment</value>
+ </property>
<property key="OrderSelectASuplierOrAProduct">
<value xml:lang="en">Select A Suplier Or A Product</value>
<value xml:lang="es">Seleccione un proveedor o un producto</value>
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Thu Feb 19 23:08:30 2009
@@ -1566,7 +1566,7 @@
<value xml:lang="ru">ÐлаÑежнÑй адÑеÑ</value>
<value xml:lang="th">à¸à¸µà¹à¸à¸¢à¸¹à¹à¹à¸à¹à¸ªà¸£à¹à¸à¸£à¸±à¸à¹à¸à¸´à¸</value>
</property>
- <property key="OrderBoxNumber">
+ <property key="OrderBoxNumber">
<value xml:lang="en">Box Number</value>
<value xml:lang="it">Scatola numero</value>
</property>
@@ -4031,6 +4031,14 @@
<value xml:lang="th">à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸à¸´à¸à¸à¹à¸à¸à¸µà¹à¸à¸¢à¸¹à¹à¸à¸µà¹à¹à¸à¹</value>
<value xml:lang="zh">没æææå°å</value>
</property>
+ <property key="OrderNoAgreementFoundWithIdNotDoingPromotions">
+ <value xml:lang="en">No Agreement Found With Id Not Doing Promotions</value>
+ <value xml:lang="it">Nessun contratto trovato con questo id nessuna promozione verrà creata</value>
+ </property>
+ <property key="OrderNoAgreementItemFoundForAgreementWithIdNotDoingPromotions">
+ <value xml:lang="en">No Agreement Item Found With Id Not Doing Promotions</value>
+ <value xml:lang="it">Nessuna riga contratto trovata con questo id nessuna promozione verrà creata</value>
+ </property>
<property key="OrderNoChannel">
<value xml:lang="de">Kein Kanal</value>
<value xml:lang="en">No Channel</value>
@@ -6780,6 +6788,10 @@
<value xml:lang="th">à¸à¹à¸²à¸à¸à¸´à¸</value>
<value xml:lang="zh">询价</value>
</property>
+ <property key="OrderQuotePricePermissionError">
+ <value xml:lang="en">Quote Price Permission Error</value>
+ <value xml:lang="it">Errore permesso prezzo preventivo</value>
+ </property>
<property key="OrderRanking">
<value xml:lang="cs">PoÅadÃ</value>
<value xml:lang="de">Rangfolge</value>
@@ -7946,6 +7958,10 @@
<value xml:lang="zh">éå®è®¢å</value>
<value xml:lang="zh_CN">éå®è®¢å</value>
</property>
+ <property key="OrderSalesOrderLookupFailed">
+ <value xml:lang="en">Sales Order Lookup Failed</value>
+ <value xml:lang="it">Ricerca ordini di vendita fallita</value>
+ </property>
<property key="OrderSalesTax">
<value xml:lang="cs">DPH</value>
<value xml:lang="de">Mehrwertsteuer</value>
@@ -8004,16 +8020,6 @@
<value xml:lang="th">à¹à¸à¹à¸¡</value>
<value xml:lang="zh">è®°å</value>
</property>
- <property key="OrderSecurityErrorToRunUpdateOrderNote">
- <value xml:lang="de">Fehler beim Wechseln einer Anmerkung Privat/Ãffentlich</value>
- <value xml:lang="en">Error in toggling notes to Private/Public</value>
- <value xml:lang="es">Error al cambiar notas a privado/público</value>
- <value xml:lang="fr">Erreur dans le basculement de notes entre privé et public</value>
- <value xml:lang="it">Errore nella impostazione delle note a private/pubbliche</value>
- <value xml:lang="ru">ÐÑибка пеÑеклÑÑÐµÐ½Ð¸Ñ Ð·Ð°Ð¼ÐµÑки в пÑиваÑнÑÑ/пÑблиÑнÑÑ</value>
- <value xml:lang="th">Error in toggling notes to Private/Public</value>
- <value xml:lang="zh">æ便笺åç§æ/å
¬å¼åæ¢æ¶åçé误</value>
- </property>
<property key="OrderSelAmount">
<value xml:lang="en">Sel. amount</value>
<value xml:lang="es">Cantidad sel.</value>
@@ -10098,6 +10104,34 @@
<value xml:lang="en">Shopping List Item</value>
<value xml:lang="it">Riga lista d'acquisto</value>
</property>
+ <property key="PageTitleShowAllPromotions">
+ <value xml:lang="de">Alle Aktionen anzeigen</value>
+ <value xml:lang="en">Show All Promotions</value>
+ <value xml:lang="es">Mostrar las promociones</value>
+ <value xml:lang="fr">Montrer toutes les promotions</value>
+ <value xml:lang="hi_IN">सारॠपà¥à¤°à¥à¤¤à¥à¤¸à¤¾à¤¹à¤¨ सामान दिà¤à¤¾à¤à¤¯à¥</value>
+ <value xml:lang="it">Mostra tutte le promozioni</value>
+ <value xml:lang="ja">Show All Promotions</value>
+ <value xml:lang="nl">Bekijk alle promoties</value>
+ <value xml:lang="ro">Afiseaza Toate Promotiile </value>
+ <value xml:lang="ru">ÐоказаÑÑ Ð²Ñе акÑии</value>
+ <value xml:lang="th">à¹à¸ªà¸à¸à¹à¸à¸£à¹à¸¡à¸à¸±à¹à¸à¸à¸±à¹à¸à¸«à¸¡à¸</value>
+ <value xml:lang="zh">æ¾ç¤ºå
¨é¨ä¿é</value>
+ </property>
+ <property key="PageTitleShowPromotionDetails">
+ <value xml:lang="de">Aktionsdetails anzeigen</value>
+ <value xml:lang="en">Show Promotion Details</value>
+ <value xml:lang="es">Mostrar Detalles de la promoción</value>
+ <value xml:lang="fr">Montrer les détails de la promotion</value>
+ <value xml:lang="hi_IN">पà¥à¤°à¥à¤¤à¥à¤¸à¤¾à¤¹à¤¨ विवरण दिà¤à¤¾à¤à¤¯à¥</value>
+ <value xml:lang="it">Mostra dettagli promozioni</value>
+ <value xml:lang="ja">Show Promotion Details</value>
+ <value xml:lang="nl">Bekijk promotie detail</value>
+ <value xml:lang="ro">Afiseaza Detalii Promotii </value>
+ <value xml:lang="ru">ÐоказаÑÑ Ð´ÐµÑали акÑии</value>
+ <value xml:lang="th">à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸à¸à¸à¸à¹à¸à¸£à¹à¸¡à¸à¸±à¹à¸</value>
+ <value xml:lang="zh">æ¾ç¤ºä¿é详ç»ä¿¡æ¯</value>
+ </property>
<property key="PageTitleViewRequest">
<value xml:lang="de">Anfrage anzeigen</value>
<value xml:lang="en">View Request</value>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/communication/CommunicationEventServices.xml Thu Feb 19 23:08:30 2009
@@ -32,7 +32,7 @@
</simple-method>
<simple-method method-name="removeCommunicationEventOrder" short-description="Remove a CommunicationEventOrder">
<check-permission permission="ORDERMGR" action="_CREATE">
- <fail-property resource="OrderUiLabels" property="OrderRemoveCommunicationEventOrderPermissionError"/>
+ <fail-property resource="OrderErrorUiLabels" property="OrderRemoveCommunicationEventOrderPermissionError"/>
</check-permission>
<check-errors/>
<entity-one entity-name="CommunicationEventOrder" value-field="eventOrder"/>
Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Thu Feb 19 23:08:30 2009
@@ -653,7 +653,7 @@
</simple-method>
<simple-method method-name="createQuoteAdjustment" short-description="Create a QuoteAdjustment">
<check-permission permission="ORDERMGR" action="_CREATE">
- <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateQuoteAdjustement"/>
+ <fail-property resource="OrderErrorUiLabels" property="OrderSecurityErrorToRunCreateQuoteAdjustment"/>
</check-permission>
<check-errors/>
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Thu Feb 19 23:08:30 2009
@@ -1024,7 +1024,7 @@
}
} else {
// should never happen
- return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderPleaseContactCustomerService;PaymentReturnCodeUnknown.", Locale.getDefault()));
+ return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderPleaseContactCustomerServicePaymentReturnCodeUnknown", Locale.getDefault()));
}
} else {
// result returned null == service failed
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Thu Feb 19 23:08:30 2009
@@ -532,7 +532,6 @@
if (categoryId == null || categoryId.length() <= 0) {
errMsg = UtilProperties.getMessage(resource,"cart.category_not_specified_to_add_from", this.cart.getLocale());
result = ServiceUtil.returnError(errMsg);
-// result = ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderNoCategorySpecifiedToAddFrom.",this.cart.getLocale()));
return result;
}
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderheaderinfo.ftl Thu Feb 19 23:08:30 2009
@@ -95,7 +95,7 @@
<#if trackingNumber?has_content>
<tr>
<td align="right" valign="top" width="15%">
- <div> <b>${uiLabelMap.FacilityTrackingNumber}</b></div>
+ <div> <b>${uiLabelMap.OrderTrackingNumber}</b></div>
</td>
<td width="5"> </td>
<td valign="top" width="80%">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/QuoteLinks.ftl Thu Feb 19 23:08:30 2009
@@ -19,8 +19,8 @@
<#if custRequestItem?exists>
<#if quoteId?has_content>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewQuoteItemForQuote}</a> [${quoteId}]</div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleEditQuoteItemForCustRequest}</a> [${quoteId}]</div>
<#else>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewQuoteAndQuoteItem}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PageTitleCreateQuoteForCustRequest}</a></div>
</#if>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/task/ordertasklist.ftl Thu Feb 19 23:08:30 2009
@@ -126,7 +126,7 @@
<td><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderOrderDate}</a></td>
<td width="1" align="right"><a href="<@o...@ofbizUrl>">Total</a></td>
<td width="1"> </td>
- <td><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderStartdateTime}</a></td>
+ <td><a href="<@o...@ofbizUrl>">${uiLabelMap.OrderStartDateTime}</a></td>
<td><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonPriority}</a></td>
<td><a href="<@o...@ofbizUrl>">${uiLabelMap.CommonMyStatus}</a></td>
</tr>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Thu Feb 19 23:08:30 2009
@@ -96,7 +96,7 @@
<screen name="survey">
<section>
<actions>
- <set field="title" value="Show Cart"/>
+ <set field="titleProperty" value="PageTitleOrderShowCart"/>
<set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/>
<set field="promoUseDetailsInlineScreen" value="component://order/widget/ordermgr/OrderEntryCartScreens.xml#promoUseDetailsInline"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy"/>
@@ -116,7 +116,7 @@
<actions>
<set field="leftbarScreenName" value="leftbar"/>
<set field="leftbarScreenLocation" value="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"/>
- <set field="title" value="Show All Promotions"/>
+ <set field="titleProperty" value="PageTitleShowAllPromotions"/>
<set field="promoUseDetailsInlineScreen" value="component://order/widget/ordermgr/OrderEntryCartScreens.xml#promoUseDetailsInline"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowCart.groovy"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/ShowPromoText.groovy"/>
@@ -136,7 +136,7 @@
<set field="leftbarScreenName" value="leftbar"/>
<set field="leftbarScreenLocation" value="component://order/widget/ordermgr/OrderEntryCommonScreens.xml"/>
- <set field="title" value="Show Promotion Details"/>
+ <set field="titleProperty" value="PageTitleShowPromotionDetails"/>
<set field="productsummaryScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy"/>
</actions>
@@ -167,7 +167,6 @@
<screen name="LookupBulkAddProducts">
<section>
<actions>
- <set field="title" value="Bulk Add Product"/>
<set field="titleProperty" value="PageTitleLookupBulkAddProduct"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/> <!-- 10 rows seems more appropriate given screen size, etc. -->
@@ -185,7 +184,7 @@
<screen name="LookupBulkAddSupplierProducts">
<section>
<actions>
- <set field="title" value="Bulk Add Supplier Product"/>
+ <set field="titleProperty" value="PageTitleLookupBulkAddSupplierProduct"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml?rev=746049&r1=746048&r2=746049&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Thu Feb 19 23:08:30 2009
@@ -84,7 +84,7 @@
<screen name="OrderTaskList">
<section>
<actions>
- <set field="titleProperty" value="OrderOrderTaskList"/>
+ <set field="titleProperty" value="OrderOrderTasks"/>
<set field="headerItem" value="tasklist"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy"/>
</actions>