Index: accounting/config/AccountingEntityLabels.properties
===================================================================
--- accounting/config/AccountingEntityLabels.properties	(revision 7788)
+++ accounting/config/AccountingEntityLabels.properties	(working copy)
@@ -73,3 +73,8 @@
 
 FixedAssetProductType.description.FAPT_USE=Use of Asset
 FixedAssetProductType.description.FAPT_SALE=Sale of Asset
+
+InvoiceType.description.PURCHASE_INVOICE=Purchase Invoice
+InvoiceType.description.SALES_INVOICE=Sales Invoice
+InvoiceType.description.CUST_RTN_INVOICE=Customer Return
+InvoiceType.description.COMMISSION_INVOICE=Commission
\ No newline at end of file
Index: accounting/config/AccountingEntityLabels_it.properties
===================================================================
--- accounting/config/AccountingEntityLabels_it.properties	(revision 7788)
+++ accounting/config/AccountingEntityLabels_it.properties	(working copy)
@@ -116,3 +116,8 @@
 
 FixedAssetProductType.description.FAPT_USE=Uso Cespite
 FixedAssetProductType.description.FAPT_SALE=Vendita Cespite
+
+InvoiceType.description.PURCHASE_INVOICE=Fattura Acquisto
+InvoiceType.description.SALES_INVOICE=Fattura Vendita
+InvoiceType.description.CUST_RTN_INVOICE=Reso Cliente
+InvoiceType.description.COMMISSION_INVOICE=Provvigione
\ No newline at end of file
Index: accounting/entitydef/entitymodel.xml
===================================================================
--- accounting/entitydef/entitymodel.xml	(revision 7788)
+++ accounting/entitydef/entitymodel.xml	(working copy)
@@ -959,6 +959,7 @@
     </entity>
     <entity entity-name="InvoiceType"
             package-name="org.ofbiz.accounting.invoice"
+			default-resource-name="AccountingEntityLabels"
             title="Invoice Type Entity" default-resource-name="AccountingEntityLabels">
       <field name="invoiceTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id-ne"></field>
Index: accounting/webapp/accounting/main.ftl
===================================================================
--- accounting/webapp/accounting/main.ftl	(revision 7788)
+++ accounting/webapp/accounting/main.ftl	(working copy)
@@ -73,14 +73,14 @@
 <td>
 <ul>
 <#list invoiceTypes as invoiceType>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${invoiceType.description} ${uiLabelMap.AccountingInvoices}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${invoiceType.get("description",locale)} ${uiLabelMap.AccountingInvoices}</a></li>
 </#list>
 </ul>
 </td>
 <td>
 <ul>
 <#list invoiceStatus as status>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${status.description} ${uiLabelMap.AccountingInvoices}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${status.get("description",locale)} ${uiLabelMap.AccountingInvoices}</a></li>
 </#list>
 </ul>
 </td>
@@ -117,7 +117,7 @@
 <td>
 <ul>
 <#list paymentStatus as status>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${status.description} ${uiLabelMap.AccountingPayments}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${status.get("description",locale)} ${uiLabelMap.AccountingPayments}</a></li>
 </#list>
 </ul>
 </td>
Index: ecommerce/config/EcommerceUiLabels.properties
===================================================================
--- ecommerce/config/EcommerceUiLabels.properties	(revision 7788)
+++ ecommerce/config/EcommerceUiLabels.properties	(working copy)
@@ -457,6 +457,7 @@
 PageTitleMessageList=Message List
 PageTitleNewCustomer=New Customer
 PageTitleNewMessage=New Message
+PageTitleOrderCompleteNotice=Order Complete Notice
 PageTitleOrderConfirmation=Order Confirmation
 PageTitleOrderHistory=Order History
 PageTitleOrderStatus=Order Status
Index: ecommerce/config/EcommerceUiLabels_it.properties
===================================================================
--- ecommerce/config/EcommerceUiLabels_it.properties	(revision 7788)
+++ ecommerce/config/EcommerceUiLabels_it.properties	(working copy)
@@ -458,6 +458,7 @@
 PageTitleMessageList=Lista Messaggio
 PageTitleNewCustomer=Nuovo Soggetto
 PageTitleNewMessage=Nuovo Messaggio
+PageTitleOrderCompleteNotice=Notifica Ordine Completato
 PageTitleOrderConfirmation=Conferma Ordine
 PageTitleOrderHistory=Storia Ordine
 PageTitleOrderStatus=Stato Ordine
Index: ecommerce/templates/email/OrderNoticeEmail.ftl
===================================================================
--- ecommerce/templates/email/OrderNoticeEmail.ftl	(revision 7788)
+++ ecommerce/templates/email/OrderNoticeEmail.ftl	(working copy)
@@ -39,7 +39,7 @@
 <#-- custom logo or text can be inserted here -->
 
 <div class="head1">${title}</div>
-<#if !isDemoStore?exists || isDemoStore><p>NOTE: This is a DEMO store-front.  Orders placed here will NOT be billed, and will NOT be fulfilled.</p></#if>
+<#if !isDemoStore?exists || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if>
 <#if note?exists><p class="tabletext">${note}</p></#if>
 <#if orderHeader?exists>
 ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
Index: ecommerce/widget/EmailOrderScreens.xml
===================================================================
--- ecommerce/widget/EmailOrderScreens.xml	(revision 7788)
+++ ecommerce/widget/EmailOrderScreens.xml	(working copy)
@@ -58,7 +58,14 @@
     <screen name="OrderCompleteNotice">
         <section>
             <actions>
-                <set field="title" value="Order Complete Notice"/>
+				<property-map resource="EcommerceUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="title" value="${uiLabelMap.PageTitleOrderCompleteNotice}"/>
                 <set field="baseEcommerceSecureUrl" value="${baseSecureUrl}/ecommerce/control/"/>
                 <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/orderstatus.bsh"/>
             </actions>
Index: marketing/entitydef/entitymodel.xml
===================================================================
--- marketing/entitydef/entitymodel.xml	(revision 7788)
+++ marketing/entitydef/entitymodel.xml	(working copy)
@@ -227,6 +227,7 @@
     </entity>
     <entity entity-name="ContactListType"
             package-name="org.ofbiz.marketing.contact"
+            default-resource-name="MarketingEntityLabels"
             title="Contact List Type Entity">
       <field name="contactListTypeId" type="id-ne"></field>
       <field name="description" type="description"></field>
@@ -418,6 +419,7 @@
     </entity>
     <entity entity-name="TrackingCodeType"
             package-name="org.ofbiz.marketing.tracking"
+			default-resource-name="MarketingEntityLabels"
             title="Tracking Code Type Entity">
       <field name="trackingCodeTypeId" type="id-ne"></field>
       <field name="description" type="description"></field>
Index: order/config/OrderEntityLabels.properties
===================================================================
--- order/config/OrderEntityLabels.properties	(revision 7788)
+++ order/config/OrderEntityLabels.properties	(working copy)
@@ -17,3 +17,59 @@
 
 OrderType.description.PURCHASE_ORDER=Purchase
 OrderType.description.SALES_ORDER=Sales
+
+OrderAdjustmentType.description.PROMOTION_ADJUSTMENT=Promotion
+OrderAdjustmentType.description.REPLACE_ADJUSTMENT=Replacement
+OrderAdjustmentType.description.DISCOUNT_ADJUSTMENT=Discount
+OrderAdjustmentType.description.FEE=Fee
+OrderAdjustmentType.description.MISCELLANEOUS_CHARGE=Miscellaneous Charges
+OrderAdjustmentType.description.SALES_TAX=Sales Tax
+OrderAdjustmentType.description.SHIPPING_CHARGES=Shipping and Handling
+OrderAdjustmentType.description.SURCHARGE_ADJUSTMENT=Surcharge
+OrderAdjustmentType.description.ADDITIONAL_FEATURE=Additional Feature
+OrderAdjustmentType.description.WARRANTY_ADJUSTMENT=Warranty
+OrderAdjustmentType.description.MKTG_PKG_AUTO_ADJUST=Marketing Package Adjustment
+
+QuoteType.description.OTHER_QUOTE=Other
+QuoteType.description.PRODUCT_QUOTE=Product
+QuoteType.description.PROPOSAL=Proposal
+
+CustRequestType.description.RF_BUGFIX=Request For Bug Fix
+CustRequestType.description.RF_CATALOG=Request For Catalog
+CustRequestType.description.RF_FEATURE=Request For Feature
+CustRequestType.description.RF_INFO=Request For Information
+CustRequestType.description.RF_PROPOSAL=Request For Proposal
+CustRequestType.description.RF_QUOTE=Request For Quote
+CustRequestType.description.RF_SUPPORT=Request For Support
+
+CustRequestResolution.description.FIXED=Fixed
+CustRequestResolution.description.WORKS=Works For Me
+CustRequestResolution.description.WONTFIX=Won't Fix
+CustRequestResolution.description.DUPLICATE=Duplicate
+CustRequestResolution.description.REJECTED=Rejected
+CustRequestResolution.description.IMPLEMENTED=Implemented
+
+ShoppingListType.description.SLT_WISH_LIST=Wish List
+ShoppingListType.description.SLT_GIFT_REG=Gift Registry
+ShoppingListType.description.SLT_AUTO_REODR=Automatic Re-Orders
+ShoppingListType.description.SLT_FREQ_PURCHASES=Frequent Purchases
+ShoppingListType.description.SLT_SPEC_PURP=Special Purpose
+
+RequirementType.description.CUSTOMER_REQUIREMENT=Customer Requirement
+RequirementType.description.INTERNAL_REQUIREMENT=Internal Requirement
+RequirementType.description.PRODUCT_REQUIREMENT=Product Requirement
+RequirementType.description.WORK_REQUIREMENT=Work Requirement
+RequirementType.description.MRP_PRO_PROD_ORDER=ProductionRun proposed by the MRP process
+RequirementType.description.MRP_PRO_PURCH_ORDER=Purchase Order proposed by the MRP process
+
+<!-- Return Reasons -->
+ReturnReason.description.RTN_NOT_WANT=Did Not Want Item
+ReturnReason.description.RTN_DEFECTIVE_ITEM=Defective Item
+ReturnReason.description.RTN_MISSHIP_ITEM=Mis-Shipped Item
+ReturnReason.description.RTN_DIG_FILL_FAIL=Digital Fulfillment Failed
+
+<!-- Return Types -->
+ReturnType.description.RTN_CREDIT=Store Credit
+ReturnType.description.RTN_REFUND=Refund
+ReturnType.description.RTN_REPLACE=Replacement
+ReturnType.description.RTN_CSREPLACE=Cross-Ship Replacement
\ No newline at end of file
Index: order/config/OrderEntityLabels_it.properties
===================================================================
--- order/config/OrderEntityLabels_it.properties	(revision 7788)
+++ order/config/OrderEntityLabels_it.properties	(working copy)
@@ -16,3 +16,60 @@
 #####################################################################
 
 OrderType.description.PURCHASE_ORDER=Acquisto
+OrderType.description.SALES_ORDER=Vendita
+
+OrderAdjustmentType.description.PROMOTION_ADJUSTMENT=Promozione
+OrderAdjustmentType.description.REPLACE_ADJUSTMENT=Sostituzione
+OrderAdjustmentType.description.DISCOUNT_ADJUSTMENT=Sconto
+OrderAdjustmentType.description.FEE=Tassa
+OrderAdjustmentType.description.MISCELLANEOUS_CHARGE=Ricarico Vario
+OrderAdjustmentType.description.SALES_TAX=Tassa Vendita
+OrderAdjustmentType.description.SHIPPING_CHARGES=Spesa di Spedizione e Imballaggio
+OrderAdjustmentType.description.SURCHARGE_ADJUSTMENT=Sovraccarico
+OrderAdjustmentType.description.ADDITIONAL_FEATURE=Caratteristica Aggiuntiva
+OrderAdjustmentType.description.WARRANTY_ADJUSTMENT=Garanzia
+OrderAdjustmentType.description.MKTG_PKG_AUTO_ADJUST=Aggiustamento Paccho Vendita
+
+QuoteType.description.OTHER_QUOTE=Altro
+QuoteType.description.PRODUCT_QUOTE=Prodotto
+QuoteType.description.PROPOSAL=Proposta
+
+CustRequestType.description.RF_BUGFIX=Richiesta Di Bug Fix
+CustRequestType.description.RF_CATALOG=Richiesta Di Catalogo
+CustRequestType.description.RF_FEATURE=Richiesta Di Caratteristica
+CustRequestType.description.RF_INFO=Richiesta Di Informazione
+CustRequestType.description.RF_PROPOSAL=Richiesta Di Proposta
+CustRequestType.description.RF_QUOTE=Richiesta Di Preventivo
+CustRequestType.description.RF_SUPPORT=Richiesta Di Supporto
+
+CustRequestResolution.description.FIXED=Risolto
+CustRequestResolution.description.WORKS=Per Me Funziona
+CustRequestResolution.description.WONTFIX=Non Verra Fissato
+CustRequestResolution.description.DUPLICATE=Duplicato
+CustRequestResolution.description.REJECTED=Rifiutato
+CustRequestResolution.description.IMPLEMENTED=Implementato
+
+ShoppingListType.description.SLT_WISH_LIST=Lista dei Desideri
+ShoppingListType.description.SLT_GIFT_REG=Registro Omaggi
+ShoppingListType.description.SLT_AUTO_REODR=Ri-Ordini Automatici
+ShoppingListType.description.SLT_FREQ_PURCHASES=Acquisti Frequenti
+ShoppingListType.description.SLT_SPEC_PURP=Funzione Speciale
+
+RequirementType.description.CUSTOMER_REQUIREMENT=Fabbisogno Cliente
+RequirementType.description.INTERNAL_REQUIREMENT=Fabbisogno Interno
+RequirementType.description.PRODUCT_REQUIREMENT=Fabbisogno Prodotto
+RequirementType.description.WORK_REQUIREMENT=Fabbisogno Lavoro
+RequirementType.description.MRP_PRO_PROD_ORDER=Fabbisogno Ciclo Produzione proposto dal processo MRP
+RequirementType.description.MRP_PRO_PURCH_ORDER=Fabbisogno Ordine Acquisto proposto dal processo MRP
+
+<!-- Return Reasons -->
+ReturnReason.description.RTN_NOT_WANT=Prodotto Non Voluto
+ReturnReason.description.RTN_DEFECTIVE_ITEM=Prodotto Difettoso
+ReturnReason.description.RTN_MISSHIP_ITEM=Prodotto Non-Spedito
+ReturnReason.description.RTN_DIG_FILL_FAIL=Soddisfazione Digitale Fallita
+
+<!-- Return Types -->
+ReturnType.description.RTN_CREDIT=Credito Negozio
+ReturnType.description.RTN_REFUND=Rimborsato
+ReturnType.description.RTN_REPLACE=Sostituito
+ReturnType.description.RTN_CSREPLACE=Sostituzione Cross-Ship
\ No newline at end of file
Index: order/config/OrderUiLabels.properties
===================================================================
--- order/config/OrderUiLabels.properties	(revision 7788)
+++ order/config/OrderUiLabels.properties	(working copy)
@@ -1,7 +1,23 @@
+#####################################################################
+#
+# Copyright 2001-2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#####################################################################
+
 # ========================================
 # UiLabels for the order Component
 # ========================================
-#{Calendar} message
 FacilityBillingAddressSameShipping = Billing address is the same as the shipping address
 FacilityDeliveryOrder=Delivery order
 FacilityFacility = Facility
@@ -624,3 +640,22 @@
 FormFieldTitle_recurrenceInfoId=Recurrence Info Id
 FormFieldTitle_lastOrderedDate=Last Ordered Date
 FormFieldTitle_lastAdminModified=Last Admin Modified
+FormFieldTitle_statusId=Status Id
+FormFieldTitle_totalCubicUomId=Cubic Measurement
+FormFieldTitle_totalWeightUomId=Weight Measurement
+FormFieldTitle_totalWeight=Total Weight
+FormFieldTitle_totalCubicSize=Total Cubic Size
+FormFieldTitle_unitsPieces=Units Pieces
+FormFieldTitle_skidsPallets=Skids Pallets
+FormFieldTitle_cartons=Cartons
+FormFieldTitle_estimatedReadyDate=Estimated Ready Date
+FormFieldTitle_requestsLink=Requests Link
+FormFieldTitle_ordersLink=Orders Link
+FormFieldTitle_sendTo=Send To
+FormFieldTitle_sendCc=Send Cc
+FormFieldTitle_originFacilityId=Origin Facility Id
+FormFieldTitle_orderStatusId=Order Status Id
+FormFieldTitle_remove=remove
+FormFieldTitle_noteInfo=Note Info
+FormFieldTitle_noteDateTime=Note Date Time
+FormFieldTitle_deleteLink=Delete Link
Index: order/config/OrderUiLabels_it.properties
===================================================================
--- order/config/OrderUiLabels_it.properties	(revision 7788)
+++ order/config/OrderUiLabels_it.properties	(working copy)
@@ -308,7 +308,7 @@
 OrderQuickFinalizeOrder=Aggiunta Veloce Ordine
 OrderQuickLookup=Ricerca Veloce
 OrderQuickReceivePurchaseOrder = Ricevimento Veloce Ordine Acquisto
-OrderQuickRefundEntireOrder = Rimborso Veloce Intero Ordine
+OrderQuickRefundEntireOrder = Reso Veloce Intero Ordine
 OrderQuickShipEntireOrder = Spedizione Veloce Intero Ordine
 OrderRate=Percentuale
 OrderRecalculateOrder = Ricalcola Ordine
@@ -640,3 +640,22 @@
 FormFieldTitle_recurrenceInfoId=Informazioni Ricorrenti
 FormFieldTitle_lastOrderedDate=Ultima Data Ordine
 FormFieldTitle_lastAdminModified=Ultima Modifica Amministratore
+FormFieldTitle_statusId=Stato
+FormFieldTitle_totalCubicUomId=Udm Cubo
+FormFieldTitle_totalWeightUomId=Udm Peso
+FormFieldTitle_totalWeight=Peso Totale
+FormFieldTitle_totalCubicSize=Ampiezza Cubica Totale
+FormFieldTitle_unitsPieces=Unit\u00e0 in Pezzi
+FormFieldTitle_skidsPallets=Numero di Pallets
+FormFieldTitle_cartons=Cartoni
+FormFieldTitle_estimatedReadyDate=Data Attesa Stimata
+FormFieldTitle_requestsLink=Link Richieste
+FormFieldTitle_ordersLink=Link Ordini
+FormFieldTitle_sendTo=Invia A
+FormFieldTitle_sendCc=Invia Cc
+FormFieldTitle_originFacilityId=Stabilimento Origine
+FormFieldTitle_orderStatusId=Stato Ordine
+FormFieldTitle_remove=Cancella
+FormFieldTitle_noteInfo=Informazioni Nota
+FormFieldTitle_noteDateTime=Data/Ora Nota
+FormFieldTitle_deleteLink=Cancella Link
Index: party/config/PartyEntityLabels.properties
===================================================================
--- party/config/PartyEntityLabels.properties	(revision 7788)
+++ party/config/PartyEntityLabels.properties	(working copy)
@@ -18,3 +18,182 @@
 TermType.description.NON_COMPETE=Non-Compete
 TermType.description.EXCLUSIVE_RELATIONSH=Exclusive Relationship
 TermType.description.OTHER_TERM=Other
+
+<!-- top level role types -->
+RoleType.description.ADMIN=Administrator
+RoleType.description.AGENT=Agent
+RoleType.description.AUTOMATED_AGENT_ROLE=Automated Agent
+RoleType.description.CALENDAR_ROLE=Calendar
+RoleType.description.CLIENT=Client
+RoleType.description.CONSUMER=Consumer
+RoleType.description.CONTACT=Contact
+RoleType.description.CONTRACTOR=Contractor
+RoleType.description.CUSTOMER=Customer
+RoleType.description.DISTRIBUTION_CHANNEL=Distribution Channel
+RoleType.description.ISP=ISP
+RoleType.description.HOSTING_SERVER=Hosting Server
+RoleType.description.LEAD=Lead
+RoleType.description._NA_=Not Applicable
+RoleType.description.ORGANIZATION_ROLE=Organization
+RoleType.description.OWNER=Owner
+RoleType.description.PROSPECT=Prospect
+RoleType.description.PERSON_ROLE=Person
+RoleType.description.REFERRER=Referrer
+RoleType.description.REQ_MANAGER=Request Manager
+RoleType.description.REQ_REQUESTER=Requesting Party
+RoleType.description.REQ_TAKER=Request Taker
+RoleType.description.SHAREHOLDER=Shareholder
+RoleType.description.SUBSCRIBER=Subscriber
+RoleType.description.VENDOR=Vendor
+RoleType.description.VISITOR=Visitor
+RoleType.description.WEB_MASTER=Web Master
+RoleType.description.WORKFLOW_ROLE=Workflow
+
+<!-- second level role types -->
+RoleType.description.ASSOCIATION=Association
+RoleType.description.BILL_FROM_VENDOR=Bill-From Vendor
+RoleType.description.BILL_TO_CUSTOMER=Bill-To Customer
+RoleType.description.CAL_ATTENDEE=Calendar Attendee
+RoleType.description.CAL_DELEGATE=Calendar Delegate
+RoleType.description.CAL_ORGANIZER=Calendar Organizer
+RoleType.description.CAL_OWNER=Calendar Owner
+RoleType.description.CARRIER=Carrier
+RoleType.description.COMPETITOR=Competitor
+RoleType.description.DISTRIBUTOR=Distributor
+RoleType.description.EMPLOYEE=Employee
+RoleType.description.END_USER_CUSTOMER=End-User Customer
+RoleType.description.HOUSEHOLD=Household
+RoleType.description.INTERNAL_ORGANIZATIO=Internal Organization
+RoleType.description.LTD_ADMIN=Limited Administrator
+RoleType.description.ORGANIZATION_UNIT=Organization Unit
+RoleType.description.PARTNER=Partner
+RoleType.description.PLACING_CUSTOMER=Placing Customer
+RoleType.description.REGULATORY_AGENCY=Regulatory Agency
+RoleType.description.SALES_REP=Sales Representative
+RoleType.description.SHIP_FROM_VENDOR=Ship-From Vendor
+RoleType.description.SHIP_TO_CUSTOMER=Ship-To Customer
+RoleType.description.SUPPLIER_AGENT=Supplier Agent
+RoleType.description.SUPPLIER=Supplier
+RoleType.description.TAX_AUTHORITY=Tax Authority
+RoleType.description.UNION=Union
+RoleType.description.WF_OWNER=Workflow Owner
+
+<!-- third level role types -->
+RoleType.description.AFFILIATE=Affiliate
+RoleType.description.BUYER.Buyer
+RoleType.description.CASHIER.Cashier
+RoleType.description.DEPARTMENT.Department
+RoleType.description.DIVISION.Division
+RoleType.description.FAMILY_MEMBER.Family Member
+RoleType.description.MANAGER.Manager
+RoleType.description.ORDER_CLERK.Order Clerk
+RoleType.description.OTHER_INTERNAL_ORGAN.Other Internal
+RoleType.description.OTHER_ORGANIZATION_U.Other Organization Unit
+RoleType.description.PARENT_ORGANIZATION.Parent Organization
+RoleType.description.PACKER.Packer
+RoleType.description.PICKER.Picker
+RoleType.description.RECEIVER.Receiver
+RoleType.description.SHIPMENT_CLERK.Shipment Clerk
+RoleType.description.STOCKER.Stocker
+RoleType.description.SUBSIDIARY.Subsidiary
+RoleType.description.WORKER.Worker
+
+<!-- Blog role types -->
+RoleType.description.BLOG=Blog
+RoleType.description.BLOG_ADMIN=Blog Administrator
+RoleType.description.BLOG_PUBLISHER=Blog Publisher
+RoleType.description.BLOG_EDITOR=Blog Editor
+RoleType.description.BLOG_AUTHOR=Blog Author
+RoleType.description.BLOG_USER=Blog User
+RoleType.description.BLOG_GUEST=Blog Guest
+RoleType.description.PERMISSION_GROUP=Permission Group
+RoleType.description.PERMISSION_GROUP_MBR=Permission Group Member
+
+<!-- CompDoc role types -->
+RoleType.description.APPROVER=Approver
+RoleType.description.REVIEWER=Reviewer
+
+<!-- ContentType role types -->
+RoleType.description.LOGGEDIN=Logged In
+
+ContactMechPurposeType.description.SHIPPING_LOCATION=Shipping Destination Address
+ContactMechPurposeType.description.SHIP_ORIG_LOCATION=Shipping Origin Address
+ContactMechPurposeType.description.BILLING_LOCATION=Billing (AP) Address
+ContactMechPurposeType.description.PAYMENT_LOCATION=Payment (AR) Address
+ContactMechPurposeType.description.GENERAL_LOCATION=General Correspondence Address
+ContactMechPurposeType.description.PUR_RET_LOCATION=Purchase Return Address
+ContactMechPurposeType.description.PRIMARY_LOCATION=Primary Address
+ContactMechPurposeType.description.PHONE_SHIPPING=Shipping Destination Phone Number
+ContactMechPurposeType.description.PHONE_SHIP_ORIG=Shipping Origin Phone Number
+ContactMechPurposeType.description.PHONE_BILLING=Billing (AP) Phone Number
+ContactMechPurposeType.description.PHONE_PAYMENT=Payment (AR) Phone Number
+ContactMechPurposeType.description.PHONE_HOME=Main Home Phone Number
+ContactMechPurposeType.description.PHONE_WORK=Main Work Phone Number
+ContactMechPurposeType.description.PHONE_WORK_SEC=Secondary Work Phone Number
+ContactMechPurposeType.description.FAX_NUMBER=Main Fax Number
+ContactMechPurposeType.description.FAX_NUMBER_SEC=Secondary Fax Number
+ContactMechPurposeType.description.PHONE_MOBILE=Main Mobile Phone Number
+ContactMechPurposeType.description.PHONE_ASSISTANT=Assistant's Phone Number
+ContactMechPurposeType.description.PRIMARY_PHONE=Primary Phone Number
+ContactMechPurposeType.description.PRIMARY_EMAIL=Primary Email Address
+ContactMechPurposeType.description.OTHER_EMAIL=Other Email Address
+ContactMechPurposeType.description.ORDER_EMAIL=Order Notification Email Address
+ContactMechPurposeType.description.PRIMARY_WEB_URL=Primary Website URL
+
+PartyType.description.AUTOMATED_AGENT=Automated Agent
+PartyType.description.PERSON=Person
+PartyType.description.PARTY_GROUP=Party Group
+PartyType.description.INFORMAL_GROUP=Informal Group
+PartyType.description.FAMILY=Family
+PartyType.description.TEAM=Team
+PartyType.description.LEGAL_ORGANIZATION=Legal Organization
+PartyType.description.CORPORATION=Corporation
+PartyType.description.GOVERNMENT_AGENCY=Government Agency
+
+CommunicationEventType.description.EMAIL_COMMUNICATION=Email
+CommunicationEventType.description.FACE_TO_FACE_COMMUNI=Face-To-Face
+CommunicationEventType.description.FAX_COMMUNICATION=Fax
+CommunicationEventType.description.LETTER_CORRESPONDENC=Letter
+CommunicationEventType.description.PHONE_COMMUNICATION=Phone
+CommunicationEventType.description.WEB_SITE_COMMUNICATI=Web Site
+CommunicationEventType.description.COMMENT_NOTE=Comment/Note
+CommunicationEventType.description.AUTO_EMAIL_COMM=Auto Email
+
+ContactMechType.description.ELECTRONIC_ADDRESS=Electronic Address
+ContactMechType.description.POSTAL_ADDRESS=Postal Address
+ContactMechType.description.TELECOM_NUMBER=Phone Number
+ContactMechType.description.EMAIL_ADDRESS=Email Address
+ContactMechType.description.IP_ADDRESS=Internet IP Address
+ContactMechType.description.DOMAIN_NAME=Internet Domain Name
+ContactMechType.description.WEB_ADDRESS=Web URL/Address
+
+PartyClassificationType.description.MINORITY_CLASSIFICAT=Minority
+PartyClassificationType.description.INCOME_CLASSIFICATIO=Income
+PartyClassificationType.description.INDUSTRY_CLASSIFICAT=Industry
+PartyClassificationType.description.ORGANIZATION_CLASSIF=Organization
+PartyClassificationType.description.PERSON_CLASSIFICATIO=Person
+PartyClassificationType.description.SIZE_CLASSIFICATION=Size
+
+CommunicationEventPrpTyp.description.ACTIVITY_REQUEST=Activity Request
+CommunicationEventPrpTyp.description.CONFERENCE=Conference
+CommunicationEventPrpTyp.description.CUSTOMER_SERVICE_CAL=Customer Service Call
+CommunicationEventPrpTyp.description.INQUIRY=Inquiry
+CommunicationEventPrpTyp.description.MEETING=Meeting
+CommunicationEventPrpTyp.description.SALES_FOLLOW_UP=Sales Follow Up
+CommunicationEventPrpTyp.description.SEMINAR=Seminar
+CommunicationEventPrpTyp.description.SUPPORT_CALL=Support Call
+
+PartyRelationshipType.partyRelationshipName.AGENT=Agent
+PartyRelationshipType.partyRelationshipName.DISTRIBUTION_CHANNEL=Distributor
+PartyRelationshipType.partyRelationshipName.EMPLOYMENT=Employee
+PartyRelationshipType.partyRelationshipName.MANAGER=Manager
+PartyRelationshipType.partyRelationshipName.CONTACT_REL=Contact
+PartyRelationshipType.partyRelationshipName.GROUP_ROLLUP=Group Member
+PartyRelationshipType.partyRelationshipName.PARTNERSHIP=Partner
+PartyRelationshipType.partyRelationshipName.SALES_AFFILIATE=Sales Affiliate
+PartyRelationshipType.partyRelationshipName.SUPPLIER_REL=Supplier
+PartyRelationshipType.partyRelationshipName.CUSTOMER_REL=Customer
+PartyRelationshipType.partyRelationshipName.HOST_SERVER_VISITOR=Host Server Visitor
+PartyRelationshipType.partyRelationshipName.VISITOR_ISP=ISP Visitor
+PartyRelationshipType.partyRelationshipName.WEB_MASTER_ASSIGNMEN=Web Master
+PartyRelationshipType.partyRelationshipName.BLOG_PERMISSION=Blog Users
\ No newline at end of file
Index: party/config/PartyEntityLabels_it.properties
===================================================================
--- party/config/PartyEntityLabels_it.properties	(revision 7788)
+++ party/config/PartyEntityLabels_it.properties	(working copy)
@@ -24,7 +24,7 @@
 TermType.description.FIN_PAYMENT_DISC=Pagamento (discontinuo se pagato senza giorni specificati)
 TermType.description.FIN_PAYMENT_FIXDAY=Pagamento (dovuto ad uno specifico giorno del mese)
 TermType.description.FIN_LATE_FEE_TERM=Tassa Ritardata (percentuale)
-TermType.description.FIN_COLLECT_TERM=Penalità Per Agenzia Collezione
+TermType.description.FIN_COLLECT_TERM=Penalit\u00e0 Per Agenzia Collezione
 TermType.description.FIN_NORTN_ITEM_TERM=Riga Vendita Non-Restituibile
 TermType.description.INCENTIVE=Incentivo
 TermType.description.LEGAL_TERM=Legale
@@ -82,7 +82,7 @@
 RoleType.description.HOUSEHOLD=Famiglia
 RoleType.description.INTERNAL_ORGANIZATIO=Organizzazione Interna
 RoleType.description.LTD_ADMIN=Amministratore Limitato
-RoleType.description.ORGANIZATION_UNIT=Unit&#224; Organizzativa
+RoleType.description.ORGANIZATION_UNIT=Unit\u00e0 Organizzativa
 RoleType.description.PARTNER=Socio
 RoleType.description.PLACING_CUSTOMER=Disposizione del Cliente
 RoleType.description.REGULATORY_AGENCY=Agenzia Regolatrice
@@ -91,7 +91,7 @@
 RoleType.description.SHIP_TO_CUSTOMER=Spedizione Al Cliente
 RoleType.description.SUPPLIER_AGENT=Agente del Fornitore
 RoleType.description.SUPPLIER=Fornitore
-RoleType.description.TAX_AUTHORITY=Autorit&#224; Tasse
+RoleType.description.TAX_AUTHORITY=Autorit\u00e0 Tasse
 RoleType.description.UNION=Unione
 RoleType.description.WF_OWNER=Proprietario Flusso di Lavoro
 
@@ -105,7 +105,7 @@
 RoleType.description.MANAGER=Responsabile
 RoleType.description.ORDER_CLERK=Impiegato Ordini
 RoleType.description.OTHER_INTERNAL_ORGAN=Altri Interni
-RoleType.description.OTHER_ORGANIZATION_U=Altra Unit&#224; Organizzativa
+RoleType.description.OTHER_ORGANIZATION_U=Altra Unit\u00e0 Organizzativa
 RoleType.description.PARENT_ORGANIZATION=Organizzazione Padre
 RoleType.description.PACKER=Imballatore
 RoleType.description.PICKER=Prelevatore
@@ -126,6 +126,17 @@
 RoleType.description.PERMISSION_GROUP=Gruppo Permesso
 RoleType.description.PERMISSION_GROUP_MBR=Membro Gruppo Permesso
 
+<!-- Blog role types -->
+RoleType.description.BLOG=Blog
+RoleType.description.BLOG_ADMIN=Blog Amministratore
+RoleType.description.BLOG_PUBLISHER=Blog Pubblicatore
+RoleType.description.BLOG_EDITOR=Blog Editore
+RoleType.description.BLOG_AUTHOR=Blog Autore
+RoleType.description.BLOG_USER=Blog Utente
+RoleType.description.BLOG_GUEST=Blog Ospite
+RoleType.description.PERMISSION_GROUP=Gruppo Permesso
+RoleType.description.PERMISSION_GROUP_MBR=Membro Gruppo Permesso
+
 <!-- CompDoc role types -->
 RoleType.description.APPROVER=Approvatore
 RoleType.description.REVIEWER=Revisore
@@ -190,3 +201,27 @@
 PartyClassificationType.description.ORGANIZATION_CLASSIF=Organizzazione
 PartyClassificationType.description.PERSON_CLASSIFICATIO=Persona
 PartyClassificationType.description.SIZE_CLASSIFICATION=Grandezza
+
+CommunicationEventPrpTyp.description.ACTIVITY_REQUEST=Richiesta Attivit\u00e0
+CommunicationEventPrpTyp.description.CONFERENCE=Conferenza
+CommunicationEventPrpTyp.description.CUSTOMER_SERVICE_CAL=Chiamata Servizio Clienti
+CommunicationEventPrpTyp.description.INQUIRY=Interrogazione
+CommunicationEventPrpTyp.description.MEETING=Incontro
+CommunicationEventPrpTyp.description.SALES_FOLLOW_UP=Sollecito Vendita
+CommunicationEventPrpTyp.description.SEMINAR=Seminario
+CommunicationEventPrpTyp.description.SUPPORT_CALL=Chiamata Supporto
+
+PartyRelationshipType.partyRelationshipName.AGENT=Agente
+PartyRelationshipType.partyRelationshipName.DISTRIBUTION_CHANNEL=Distributore
+PartyRelationshipType.partyRelationshipName.EMPLOYMENT=Impiegato
+PartyRelationshipType.partyRelationshipName.MANAGER=Capoufficio
+PartyRelationshipType.partyRelationshipName.CONTACT_REL=Contatto
+PartyRelationshipType.partyRelationshipName.GROUP_ROLLUP=Membro Gruppo
+PartyRelationshipType.partyRelationshipName.PARTNERSHIP=Socio
+PartyRelationshipType.partyRelationshipName.SALES_AFFILIATE=Affiliato Vendite
+PartyRelationshipType.partyRelationshipName.SUPPLIER_REL=Fornitore
+PartyRelationshipType.partyRelationshipName.CUSTOMER_REL=Cliente
+PartyRelationshipType.partyRelationshipName.HOST_SERVER_VISITOR=Visitatore Server Host
+PartyRelationshipType.partyRelationshipName.VISITOR_ISP=Visitatore ISP
+PartyRelationshipType.partyRelationshipName.WEB_MASTER_ASSIGNMEN=Web Master
+PartyRelationshipType.partyRelationshipName.BLOG_PERMISSION=Blog Utente
\ No newline at end of file
Index: party/config/PartyUiLabels.properties
===================================================================
--- party/config/PartyUiLabels.properties	(revision 7788)
+++ party/config/PartyUiLabels.properties	(working copy)
@@ -49,9 +49,12 @@
 
 OrderNewOrder=New Order
 OrderOrders=Orders
+PageTitleAddressMatchMap=Address Match Map
+PageTitleAddressMatches=Address Matches
 PageTitleCommEvents=Communication Events
 PageTitleCreateNewPartyDetail=Create New Party Detail
 PageTitleEditAvsOverride=Edit AVS Override
+PageTitleEditCommContent=Edit Comm Content
 PageTitleEditCommunication=Edit Communication
 PageTitleEditContactMech=Edit Contact Mech
 PageTitleEditCreditCard=Edit Credit Card
@@ -70,6 +73,7 @@
 PageTitleEditSecurityGroupUserLogins=Edit Security Group UserLogins
 PageTitleEditUserLoginSecurityGroups=Edit UserLogin Security Groups
 PageTitleFindCommunicationEvents=Find Communications
+PageTitleFindMatches=Find Matches
 PageTitleFindParty=Find Party(s)
 PageTitleFindPartyClassificationGroups=Find Party Classification Groups
 PageTitleFindSecurityGroup=Find Security Group
@@ -98,6 +102,7 @@
 PartyAccount=Account
 PartyActive=Active
 PartyAddChildListsToCart=Add Child List To Cart
+PartyAddCommContent=Add Communication Content
 PartyAddListToCart=Add List To Cart
 PartyAdditionalPartyEntry=Additional Party Entry
 PartyAddPermissionManuallyToSecurityGroup=Add Permission (manually) to SecurityGroup
@@ -109,6 +114,10 @@
 PartyAddressLine1Missing=Address Line 1 is missing
 PartyAddressLine2=Address Line 2
 PartyAddressMailingShipping=Mailing/Shipping Address
+PartyAddressMatching=Matching
+PartyAddressMatchKey=Match Key
+PartyAddressMatchValue=Match Value
+PartyAddressMatchMessage1=Format: key,value,sequence (sequence is optional)
 PartyAddRole=Add Role
 PartyAddrToName=To
 PartyAddToRole=Add To Role
@@ -138,6 +147,7 @@
 PartyClientIP=Client IP
 PartyClientUser=Client User
 PartyComments=Comments
+PartyCommContent=Communication Content
 PartyCommEvent=Comm Event
 PartyCommEventPurposes=Communication Event Purposes
 PartyCommEventRoles=Communication Event Roles
@@ -249,6 +259,8 @@
 PartyLastName=Last Name
 PartyLastNameMissingError=Lastname is Missing
 PartyLastVisit=Last Visit(s)
+PartyLink=Link Party
+PartyLinkMessage1=WARNING: This cannot be un-done, confirm you wish to link the two party records listed below.
 PartyListCommunicationEvents=Found Communication Events
 PartyListCommCustRequest=Found Communication Customer Requests
 PartyListCommPurpose=Found Communication Work Purposes
@@ -302,6 +314,7 @@
 PartyNickname=Nickname
 PartyNoCommunicationFound=No Communication Events
 PartyNoContactInformation=No contact information on file.
+PartyNoMatch=No records match.
 PartyNoNameGroup=No name (group)
 PartyNoNotesForParty=No notes for this party.
 PartyNoParent=No Parent
@@ -446,6 +459,7 @@
 PartyTotalYearsWorkNotValidNumber=Total Years Work Experience is not a valid number
 PartyType=Type
 PartyTypeId=Party Type Id
+PartyUnknown=Unknown
 PartyUpdateAttributePermissionError=Security Error\: to run updatePartyAttribute you must have the PARTYMGR_UPDATE or PARTYMGR_ADMIN permission
 PartyUpdateCommunicationEventPermissionError=Security Error\: to run updateCommunicationEvent you must have the PARTYMGR_UPDATE or PARTYMGR_ADMIN permission
 PartyUpdatePartyClassificationGroupPermissionError=Security Error\: to run updatePartyClassificationGroup you must have the PARTYMGR_UPDATE or PARTYMGR_ADMIN permission
@@ -462,6 +476,7 @@
 PartyUserNameMissing=Username is missing
 PartyVendor=Vendor
 PartyVendorInformation=Vendor Information
+PartyViewImage=View Image
 PartyViewPostalAddressBoundaryPermissionError=Security Error\: to run getPostalAddressBoundary you must have the PARTY_VIEW or PARTY_ADMIN permission
 PartyViewSegmentRoles=View Party Segment Roles
 PartyVisits=Visits
@@ -578,6 +593,8 @@
 FormFieldTitle_roleTypeIdTo=Role Type Id To
 FormFieldTitle_subject=Subject
 FormFieldTitle_contactListId=Contact List Id
+FormFieldTitle_contactListName=Contact List Name
+FormFieldTitle_contactListTypeId=Contact List Type Id
 FormFieldTitle_contentMimeTypeId=Content Mime Type Id
 FormFieldTitle_communicationEventPrpTypId=Communication Event Purpose Type Id
 FormFieldTitle_roleTypeId=Role Type Id
@@ -607,3 +624,12 @@
 FormFieldTitle_contentId=Content Id
 FormFieldTitle_contentName=Content Name
 FormFieldTitle_dataResourceId=Data Resource Id
+FormFieldTitle_marketingCampaignId=Marketing Campaign Id
+FormFieldTitle_dataResourceTypeId=Data Resource Type Id
+FormFieldTitle_drObjectInfo=File Name
+FormFieldTitle_imageData=File
+FormFieldTitle_employmentStatusEnumId=Employment Status Enum Id
+FormFieldTitle_residenceStatusEnumId=Residence Status Enum Id
+FormFieldTitle_occupation=Occupation
+FormFieldTitle_yearsWithEmployer=Years With Employer
+FormFieldTitle_monthsWithEmployer=Months With Employer
\ No newline at end of file
Index: party/config/PartyUiLabels_it.properties
===================================================================
--- party/config/PartyUiLabels_it.properties	(revision 7788)
+++ party/config/PartyUiLabels_it.properties	(working copy)
@@ -32,42 +32,45 @@
 AccountingPaymentsSent=Pagamenti Inviati
 
 commeventservices.communication_event_not_found_failure=ERRORE: Evento Comunicazioni non trovato per l'evento comunicazione con codice evento
-commeventservices.communication_event_must_be_email_for_email=ERRORE: Evento Comunicazioni non   un email communication e non pu  essere emailed per il codice evento comunicazioni
-commeventservices.communication_event_from_contact_mech_must_be_email=ERRORE: Evento Comunicazioni deve avere un contatto mech da che   un codice evento comunicazione email
-commeventservices.communication_event_to_contact_mech_must_be_email=ERRORE: Evento Comunicazioni deve avere un contatto mech che   un email per il codice evento comunicazioni
+commeventservices.communication_event_must_be_email_for_email=ERRORE: Evento Comunicazioni non \u00e8 un email communication e non pu  essere emailed per il codice evento comunicazioni
+commeventservices.communication_event_from_contact_mech_must_be_email=ERRORE: Evento Comunicazioni deve avere un contatto mech da che \u00e8 un codice evento comunicazione email
+commeventservices.communication_event_to_contact_mech_must_be_email=ERRORE: Evento Comunicazioni deve avere un contatto mech che \u00e8 un email per il codice evento comunicazioni
 
-contactmechservices.could_not_create_contact_info_id_generation_failure=ERRORE: Non   possibile creare informazioni contatto (generazione Codice fallito).
+contactmechservices.could_not_create_contact_info_id_generation_failure=ERRORE: Non \u00e8 possibile creare informazioni contatto (generazione Codice fallito).
 contactmechservices.service_createContactMech_not_be_used_for_POSTAL_ADDRESS=Questo servizio (createContactMech) non dovrebbe essere usato per il tipo POSTAL_ADDRESS ContactMechs, usare il servizio createPostalAddress.
 contactmechservices.service_createContactMech_not_be_used_for_TELECOM_NUMBER=Questo servizio (createContactMech) non dovrebbe essere usato per il tipo TELECOM_NUMBER ContactMechs, usare il servizio createTelecomNumber.
 #${errMessage} = Messaggio di Errore
-contactmechservices.could_not_create_contact_info_write=Non   possibile creare informazioni contatto (scrittura fallita): ${errMessage}.
-contactmechservices.could_not_change_contact_info_id_generation_failure=ERRORE: Non   possibile cambiare informazioni contatto (generazione Codice fallito).
-contactmechservices.cannot_update_specified_contact_info_not_corresponds=ERRORE: Non   possibile cambiare informazioni contatto perch  questo non corrisponde al cliente specificato.
-contactmechservices.could_not_find_specified_contact_info_read=ERRORE: Non   possibile cambiare informazioni contatto (errore di lettura).
+contactmechservices.could_not_create_contact_info_write=Non \u00e8 possibile creare informazioni contatto (scrittura fallita): ${errMessage}.
+contactmechservices.could_not_change_contact_info_id_generation_failure=ERRORE: Non \u00e8 possibile cambiare informazioni contatto (generazione Codice fallito).
+contactmechservices.cannot_update_specified_contact_info_not_corresponds=ERRORE: Non \u00e8 possibile cambiare informazioni contatto perch\u00e8 questo non corrisponde al cliente specificato.
+contactmechservices.could_not_find_specified_contact_info_read=ERRORE: Non \u00e8 possibile cambiare informazioni contatto (errore di lettura).
 contactmechservices.service_updateContactMech_not_be_used_for_POSTAL_ADDRESS=Questo servizio (updateContactMech) non dovrebbe essere usato per il tipo POSTAL_ADDRESS ContactMechs, usare il servizio updatePostalAddress.
 contactmechservices.service_updateContactMech_not_be_used_for_TELECOM_NUMBER=Questo servizio (updateContactMech) non dovrebbe essere usato per il tipo TELECOM_NUMBER ContactMechs, usare il servizio updateTelecomNumber.
-contactmechservices.could_not_change_contact_info_read=ERRORE: Non   possibile cambiare informazioni contatto (errore di lettura): ${errMessage}.
-contactmechservices.could_not_change_contact_info_write=ERRORE: Non   possibile cambiare informazioni contatto (errore di scrittura): ${errMessage}.
+contactmechservices.could_not_change_contact_info_read=ERRORE: Non \u00e8 possibile cambiare informazioni contatto (errore di lettura): ${errMessage}.
+contactmechservices.could_not_change_contact_info_write=ERRORE: Non \u00e8 possibile cambiare informazioni contatto (errore di scrittura): ${errMessage}.
 contactmechservices.no_changes_made_not_updating=Nessuna modifica possibile, non aggiornare il meccanismo contatto.
 contactmechservices.could_not_delete_contact_info_no_contact_found=Non cancellare informazioni contatto (meccanismo contatto cliente non trovato).
 contactmechservices.could_not_delete_contact_info_write=Non cancellare informazioni contatto (scrittura fallita).
 contactmechservices.could_not_delete_contact_info_read=Non cancellare informazioni contatto (lettura fallita): ${errMessage}.
 #${contactMechTypeId} = Codice del Meccanismo Contatto
-contactmechservices.could_not_update_contact_as_POSTAL_ADDRESS_specified=Non   possibile aggiornare questo meccanismo contatto come un POSTAL_ADDRESS specificato sul meccanismo contatto ${contactMechTypeId}.
-contactmechservices.could_not_update_contact_as_TELECOM_NUMBER_specified=Non   possibile aggiornare questo meccanismo contatto come un TELECOM_NUMBER specificato sul meccanismo contatto ${contactMechTypeId}.
-contactmechservices.could_not_create_new_purpose_already_exists=Non   possibile creare una nuovo funzione, una funzione con questo tipo esiste gi .
-contactmechservices.could_not_add_purpose_write=ERRORE: Non   possibile aggiungere funzione al meccanismo contatto (scrittura fallita): ${errMessage}.
-contactmechservices.could_not_delete_purpose_from_contact_mechanism_not_found=Non   possibile cancellare la funzione dal meccanismo contatto (record non travato).
-contactmechservices.could_not_delete_purpose_from_contact_mechanism_read=Non   possibile cancellare la funzione dal meccanismo contatto (lettura fallita): ${errMessage}.
-contactmechservices.could_not_delete_purpose_from_contact_mechanism_write=Non   possibile cancellare la funzione dal meccanismo contatto (scrittura fallita): ${errMessage}.
+contactmechservices.could_not_update_contact_as_POSTAL_ADDRESS_specified=Non \u00e8 possibile aggiornare questo meccanismo contatto come un POSTAL_ADDRESS specificato sul meccanismo contatto ${contactMechTypeId}.
+contactmechservices.could_not_update_contact_as_TELECOM_NUMBER_specified=Non \u00e8 possibile aggiornare questo meccanismo contatto come un TELECOM_NUMBER specificato sul meccanismo contatto ${contactMechTypeId}.
+contactmechservices.could_not_create_new_purpose_already_exists=Non \u00e8 possibile creare una nuovo funzione, una funzione con questo tipo esiste gi\u00e0.
+contactmechservices.could_not_add_purpose_write=ERRORE: Non \u00e8 possibile aggiungere funzione al meccanismo contatto (scrittura fallita): ${errMessage}.
+contactmechservices.could_not_delete_purpose_from_contact_mechanism_not_found=Non \u00e8 possibile cancellare la funzione dal meccanismo contatto (record non travato).
+contactmechservices.could_not_delete_purpose_from_contact_mechanism_read=Non \u00e8 possibile cancellare la funzione dal meccanismo contatto (lettura fallita): ${errMessage}.
+contactmechservices.could_not_delete_purpose_from_contact_mechanism_write=Non \u00e8 possibile cancellare la funzione dal meccanismo contatto (scrittura fallita): ${errMessage}.
 
 Description=Descrizione
 
 OrderNewOrder=Nuovo Ordine
 OrderOrders=Ordini
+PageTitleAddressMatchMap=Mappatura Uguaglianza Indirizzi
+PageTitleAddressMatches=Indirizzo Uguali
 PageTitleCommEvents=Comunicazione Eventi
 PageTitleCreateNewPartyDetail=Creare Nuovo Dettaglio Soggetto
 PageTitleEditAvsOverride=Aggiorna Sovrapposizioni AVS
+PageTitleEditCommContent=Aggiorna Contenuto Comunicazione
 PageTitleEditCommunication=Aggiorna Comunicazione
 PageTitleEditContactMech=Aggiorna Contatto
 PageTitleEditCreditCard=Aggiorna Carta Credito
@@ -79,19 +82,20 @@
 PageTitleEditPartyClassificationGroupParties=Aggiorna Classificazione Gruppo Soggetto
 PageTitleEditPartyRates=Aggiorna Percentuali Soggetto
 PageTitleEditPartyRelationships=Aggiorna Rapporti Soggetto
-PageTitleEditPartyTaxAuthInfos=Aggiorna Informazioni Autorit  Tasse Soggetto
+PageTitleEditPartyTaxAuthInfos=Aggiorna Informazioni Autorit\u00e0 Tasse Soggetto
 PageTitleEditPersonalInformation=Aggiorna Informazioni Personali
 PageTitleEditSecurityGroup=Aggiorna Gruppo Sicurezza
 PageTitleEditSecurityGroupPermissions=Aggiorna Permessi Gruppo Sicurezza
 PageTitleEditSecurityGroupUserLogins=Aggiorna Gruppo Sicurezza Utente
 PageTitleEditUserLoginSecurityGroups=Aggiorna Gruppi Sicurezza Utente
 PageTitleFindCommunicationEvents=Ricerca Comunicazioni
+PageTitleFindMatches=Ricerca Uguaglianze
 PageTitleFindParty=Ricerca Cliente(i)/Fornitore(i)
 PageTitleFindPartyClassificationGroups=Ricerca Gruppi Classificazione Soggetti
 PageTitleFindSecurityGroup=Ricerca Gruppo Sicurezza
 PageTitleListCommCustRequests=Lista Richiesta Comunicazioni Clienti
 PageTitleListCommunications=Lista Comunicazioni
-PageTitleListCommWorkEfforts=Lista Comunicazioni WorkEfforts
+PageTitleListCommWorkEfforts=Lista Comunicazioni Impegni di Lavoro
 PageTitleListContactList=Lista Lista Contatto
 PageTitleLogin=Login
 PageTitleMain=Pagina Principale
@@ -114,6 +118,7 @@
 PartyAccount=Conto
 PartyActive=Attivo
 PartyAddChildListsToCart=Aggiungi Figlio all Lista del Carrello
+PartyAddCommContent=Aggiungi Contenuto Comunicazioni
 PartyAddListToCart=Aggiungi Lista Al Carrello
 PartyAdditionalPartyEntry=Voce Aggiuntiva Soggetto
 PartyAddPermissionManuallyToSecurityGroup=Aggiungi Permesso (manualmente) al Gruppo Sicurezza
@@ -122,9 +127,13 @@
 PartyAddPurpose=Aggiungi Funzione
 PartyAddrAttnName=Attn
 PartyAddressLine1=Indirizzo Riga 1
-PartyAddressLine1Missing=Indirizzo Riga 1   mancante
+PartyAddressLine1Missing=Indirizzo Riga 1 \u00e8 mancante
 PartyAddressLine2=Indirizzo Riga 2
 PartyAddressMailingShipping=Indirizzo di Posta/Spedizione
+PartyAddressMatching=Uguale
+PartyAddressMatchKey=Chiave Uguaglianza
+PartyAddressMatchValue=Valore Uguaglianza
+PartyAddressMatchMessage1=Formato: chiave,valore,sequenza (sequenza \u00e8 opzionale)
 PartyAddRole=Aggiungi Ruolo
 PartyAddrToName=A
 PartyAddToRole=Aggiungi Al Ruolo
@@ -138,13 +147,13 @@
 PartyBank=Banca
 PartyBillingAddress=Indirizzo Fatturazione Soggetto
 PartyBirthDate=Data Nascita
-PartyBirthDateMissingError=Data Nascita non   formattata correttamente: dovrebbe essere yyyy-mm-dd, come 1982-07-21
+PartyBirthDateMissingError=Data Nascita non \u00e8 formattata correttamente: dovrebbe essere yyyy-mm-dd, come 1982-07-21
 PartyBusinessPhone=Telefono Ufficio
 PartyChildShoppingList=Figlio Lista Acquisto
-PartyCannotUpdateContactBecauseNotWithSpecifiedParty=ERRORE: Non   possibile aggiornare le informazioni contatto specificate perch  non corrisponde al cliente specificato.
+PartyCannotUpdateContactBecauseNotWithSpecifiedParty=ERRORE: Non \u00e8 possibile aggiornare le informazioni contatto specificate perch\u00e8 non corrisponde al cliente specificato.
 PartyChangeParty=Cambia Soggetto
 PartyCity=Citt 
-PartyCityMissing=Citt  mancante
+PartyCityMissing=Citt\u00e0 mancante
 PartyClassifications=Classificazioni
 PartyClassificationGroupId=Codice Gruppo Classificazione
 PartyClassificationGroups=Gruppi Classificazione
@@ -154,6 +163,7 @@
 PartyClientIP=IP Client
 PartyClientUser=Utente Client
 PartyComments=Commenti
+PartyCommContent=Contenuto Comunicazioni
 PartyCommEvent=Evento Comunicazioni
 PartyCommEventPurposes=Funzioni Evento Comunicazioni
 PartyCommEventRoles=Ruoli Evento Comunicazioni
@@ -161,7 +171,7 @@
 PartyCommEventSubject=Soggetto Eventi Comunicazioni
 PartyCommCustRequests=Comunicazione Richieste Cliente
 PartyCommunications=Comunicazioni
-PartyCommWorkEfforts=Comunicazione Work Efforts
+PartyCommWorkEfforts=Comunicazione Impegni di Lavoro
 PartyCommunicationsWith=Comunicazioni con
 PartyCompanyName=OFBiz: Gestione Soggetti
 PartyCompanySubtitle=Part of the Open For Business Family of Open Source Software
@@ -176,7 +186,7 @@
 PartyContactMechIdMissing=Codice Contatto mancante
 PartyContactMechType=Tipo Contatto
 PartyContactMechTypeIdMissing=Codice Tipo Contatto mancante
-PartyContactMechNotFoundCannotDelete=ERRORE: Non   possibile cancellare informazioni contatto (contatto Soggetto non trovato)
+PartyContactMechNotFoundCannotDelete=ERRORE: Non \u00e8 possibile cancellare informazioni contatto (contatto Soggetto non trovato)
 PartyContactMobilePhoneNumber=Numero di Telefono Cellullare
 PartyContactNumber=Numero Contatto
 PartyContactNumberMissing=Numero Contatto mancante
@@ -214,7 +224,7 @@
 PartyCreateUserLogin=Creare Utente
 PartyCurrentShoppingCart=Carrello Attuale
 PartyCustomerRequest=Richiesta Soggetto
-PartyCustomerTemporaryPassword=Il cliente ricever  una password temporanea per email.
+PartyCustomerTemporaryPassword=Il cliente ricever\u00e0 una password temporanea per email.
 PartyCybersourceAvsOver=Sovrapponi Cybersource AVS
 PartyDeleteVendorPermissionError=Errore Sicurezza \: per eseguire deleteVendor tu devi avere il permesso PARTYMGR_CREATE o PARTYMGR_ADMIN
 PartyDisabled=DISABILITATO
@@ -223,13 +233,13 @@
 PartyEditCommCustRequest=Aggiorna Richiesta Comunicazione Soggetto
 PartyEditCommPurpose=Aggiorna Comunicazione Work
 PartyEditCommRole=Aggiorna Ruolo Comunicazione
-PartyEditCommWorkEffort=Nuova Comunicazione Work Effort
+PartyEditCommWorkEffort=Nuova Comunicazione Impegno di Lavoro
 PartyEditContactInformation=Aggiorna Informazioni Contatto
 PartyEditSecurityGroupWithId=Aggiorna Gruppo Sicurezza Con Codice
 PartyEftAccount=Conto EFT
 PartyEmailAddress=Indirizzo E-Mail
 PartyEmailAddressMissing=Indirizzo Email mancante
-PartyEmailAddressNotFormattedCorrectly=Indirizzo Email non   formattato correttamente, dovrebbe essere simile a foo@bar.com
+PartyEmailAddressNotFormattedCorrectly=Indirizzo Email non  \u00e8 formattato correttamente, dovrebbe essere simile a foo@bar.com
 PartyEnabled=ABILITATO
 PartyEnteredDate=Data Inserimento
 PartyEnterPasswordTwice=Tu devi inserire la password due volte
@@ -250,7 +260,7 @@
 PartyGroupName=Nome Gruppo
 PartyGroupNameMissing=Nome Gruppo mancante
 PartyHeight=Altezza
-PartyHeightNotValidNumber=Altezza non   un numero valido
+PartyHeightNotValidNumber=Altezza non \u00e8 un numero valido
 PartyHideOld=Nascondi Vecchio
 PartyHistoryChanged=Cambiato
 PartyHistoryName=Nome Storia
@@ -265,11 +275,13 @@
 PartyLastName=Cognome
 PartyLastNameMissingError=Cognome Mancante
 PartyLastVisit=Ultima Visita(e)
+PartyLink=Legami Soggetto
+PartyLinkMessage1=ATTENZIONE: Non \u00e8 possibile non confermare, conferma che vuoi legare i due soggetti elencati qui sotto.
 PartyListCommunicationEvents=Trovati Eventi Comunicazione
 PartyListCommCustRequest=Trovate Richieste Comunicazione Cliente
 PartyListCommPurpose=Trovate Funzioni Comunicazione Work
 PartyListCommRole=Trovate Ruoli Comunicazione
-PartyListCommWorkEffort=Trovata Comunicazione Work Efforts
+PartyListCommWorkEffort=Trovata Comunicazione Impegni di Lavoro
 PartyListItems=Lista Righe
 PartyListName=Lista Nome
 PartyListType=Lista Tipo
@@ -280,7 +292,7 @@
 PartyLookupPartyCommEvent=Ricerca Eventi Comunicazioni
 PartyLookupPartyGroup=Ricerca Gruppi
 PartyLookupPartyPerson=Ricerca Persone
-PartyLoyaltyPoints=Punti Fedelt 
+PartyLoyaltyPoints=Punti Fedelt\u00e0
 PartyManagerApplication=Applicazione Gestione Soggetti
 PartyManifestCompanyName=Manifesto Nome Azienda
 PartyManifestCompanyTitle=Manifesto Titolo Azienda
@@ -299,7 +311,7 @@
 PartyMgrCreatePermissionError=Tu non sei autorizzato a vedere questa pagina. ("PARTYMGR_CREATE" o "PARTYMGR_ADMIN" necessarie)
 PartyMgrViewPermissionError=Tu non sei autorizzato a vedere questa pagina ("PARTYMGR_VIEW" o "PARTYMGR_ADMIN" necessarie)
 PartyMothersMaidenName=Cognome Da Nubile
-PartyMsgContactHavePurpose=Nota: quetso nuova informazione contatto avr  la funzione
+PartyMsgContactHavePurpose=Nota: quetso nuova informazione contatto avr\u00e0 la funzione
 PartyMsgContactNotBelongToYou=L'informazione contatto specificata non corrisponde a te, tu non puoi vedere o modificarla.
 PartyName=Nome
 PartyNewCommContent=Nuova Comunicazione Contenuto
@@ -307,7 +319,7 @@
 PartyNewCommPurpose=Nuova Funzione Comunicazione
 PartyNewCommunication=Nuova Comunicazione
 PartyNewCommRole=Nuovo Ruolo Comunicazione
-PartyNewCommWorkEffort=Nuova Comunicazione Work Effort
+PartyNewCommWorkEffort=Nuova Comunicazione Impegno di Lavoro
 PartyNewEvent=Nuovo Evento
 PartyNewFind=Nuova Ricerca
 PartyNewRelationshipType=Nuovo Tipo Rapporto
@@ -318,6 +330,7 @@
 PartyNickname=Soprannome
 PartyNoCommunicationFound=Nessun Evento Comunicazione
 PartyNoContactInformation=Nessun informazione contatto sul file.
+PartyNoMatch=Nessun record di uguaglianza.
 PartyNoNameGroup=Nessn nome (gruppo)
 PartyNoNotesForParty=Nessuna nota per questo Soggetto.
 PartyNoParent=Nessun Padre
@@ -330,7 +343,7 @@
 PartyNoShoppingCartSavedForParty=Nessun carrello registrato per il Soggetto.
 PartyNoShoppingListsParty=Nessuna lista di Acquisto per il Soggetto
 PartyNoSupplier=Nessun Fornitore
-PartyNotModifRecreatSecurityGroup=Questo non pu  essere cambiato senza ri-creare il Gruppo Sicurezza
+PartyNotModifRecreatSecurityGroup=Questo non pu\u00f2 essere cambiato senza ri-creare il Gruppo Sicurezza
 PartyNoUserLogin=Nessun Utente(i) trovato per questo Soggetto.
 PartyNoVisitFound=Nessuna Visita(e) trovata(e) per questo Soggetto.
 PartyOrderInLast=ordine(i) negli ultimi
@@ -354,7 +367,7 @@
 PartyPartyTo=Soggetto A
 PartyPartyWithId=Il Soggetto con Codice
 PartyPassportExpire=Passaporto Scaduto
-PartyPassportExpireDateNotValidDate=Data Scadenza Passaporto non   una Data valida
+PartyPassportExpireDateNotValidDate=Data Scadenza Passaporto non \u00e8 una Data valida
 PartyPassportNumber=Numero Passaporto
 PartyPasswordMatchError=La tua Passwords non corrisponde
 PartyPasswordMissing=Password Mancante
@@ -376,18 +389,18 @@
 PartyPointsFrom=punti da
 PartyPostal=C.A.P.
 PartyPostalCodeMissing=C.A.P. mancante
-PartyPurposeTypeMissingCannotAdd=Tipo Funzione non specificata, non   possibile aggiungere il contatto
-PartyPurposeTypeMissingCannotRemove=Tipo Funzione  non specificata, non   possibile cancellare la funzione dal contatto
+PartyPurposeTypeMissingCannotAdd=Tipo Funzione non specificata, non \u00e8 possibile aggiungere il contatto
+PartyPurposeTypeMissingCannotRemove=Tipo Funzione  non specificata, non \u00e8 possibile cancellare la funzione dal contatto
 PartyPurposeTypeNotFound=Tipo Funzione non trovata con Codice
 PartyPushURL=Push URL
 PartyPrice=Prezzo
 PartyProduct=Prodotto
 PartyProductId=Codice Prodotto
 PartyProfile=Profilo
-PartyProveinceInCanadaMissing=Provincia mancante, ed   richiesto per un'indirizzo in Canada.
+PartyProveinceInCanadaMissing=Provincia mancante, ed \u00e8 richiesto per un'indirizzo in Canada.
 PartyPublic=Pubblico
 PartyQuantity=Quantit 
-PartyQuantityPurchased=Quantit  Acquistata
+PartyQuantityPurchased=Quantit\u00e0 Acquistata
 PartyQuickAddList=Aggiunta Veloce alla Lista Acquisto
 PartyRelationshipValidFromRoleType=Valido Dal Tipo Ruolo
 PartyRelationshipValidToRoleType=Valido Al Tipo Ruolo
@@ -416,7 +429,7 @@
 PartySecurityGroups=Gruppi Sicurezza
 PartySecurityGroupId=Codice Gruppo Sicurezza
 PartySecurityGroupsList=Lista Gruppi Sicurezza
-PartySecurityViewPermissionError=PartySecurityViewPermissionError Tu non sei autorizza a vedere questa pagina. ("SECURITY_VIEW" o "SECURITY_ADMIN" necessitano)
+PartySecurityViewPermissionError=PartySecurityViewPermissionError Tu non sei autorizzato a vedere questa pagina. (I permessi "SECURITY_VIEW" o "SECURITY_ADMIN" sono necessari)
 PartySegmentGroupId=Codice Segmento
 PartySegmentGroupTypeId=Tipo Segmento
 PartySegmentGroupProductStoreId=Codice Negozio
@@ -438,7 +451,7 @@
 PartySocialSecurityNumber=Numero Sicurezza Sociale
 PartyStartTime=Ora Inizio
 PartyState=Stato/Provincia
-PartyStateInUsMissing=Stato mancante, ed   richiesto per un'indirizzo negli Stati Uniti d'America.
+PartyStateInUsMissing=Stato mancante, ed \u00e8 richiesto per un'indirizzo negli Stati Uniti d'America.
 PartyStatus=Stati
 PartyStillActive=Ancora Attivo
 PartySubject=Soggetto
@@ -459,9 +472,10 @@
 PartyToCart=Al Carrello
 PartyToName=Al Nome
 PartyTotal=Totale
-PartyTotalYearsWorkNotValidNumber=Totale Anni Esperienza Lavorativa non   un numero valido
+PartyTotalYearsWorkNotValidNumber=Totale Anni Esperienza Lavorativa non \u00e8 un numero valido
 PartyType=Tipo
 PartyTypeId=Tipo Soggetto
+PartyUnknown=Sconosciuto
 PartyUpdateAttributePermissionError=Errore Sicurezza \: per eseguire updatePartyAttribute tu devi avere il permesso PARTYMGR_UPDATE o PARTYMGR_ADMIN
 PartyUpdateCommunicationEventPermissionError=Errore Sicurezza \: per eseguire updateCommunicationEvent tu devi avere il permesso PARTYMGR_UPDATE o PARTYMGR_ADMIN
 PartyUpdatePartyClassificationGroupPermissionError=Errore Sicurezza \: per eseguire updatePartyClassificationGroup tu devi avere il permesso PARTYMGR_UPDATE o PARTYMGR_ADMIN
@@ -478,6 +492,7 @@
 PartyUserNameMissing=Nome Utente mancante
 PartyVendor=Fornitore
 PartyVendorInformation=Informazione Fornitore
+PartyViewImage=Mostra Immagine
 PartyViewPostalAddressBoundaryPermissionError=Errore Sicurezza \: per eseguire getPostalAddressBoundary tu devi avere il permesso PARTY_VIEW o PARTY_ADMIN
 PartyViewSegmentRoles=Mostra Ruoli Segmento Soggetto
 PartyVisits=Visite
@@ -487,7 +502,7 @@
 PartyVisitListing=Lista Visite
 PartyVisitorId=Codice Visitatore
 PartyWeight=Peso
-PartyWeightNotValidNumber=Peso non   un numero valido
+PartyWeightNotValidNumber=Peso non \u00e8 un numero valido
 PartyWebApp=Applicazione Web
 PartyYouHave=Tu hai
 PartyYearsWork=Anni Lavorativi
@@ -498,66 +513,66 @@
 
 
 
-partyrelationshipservices.cannot_create_party_relationship_partyIdTo_null=Non   possibile creare il rapporto Soggetto, partyIdTo non pu  essere nullo.
-partyrelationshipservices.cannot_create_party_relationship_partyIdFrom_not_in_role=Non   possibile creare il rapporto Soggetto, partyIdFrom non   specificato il ruolo.
-partyrelationshipservices.cannot_create_party_relationship_partyIdTo_not_in_role=Non   possibile creare il rapporto Soggetto, partyIdTo non   specificato il ruolo.
+partyrelationshipservices.cannot_create_party_relationship_partyIdTo_null=Non \u00e8 possibile creare il rapporto Soggetto, partyIdTo non pu  essere nullo.
+partyrelationshipservices.cannot_create_party_relationship_partyIdFrom_not_in_role=Non \u00e8 possibile creare il rapporto Soggetto, partyIdFrom non   specificato il ruolo.
+partyrelationshipservices.cannot_create_party_relationship_partyIdTo_not_in_role=Non \u00e8 possibile creare il rapporto Soggetto, partyIdTo non   specificato il ruolo.
 #${errMessage} = Messaggio di Errore
-partyrelationshipservices.could_not_create_party_role_read=Non   possibile creare ruolo Soggetto (lettura fallita): ${errMessage}.
-partyrelationshipservices.could_not_create_party_role_exists=Non   possibile creare il rapporto Soggetto: gi  esistente.
-partyrelationshipservices.could_not_create_party_role_write=Non   possibile creare il rapporto Soggetto (scrittura fallita): ${errMessage}.
-partyrelationshipservices.could_not_update_party_relation_read=Non   possibile aggiornare il rapporto Soggetto (lettura fallita): ${errMessage}.
-partyrelationshipservices.could_not_update_party_relation_not_found=Non   possibile aggiornare rapporto Soggetto (rapporto non trovato).
-partyrelationshipservices.could_not_update_party_relation_write=Non   possibile aggiornare il rapporto Soggetto (scrittura fallita): ${errMessage}.
-partyroleservices.could_not_create_party_role_exists=Non   possibile creare il ruolo Soggetto: gi  esistente.
-partyroleservices.could_not_create_party_role_read=Non   possibile creare il ruolo Soggetto (lettura fallita): ${errMessage}.
-partyroleservices.could_not_create_party_role_write=Non   possibile creare il ruolo Soggetto (scrittura fallita): ${errMessage}.
-partyroleservices.could_not_delete_party_role_read=Non   possibile cancellare il ruolo Soggetto (lettura fallita): ${errMessage}.
-partyroleservices.could_not_delete_party_role_not_found=Non   possibile cancellare il ruolo Soggetto (ruolo Soggetto non trovato).
-partyroleservices.could_not_delete_party_role_write=Non   possibile cancellare il ruolo Soggetto (scrittura fallita): ${errMessage}.
-partyservices.could_not_create_party_group_generation_failure=ERRORE: Non   possibile creare il gruppo Soggetto (generazione codice fallita).
-partyservices.could_not_create_party_ID_digit=Non   possibile creare il gruppo Soggetto, specificato codice Soggetto non pu  iniziare con un numero, codici numerici sono riservati per la generazione-autotica di codici.
+partyrelationshipservices.could_not_create_party_role_read=Non \u00e8 possibile creare ruolo Soggetto (lettura fallita): ${errMessage}.
+partyrelationshipservices.could_not_create_party_role_exists=Non \u00e8 possibile creare il rapporto Soggetto: gi  esistente.
+partyrelationshipservices.could_not_create_party_role_write=Non \u00e8 possibile creare il rapporto Soggetto (scrittura fallita): ${errMessage}.
+partyrelationshipservices.could_not_update_party_relation_read=Non \u00e8 possibile aggiornare il rapporto Soggetto (lettura fallita): ${errMessage}.
+partyrelationshipservices.could_not_update_party_relation_not_found=Non \u00e8 possibile aggiornare rapporto Soggetto (rapporto non trovato).
+partyrelationshipservices.could_not_update_party_relation_write=Non \u00e8 possibile aggiornare il rapporto Soggetto (scrittura fallita): ${errMessage}.
+partyroleservices.could_not_create_party_role_exists=Non \u00e8 possibile creare il ruolo Soggetto: gi  esistente.
+partyroleservices.could_not_create_party_role_read=Non \u00e8 possibile creare il ruolo Soggetto (lettura fallita): ${errMessage}.
+partyroleservices.could_not_create_party_role_write=Non \u00e8 possibile creare il ruolo Soggetto (scrittura fallita): ${errMessage}.
+partyroleservices.could_not_delete_party_role_read=Non \u00e8 possibile cancellare il ruolo Soggetto (lettura fallita): ${errMessage}.
+partyroleservices.could_not_delete_party_role_not_found=Non \u00e8 possibile cancellare il ruolo Soggetto (ruolo Soggetto non trovato).
+partyroleservices.could_not_delete_party_role_write=Non \u00e8 possibile cancellare il ruolo Soggetto (scrittura fallita): ${errMessage}.
+partyservices.could_not_create_party_group_generation_failure=ERRORE: Non \u00e8 possibile creare il gruppo Soggetto (generazione codice fallita).
+partyservices.could_not_create_party_ID_digit=Non \u00e8 possibile creare il gruppo Soggetto, specificato codice Soggetto non pu  iniziare con un numero, codici numerici sono riservati per la generazione-autotica di codici.
 partyservices.party_type_not_found_in_database_cannot_create_party_group=Il tipo Soggetto con Codice PARTY_GROUP non   stata trovata nel database, non   possibile creare un nuovo grupop Soggetto.
-partyservices.cannot_create_party_group_already_exists_not_PARTY_GROUP_type=Non   possibile creare gruppo Soggetto, un Soggetto con il codice Soggetto specificato gi  esistente e non   un PARTY_GROUP tipo Soggetto, o un figlio del tipo PARTY_GROUP.
-partyservices.cannot_create_party_group_already_exists=Non   possibile creare gruppo Soggetto, un gruppo Soggetto con il codice Soggetto specificato esiste gi .
+partyservices.cannot_create_party_group_already_exists_not_PARTY_GROUP_type=Non \u00e8 possibile creare gruppo Soggetto, un Soggetto con il codice Soggetto specificato gi  esistente e non   un PARTY_GROUP tipo Soggetto, o un figlio del tipo PARTY_GROUP.
+partyservices.cannot_create_party_group_already_exists=Non \u00e8 possibile creare gruppo Soggetto, un gruppo Soggetto con il codice Soggetto specificato esiste gi .
 partyservices.data_source_error_adding_party_group=Errore successo Sorgente Dati durante l'aggiunta del gruppo Soggetto: ${errMessage}.
-partyservices.could_not_update_party_information_read=Non   possibile aggiornare informazione gruppo Soggetto (lettura fallita): ${errMessage}.
-partyservices.could_not_update_party_information_not_found=Non   possibile aggiornare Soggetto o informazione gruppo Soggetto (Soggetto o gruppo cliente/fornito non trovato).
-partyservices.could_not_update_party_information_write=Non   possibile aggiornare Soggetto o informazione gruppo Soggetto (scrittura fallita): ${errMessage}.
-partyservices.cannot_create_affiliate_digit=Non   possibile creare affiliato, codice Soggetto specificato non pu  iniziare con un numero, codici numerici sono riservati per la generazione-automatica di codici.
-partyservices.cannot_create_affiliate_generation_failure=ERRORE: Non   possibile creare affiliato (generazione codice fallita).
-partyservices.cannot_create_affiliate_no_party_entity=Non   possibile creare affiliato; nessun entit  Soggetto trovata.
-partyservices.cannot_create_affiliate_ID_already_exists=Non   possibile creare, un affiliato con il codice Soggetto specificato esiste gi .
-partyservices.could_not_add_affiliate_info_write=Non   possibile aggiungere informazione affiliato (scrittura fallita): ${errMessage}.
-partyservices.could_not_update_affiliate_information_read=Non   possibile aggiornare informazione affiliato (lettura fallita): ${errMessage}.
-partyservices.could_not_update_affiliate_information_not_found=Non   possibile aggiornare informazione affiliato (affiliato non trovato).
-partyservices.could_not_update_affiliate_information_write=Non   possibile aggiornare informazione affiliato (scrittura fallita): ${errMessage}.
-partyservices.problem_creating_note_no_noteId_returned=Probleme nella creazione della nota, nessun noteId restituita.
+partyservices.could_not_update_party_information_read=Non \u00e8 possibile aggiornare informazione gruppo Soggetto (lettura fallita): ${errMessage}.
+partyservices.could_not_update_party_information_not_found=Non \u00e8 possibile aggiornare Soggetto o informazione gruppo Soggetto (Soggetto o gruppo cliente/fornito non trovato).
+partyservices.could_not_update_party_information_write=Non \u00e8 possibile aggiornare Soggetto o informazione gruppo Soggetto (scrittura fallita): ${errMessage}.
+partyservices.cannot_create_affiliate_digit=Non \u00e8 possibile creare affiliato, codice Soggetto specificato non pu  iniziare con un numero, codici numerici sono riservati per la generazione-automatica di codici.
+partyservices.cannot_create_affiliate_generation_failure=ERRORE: Non \u00e8 possibile creare affiliato (generazione codice fallita).
+partyservices.cannot_create_affiliate_no_party_entity=Non \u00e8 possibile creare affiliato; nessun entit  Soggetto trovata.
+partyservices.cannot_create_affiliate_ID_already_exists=Non \u00e8 possibile creare, un affiliato con il codice Soggetto specificato esiste gi .
+partyservices.could_not_add_affiliate_info_write=Non \u00e8 possibile aggiungere informazione affiliato (scrittura fallita): ${errMessage}.
+partyservices.could_not_update_affiliate_information_read=Non \u00e8 possibile aggiornare informazione affiliato (lettura fallita): ${errMessage}.
+partyservices.could_not_update_affiliate_information_not_found=Non \u00e8 possibile aggiornare informazione affiliato (affiliato non trovato).
+partyservices.could_not_update_affiliate_information_write=Non \u00e8 possibile aggiornare informazione affiliato (scrittura fallita): ${errMessage}.
+partyservices.problem_creating_note_no_noteId_returned=Problema nella creazione della nota, nessun noteId restituita.
 partyservices.problem_associating_note_with_party=Problema associazione nota con Soggetto "${errMessage}".
-partyservices.required_parameter_email_cannot_be_empty=Parametro richiesto 'email' non pu  essere vuoto.
-partyservices.cannot_get_party_entities_read=Non possibile leggere l'entit  party entities (lettura fallita): ${errMessage}.
+partyservices.required_parameter_email_cannot_be_empty=Parametro richiesto 'email' non pu\u00f2 essere vuoto.
+partyservices.cannot_get_party_entities_read=Non possibile leggere l'entit\u00e0 party entities (lettura fallita): ${errMessage}.
 partyservices.both_names_cannot_be_empty=Entrambi 'lastName' e 'firstName' non possono essere vuoti.
-partyservices.cannot_delete_party_not_implemented=Non   possibile cancellare Soggetto, operazione non ancora implementata.
-party.id_is_digit=Il codice Soggetto specificato non pu  iniziare con un numero, codice numerici sono riservati per la generazione-automatica dei codici
+partyservices.cannot_delete_party_not_implemented=Non \u00e8 possibile cancellare Soggetto, operazione non ancora implementata.
+party.id_is_digit=Il codice Soggetto specificato non pu\u00f2 iniziare con un numero, codice numerici sono riservati per la generazione-automatica dei codici
 party.id_generation_failure=ERRORE: Fallita generazione di un nuovo codice Soggetto
 
 # ========================================
 # org.ofbiz.party.party messages
 # ========================================
 
-party.id_is_digit=Codice Soggetto specificato non pu  iniziare con un numero, codice numerici sono riservati per codici generati automaticamente
+party.id_is_digit=Codice Soggetto specificato non pu\u00f2 iniziare con un numero, codice numerici sono riservati per codici generati automaticamente
 
 party.id_generation_failure=ERRORE: Fallito generazione nuovo Codice Soggetto
 
-person.create.party_exists_not_person_type=Non   possibile creare persona, un Soggetto con il Codice Soggetto specificato gi  esistente e non   un Soggetto di tipo PERSONA
-person.create.person_exists=Non   possibile creare una persona, una persona con il Codice Soggetto specificato gi  esistente
+person.create.party_exists_not_person_type=Non \u00e8 possibile creare persona, un Soggetto con il Codice Soggetto specificato gi  esistente e non \u00e8 un Soggetto di tipo PERSONA
+person.create.person_exists=Non \u00e8 possibile creare una persona, una persona con il Codice Soggetto specificato gi\u00e0 esistente
 # 0=exception message
-person.create.db_error=Non   possibile aggiungere informazioni sulla persona (fallita scrittura): {0}
+person.create.db_error=Non \u00e8 possibile aggiungere informazioni sulla persona (fallita scrittura): {0}
 
 # 0=exception message
-person.update.read_failure=Non   possibile aggiornare informazioni sulla persona (fallita lettura): {0}
-person.update.not_found=Non   possibile aggiornare informazioni sulla persona (persona non trovata)
+person.update.read_failure=Non \u00e8 possibile aggiornare informazioni sulla persona (fallita lettura): {0}
+person.update.not_found=Non \u00e8 possibile aggiornare informazioni sulla persona (persona non trovata)
 # 0=exception message
-person.update.write_failure=Non   possibile aggiornare informazioni sulla persona (fallita scrittura): {0}
+person.update.write_failure=Non \u00e8 possibile aggiornare informazioni sulla persona (fallita scrittura): {0}
 person.update.success=Persona aggiornata con successo.
 
 FormFieldTitle_groupName=Nome Gruppo
@@ -594,12 +609,14 @@
 FormFieldTitle_roleTypeIdTo=Tipo Ruolo A
 FormFieldTitle_subject=Soggetto
 FormFieldTitle_contactListId=Codice Lista Contatto
+FormFieldTitle_contactListName=Nome Lista Contatto
+FormFieldTitle_contactListTypeId=Tipo Lista Contatto
 FormFieldTitle_contentMimeTypeId=Codice Tipo Contenuto Mime
-FormFieldTitle_communicationEventPrpTypId=Codice Tipo Funzione Evento Comunicazione
+FormFieldTitle_communicationEventPrpTypId=Tipo Funzione Evento Comunicazione
 FormFieldTitle_roleTypeId=Tipo Ruolo
 FormFieldTitle_drMimeTypeId=Tipo Documento
-FormFieldTitle_taxAuthPartyId=Autorit  Tasse
-FormFieldTitle_partyTaxId=Codice Autorit  Tasse
+FormFieldTitle_taxAuthPartyId=Autorit\u00e0 Tasse
+FormFieldTitle_partyTaxId=Codice Autorit\u00e0 Tasse
 FormFieldTitle_isExempt=E' Esente
 FormFieldTitle_isNexus=E' Nexus
 FormFieldTitle_partyClassificationTypeId=Tipo Classificazione Soggetto
@@ -623,3 +640,12 @@
 FormFieldTitle_contentId=Codice Contenuto
 FormFieldTitle_contentName=Nome Contenuto
 FormFieldTitle_dataResourceId=Codice Risorsa Dati
+FormFieldTitle_marketingCampaignId=Campagna Marketing
+FormFieldTitle_dataResourceTypeId=Tipo Risorsa Dati
+FormFieldTitle_drObjectInfo=Nome File
+FormFieldTitle_imageData=File
+FormFieldTitle_employmentStatusEnumId=Stato Impiegato
+FormFieldTitle_residenceStatusEnumId=Stato Residenza
+FormFieldTitle_occupation=Occupazione
+FormFieldTitle_yearsWithEmployer=Anni Come Impiegato
+FormFieldTitle_monthsWithEmployer=Mesi Come Impiegato
\ No newline at end of file
Index: party/entitydef/entitymodel.xml
===================================================================
--- party/entitydef/entitymodel.xml	(revision 7788)
+++ party/entitydef/entitymodel.xml	(working copy)
@@ -624,6 +624,7 @@
     </view-entity>
     <entity entity-name="CommunicationEventPrpTyp"
             package-name="org.ofbiz.party.communication"
+			default-resource-name="PartyEntityLabels"
             title="Communication Event Purpose Type Entity">
       <field name="communicationEventPrpTypId" type="id-ne"></field>
       <field name="parentTypeId" type="id-ne"></field>
@@ -1379,7 +1380,7 @@
     </entity>
     <entity entity-name="PartyClassificationType"
             package-name="org.ofbiz.party.party"
-            default-resource-name="PartyEntityLabels"
+			default-resource-name="PartyEntityLabels"
             title="Party Classification Type Entity">
       <field name="partyClassificationTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -1652,6 +1653,7 @@
     </entity>
     <entity entity-name="PartyRelationshipType"
             package-name="org.ofbiz.party.party"
+			default-resource-name="PartyEntityLabels"
             title="Party Relationship Type Entity">
       <field name="partyRelationshipTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -1764,7 +1766,7 @@
     </entity>
     <entity entity-name="PartyType"
             package-name="org.ofbiz.party.party"
-            default-resource-name="PartyEntityLabels"
+			default-resource-name="PartyEntityLabels"
             title="Party Type Entity">
       <field name="partyTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
Index: party/webapp/partymgr/communication/CommForms.xml
===================================================================
--- party/webapp/partymgr/communication/CommForms.xml	(revision 7788)
+++ party/webapp/partymgr/communication/CommForms.xml	(working copy)
@@ -295,9 +295,9 @@
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"> <submit button-type="text-link"/> </field>
         <sort-order>
             <sort-field name="communicationEventId"/>
-            <banner left-text-style="tabletext" left-text="Enter existing WorkEffort Id below"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner1}"/>
             <sort-field name="workEffortId"/>
-            <banner left-text-style="tabletext" left-text="OR add new WorkEffort data below to create new entity (leave WorkEffort Id empty)"/>
+            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner2}"/>
         </sort-order>
     </form>
 
@@ -363,10 +363,10 @@
         </actions>
     
         <field name="editContent" title="">
-            <hyperlink also-hidden="false" description="Edit" target="EditCommContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/> 
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditCommContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/> 
         </field>
         <field name="viewContent" title="">
-            <hyperlink also-hidden="false" description="View" target="ViewSimpleContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/> 
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonView}" target="ViewSimpleContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/> 
         </field>
         <field name="contentName"><display/></field>
         <field name="contentId"><display/></field>
@@ -409,9 +409,9 @@
         <field name="contentId" widget-style="tabletext"><display/></field>
         <field name="dataResourceId" widget-style="tabletext"><display/></field>
         <field name="contentName"><text/></field>
-        <field name="fromDate" title="From Date" widget-style="tabletext"><display/></field>
-        <field name="thruDate" title="Thru Date"><date-time/></field>
-        <field name="sequenceNum" title="Sequence Num"><text/></field>
+        <field name="fromDate" widget-style="tabletext"><display/></field>
+        <field name="thruDate"><date-time/></field>
+        <field name="sequenceNum"><text/></field>
         
         <field name="drMimeTypeId" widget-style="tabletext">
             <drop-down allow-empty="false">
@@ -463,7 +463,7 @@
         </field>
 			-->
 
-        <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 	
     <form name="uploadCommContent" type="upload" default-title-style="tableheadtext"  default-map-name="commEventContentDataResource"
@@ -475,10 +475,10 @@
         <field name="drMimeTypeId" ><hidden/></field>
         <field name="communicationEventId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
-        <field name="drObjectInfo" title="File Name"><text/></field>
+        <field name="drObjectInfo"><text/></field>
         <!-- would show previous file name... doesn't make too much sense <field name="objectInfo" title="File Name" map-name="dataResource"><display also-hidden="false"/></field> -->
-        <field name="imageData" map-name="empty" title="File"><file/></field>
-        <field name="submitButton" title="Upload" widget-style="smallSubmit"><submit/></field>
+        <field name="imageData" map-name="empty"><file/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit/></field>
     </form>
     
     <form name="editCommTextContent" type="single" default-title-style="tableheadtext"  default-map-name="commEventContentDataResource"
@@ -490,7 +490,7 @@
         <field name="communicationEventId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
         <field name="textData" map-name="electronicText" title="Text Data"><textarea rows="30" cols="60"/></field>
-        <field name="submitButton" title="Save" widget-style="smallSubmit"><submit/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
     </form>
 
 
Index: party/webapp/partymgr/contactlist/PartyContactListForms.xml
===================================================================
--- party/webapp/partymgr/contactlist/PartyContactListForms.xml	(revision 7788)
+++ party/webapp/partymgr/contactlist/PartyContactListForms.xml	(working copy)
@@ -38,8 +38,8 @@
         <field name="fromDate"><display/></field>
         <field name="statusHistory" widget-style="selectBox">
             <drop-down>
-                <option key="" description="-- Status History --"/>
-                <entity-options entity-name="ContactListPartyAndStatus" key-field-name="statusId" description="${statusDate} ${description} [by: ${setByUserLoginId}] [code: ${optInVerifyCode}]">
+                <option key="" description="-- ${uiLabelMap.CommonStatusHistory} --"/>
+                <entity-options entity-name="ContactListPartyAndStatus" key-field-name="statusId" description="${statusDate} ${description} [${uiLabelMap.CommonBy}: ${setByUserLoginId}] [${uiLabelMap.FormFieldTitle_optInVerifyCode}: ${optInVerifyCode}]">
                     <entity-constraint name="partyId" operator="equals" env-name="partyId"/>
                     <entity-constraint name="contactListId" operator="equals" env-name="contactListId"/>
                     <entity-constraint name="fromDate" operator="equals" env-name="fromDate"/>
@@ -101,7 +101,7 @@
             <entity-condition entity-name="ContactList"/>
         </actions>
         
-        <field name="contactListId"  widget-style="buttontext" title="contactListId">
+        <field name="contactListId"  widget-style="buttontext">
             <hyperlink also-hidden="false" target-type="plain" description="${contactListId}" target="javascript:set_value('${contactListId}')"/>
         </field>
         <field name="contactListName"><display/></field>
Index: party/webapp/partymgr/includes/appheader.ftl
===================================================================
--- party/webapp/partymgr/includes/appheader.ftl	(revision 7788)
+++ party/webapp/partymgr/includes/appheader.ftl	(working copy)
@@ -43,7 +43,7 @@
     <div class="col"><a href="<@ofbizUrl>createnew</@ofbizUrl>" class="${selectedLeftClassMap.create?default(unselectedLeftClassName)}">${uiLabelMap.CommonCreate}</a></div>
   </#if>
   <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
-    <div class="col"><a href="<@ofbizUrl>linkparty</@ofbizUrl>" class="${selectedLeftClassMap.link?default(unselectedLeftClassName)}">Link</a></div>
+    <div class="col"><a href="<@ofbizUrl>linkparty</@ofbizUrl>" class="${selectedLeftClassMap.link?default(unselectedLeftClassName)}">${uiLabelMap.PartyLink}</a></div>
   </#if>
   <div class="col"><a href="<@ofbizUrl>FindCommunicationEvents</@ofbizUrl>" class="${selectedLeftClassMap.comm?default(unselectedLeftClassName)}">${uiLabelMap.PartyCommunications}</a></div>
   <div class="col"><a href="<@ofbizUrl>showvisits</@ofbizUrl>" class="${selectedLeftClassMap.visits?default(unselectedLeftClassName)}">${uiLabelMap.PartyVisits}</a></div>
@@ -56,6 +56,6 @@
   <#else>
     <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
   </#if>
-  <div class="col-right"><a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>" class="${selectedLeftClassMap.addrmap?default(unselectedLeftClassName)}">Addr MatchMap</a></div>
+  <div class="col-right"><a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>" class="${selectedLeftClassMap.addrmap?default(unselectedLeftClassName)}">${uiLabelMap.PageTitleAddressMatchMap}</a></div>
   <div class="col-fill">&nbsp;</div>
 </div>
Index: party/webapp/partymgr/party/addressMatchMap.ftl
===================================================================
--- party/webapp/partymgr/party/addressMatchMap.ftl	(revision 7788)
+++ party/webapp/partymgr/party/addressMatchMap.ftl	(working copy)
@@ -32,10 +32,10 @@
       <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
         <tr>
           <td valign="middle" align="left">
-            <div class="boxhead">Address Match Map</div>
+            <div class="boxhead">${uiLabelMap.PageTitleAddressMatchMap}</div>
           </td>
           <td valign="middle" align="right">
-            <a href="<@ofbizUrl>findAddressMatch</@ofbizUrl>" class="submenutextright">Find Matches</a>
+            <a href="<@ofbizUrl>findAddressMatch</@ofbizUrl>" class="submenutextright">${uiLabelMap.PageTitleFindMatches}</a>
           </td>
         </tr>
       </table>
@@ -47,14 +47,14 @@
       <table border="0" cellspacing="0" cellpadding="0" class="boxbottom">
         <form name="addaddrmap" method="post" action="<@ofbizUrl>createAddressMatchMap</@ofbizUrl>">
           <tr>
-            <td><span class="tabletext">&nbsp;Match Key:&nbsp;</span></td>
+            <td><span class="tabletext">&nbsp;${uiLabelMap.PartyAddressMatchKey}:&nbsp;</span></td>
             <td><input type="text" class="inputBox" name="mapKey"></td>
-            <td><span class="tabletext">&nbsp;Match Value:&nbsp;</span></td>
+            <td><span class="tabletext">&nbsp;${uiLabelMap.PartyAddressMatchValue}:&nbsp;</span></td>
             <td><input type="text" class="inputBox" name="mapValue"></td>
-            <td><span class="tabletext">&nbsp;Seq:&nbsp;</span></td>
+            <td><span class="tabletext">&nbsp;${uiLabelMap.CommonSequence}:&nbsp;</span></td>
             <td><input type="text" class="inputBox" size="5" name="sequenceNum" value="0"></td>
             <td>
-              <a href="javascript:document.addaddrmap.submit()" class="buttontext">Create</a>&nbsp;&nbsp;
+              <a href="javascript:document.addaddrmap.submit()" class="buttontext">${uiLabelMap.CommonCreate}</a>&nbsp;&nbsp;
             </td>
           </tr>
         </form>
@@ -63,8 +63,8 @@
           <tr>
             <td colspan="5" align="center">
               <input type="file" name="uploadedFile" size="14" class="inputBox"/>
-              <input type="submit" value="Upload CSV" class="smallSubmit"/>
-              <div class="tabletext">Format: key,value,sequence (sequence is optional)</span>
+              <input type="submit" value="${uiLabelMap.CommonUpload} CSV" class="smallSubmit"/>
+              <div class="tabletext">${uiLabelMap.PartyAddressMatchMessage1}</span>
             </td>
           </tr>
         </form>
@@ -74,11 +74,11 @@
             <td colspan="5">
               <table border="0" cellspacing="5" cellpadding="5">
                   <tr>
-                    <td><div class="tableheadtext">Key</td>
+                    <td><div class="tableheadtext">${uiLabelMap.PartyAddressMatchKey}</td>
                     <td><div class="tableheadtext">=></td>
-                    <td><div class="tableheadtext">Value</td>
+                    <td><div class="tableheadtext">${uiLabelMap.PartyAddressMatchValue}</td>
                     <td>&nbsp;</td>
-                    <td><a href="<@ofbizUrl>clearAddressMatchMap</@ofbizUrl>" class="buttontext">Clear All</a></td>
+                    <td><a href="<@ofbizUrl>clearAddressMatchMap</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClear} ${uiLabelMap.CommonAll}</a></td>
                   </tr>
                   <tr><td colspan="5"><hr class="sepbar"/></td></tr>
                 <#list addressMatchMaps as map>
@@ -87,7 +87,7 @@
                     <td><div class="tabletext">=></td>
                     <td><div class="tabletext">${map.mapValue}</td>
                     <td><div class="tabletext">[${map.sequenceNum?if_exists}]</td>
-                    <td><a href="<@ofbizUrl>removeAddressMatchMap?mapKey=${map.mapKey}&mapValue=${map.mapValue}</@ofbizUrl>" class="buttontext">Delete</a></td>
+                    <td><a href="<@ofbizUrl>removeAddressMatchMap?mapKey=${map.mapKey}&mapValue=${map.mapValue}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></td>
                   </tr>
                 </#list>
               </table>
Index: party/webapp/partymgr/party/editcontactmech.ftl
===================================================================
--- party/webapp/partymgr/party/editcontactmech.ftl	(revision 7788)
+++ party/webapp/partymgr/party/editcontactmech.ftl	(working copy)
@@ -37,7 +37,7 @@
           <td width="74%">
             <select name="preContactMechTypeId" class="selectBox">
               <#list mechMap.contactMechTypes as contactMechType>
-                <option value="${contactMechType.contactMechTypeId}">${contactMechType.description}</option>
+                <option value="${contactMechType.contactMechTypeId}">${contactMechType.get("description",locale)}</option>
               </#list>
             </select>&nbsp;<a href="javascript:document.createcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonCreate}]</a>
           </td>
@@ -53,7 +53,7 @@
     &nbsp;<a href="<@ofbizUrl>authview/${donePage?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
     &nbsp;<a href="javascript:document.editcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
       <#if contactMechPurposeType?exists>
-        <div>(${uiLabelMap.PartyMsgContactHavePurpose} <b>"${contactMechPurposeType.description?if_exists}"</b>)</div>
+        <div>(${uiLabelMap.PartyMsgContactHavePurpose} <b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</div>
       </#if>
       <table width="90%" border="0" cellpadding="2" cellspacing="0">
         <form method="post" action="<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>" name="editcontactmechform">
@@ -82,7 +82,7 @@
                   <td bgcolor="white">
                     <div class="tabletext">&nbsp;
                       <#if contactMechPurposeType?has_content>
-                        <b>${contactMechPurposeType.description}</b>
+                        <b>${contactMechPurposeType.get("description",locale)}</b>
                       <#else>
                         <b>${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b>
                       </#if>
@@ -104,7 +104,7 @@
                     <select name="contactMechPurposeTypeId" class="selectBox">
                       <option></option>
                       <#list mechMap.purposeTypes as contactMechPurposeType>
-                        <option value="${contactMechPurposeType.contactMechPurposeTypeId}">${contactMechPurposeType.description}</option>
+                        <option value="${contactMechPurposeType.contactMechPurposeTypeId}">${contactMechPurposeType.get("description",locale)}</option>
                       </#list>
                     </select>
                   </td>
@@ -205,7 +205,7 @@
     </tr>
   <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.description}</div></td>
+      <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.get("description",locale)}</div></td>
       <td width="5">&nbsp;</td>
       <td width="74%">
           <input type="text" class="inputBox" size="60" maxlength="255" name="emailAddress" value="${(mechMap.contactMech.infoString)?default(request.getParameter('emailAddress')?if_exists)}">
@@ -213,7 +213,7 @@
     </tr>
   <#else>
     <tr>
-      <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.description}</div></td>
+      <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.get("description",locale)}</div></td>
       <td width="5">&nbsp;</td>
       <td width="74%">
           <input type="text" class="inputBox" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}">
Index: party/webapp/partymgr/party/editcreditcard.ftl
===================================================================
--- party/webapp/partymgr/party/editcreditcard.ftl	(revision 7788)
+++ party/webapp/partymgr/party/editcreditcard.ftl	(working copy)
@@ -181,7 +181,7 @@
               <#list curPartyContactMechPurposes as curPartyContactMechPurpose> 
                 <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
                 <div class="tabletext">
-                  <b>${curContactMechPurposeType.description?if_exists}</b>
+                  <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b>
                   <#if curPartyContactMechPurpose.thruDate?exists>
                     (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
                   </#if>
@@ -226,7 +226,7 @@
                 <#list partyContactMechPurposes as partyContactMechPurpose>
                     <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
                     <div class="tabletext">
-                      <b>${contactMechPurposeType.description?if_exists}</b>
+                      <b>${contactMechPurposeType.get("description",locale)?if_exists}</b>
                       <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
                     </div>
                 </#list>
Index: party/webapp/partymgr/party/editeftaccount.ftl
===================================================================
--- party/webapp/partymgr/party/editeftaccount.ftl	(revision 7788)
+++ party/webapp/partymgr/party/editeftaccount.ftl	(working copy)
@@ -28,7 +28,7 @@
       <p class="head1">${uiLabelMap.AccountingAddNewEftAccount}</p>
       <form method="post" action='<@ofbizUrl>createEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
     <#else>
-      <p class="head1">${uiLabelMap.PageTitleEditEFTAccount}</p>
+      <p class="head1">${uiLabelMap.PageTitleEditEftAccount}</p>
       <form method="post" action='<@ofbizUrl>updateEftAccount?DONE_PAGE=${donePage}</@ofbizUrl>' name="editeftaccountform" style='margin: 0;'>
         <input type="hidden" name='paymentMethodId' value='${paymentMethodId}'>
     </#if>
@@ -104,7 +104,7 @@
               <#list curPartyContactMechPurposes as curPartyContactMechPurpose> 
                 <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
                 <div class="tabletext">
-                  <b>${curContactMechPurposeType.description?if_exists}</b>
+                  <b>${curContactMechPurposeType.get("description",locale)?if_exists}</b>
                   <#if curPartyContactMechPurpose.thruDate?exists>
                     (${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
                   </#if>
@@ -149,7 +149,7 @@
                 <#list partyContactMechPurposes as partyContactMechPurpose>
                     <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
                     <div class="tabletext">
-                      <b>${contactMechPurposeType.description?if_exists}</b>
+                      <b>${contactMechPurposeType.get("description",locale)?if_exists}</b>
                       <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
                     </div>
                 </#list>
Index: party/webapp/partymgr/party/EditPartyRelationships.ftl
===================================================================
--- party/webapp/partymgr/party/EditPartyRelationships.ftl	(revision 7788)
+++ party/webapp/partymgr/party/EditPartyRelationships.ftl	(working copy)
@@ -47,15 +47,15 @@
                 <td><div class="tabletext">
                     ${uiLabelMap.PartyParty} <b>${partyRelationship.partyIdTo}</b>
                     <#if "_NA_" != partyRelationship.roleTypeIdTo>
-                        ${uiLabelMap.PartyRole} <b>${roleTypeTo.description}</b>
+                        ${uiLabelMap.PartyRole} <b>${roleTypeTo.get("description",locale)}</b>
                     </#if>
-                    ${uiLabelMap.CommonIsA} <b>${(partyRelationshipType.partyRelationshipName)?default("NA")}</b>
+                    ${uiLabelMap.CommonIsA} <b>${(partyRelationshipType.get("partyRelationshipName",locale))?default("${uiLabelMap.CommonNA}")}</b>
                     ${uiLabelMap.CommonOf} ${uiLabelMap.PartyParty} <b>${partyRelationship.partyIdFrom}</b>
                     <#if "_NA_" != partyRelationship.roleTypeIdFrom>
-                        ${uiLabelMap.PartyRole} <b>${roleTypeFrom.description}</b>
+                        ${uiLabelMap.PartyRole} <b>${roleTypeFrom.get("description",locale)}</b>
                     </#if>
                     <#if partyRelationship.securityGroupId?exists>
-                    ${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity} <b>${partyRelationship.getRelatedOne("SecurityGroup").get("description")}</b>
+                    ${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity} <b>${partyRelationship.getRelatedOne("SecurityGroup").get("description",locale)}</b>
                     </#if>
                 </div></td>
                 <td><div class="tabletext">&nbsp;${partyRelationship.fromDate}</div></td>
@@ -104,26 +104,26 @@
             ${uiLabelMap.PartyPartyInTheRoleOf}
             <select name="roleTypeIdTo" class="selectBox">
               <#list roleTypes as roleType>
-                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.description}<#-- [${roleType.roleTypeId}]--></option>
+                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
               </#list>
             </select>
             ${uiLabelMap.CommonIsA}
             <select name="partyRelationshipTypeId" class="selectBox">
               <#list relateTypes as relateType>
-                <option value="${relateType.partyRelationshipTypeId}">${relateType.partyRelationshipName}<#-- [${relateType.partyRelationshipTypeId}]--></option>
+                <option value="${relateType.partyRelationshipTypeId}">${relateType.get("partyRelationshipName",locale)}<#-- [${relateType.partyRelationshipTypeId}]--></option>
               </#list>
             </select>
             ${uiLabelMap.PartyPartyOfTheRoleParty}
             <select name="roleTypeIdFrom" class="selectBox">
               <#list roleTypes as roleType>
-                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.description}<#-- [${roleType.roleTypeId}]--></option>
+                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
               </#list>
             </select>
             <#-- set security group specific to this party relationship -->
             <br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity} 
             <select name="securityGroupId" class="selectBox">
               <#list securityGroups as securityGroup>
-                <option value="${securityGroup.groupId}">${securityGroup.description}</option>
+                <option value="${securityGroup.groupId}">${securityGroup.get("description",locale)}</option>
               </#list>
             </select><br/>
             ${uiLabelMap.CommonFrom} <input type="text" size="24" name="fromDate" class="inputBox"/><a href="javascript:call_cal(document.addPartyRelationshipTo.fromDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
@@ -142,13 +142,13 @@
               ${uiLabelMap.PartyPartyCurrentInTheRoleOf}
             <select name="roleTypeIdTo" class="selectBox">
               <#list roleTypes as roleType>
-                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.description}<#-- [${roleType.roleTypeId}]--></option>
+                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
               </#list>
             </select>
             ${uiLabelMap.CommonIsA}
             <select name="partyRelationshipTypeId" class="selectBox">
               <#list relateTypes as relateType>
-                <option value="${relateType.partyRelationshipTypeId}">${relateType.partyRelationshipName}<#-- [${relateType.partyRelationshipTypeId}]--></option>
+                <option value="${relateType.partyRelationshipTypeId}">${relateType.get("partyRelationshipName",locale)}<#-- [${relateType.partyRelationshipTypeId}]--></option>
               </#list>
             </select>
             ${uiLabelMap.PartyPartyWithId}
@@ -157,13 +157,13 @@
             ${uiLabelMap.PartyPartyInTheRoleOf}
             <select name="roleTypeIdFrom" class="selectBox">
               <#list roleTypes as roleType>
-                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.description}<#-- [${roleType.roleTypeId}]--></option>
+                <option <#if "_NA_" == roleType.roleTypeId>selected="selected"</#if> value="${roleType.roleTypeId}">${roleType.get("description",locale)}<#-- [${roleType.roleTypeId}]--></option>
               </#list>
             </select>
             <br/>${uiLabelMap.CommonAnd} ${uiLabelMap.PartyRelationSecurity}
             <select name="securityGroupId" class="selectBox">
               <#list securityGroups as securityGroup>
-                <option value="${securityGroup.groupId}">${securityGroup.description}</option>
+                <option value="${securityGroup.groupId}">${securityGroup.get("description",locale)}</option>
               </#list>
             </select><br/>
             ${uiLabelMap.CommonFrom} <input type="text" size="24" name="fromDate" class="inputBox"/><a href="javascript:call_cal(document.addPartyRelationshipFrom.fromDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
Index: party/webapp/partymgr/party/editShoppingList.ftl
===================================================================
--- party/webapp/partymgr/party/editShoppingList.ftl	(revision 7788)
+++ party/webapp/partymgr/party/editShoppingList.ftl	(working copy)
@@ -112,11 +112,11 @@
                     <td>
                       <select name="shoppingListTypeId" class="selectBox" <#if shoppingList.listName?default("") == "auto-save">disabled</#if>>
                       	<#if shoppingListType?exists>
-                          <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.description?default(shoppingListType.shoppingListTypeId)}</option>
+                          <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option>
                           <option value="${shoppingListType.shoppingListTypeId}">--</option>
                         </#if>
                         <#list shoppingListTypes as shoppingListType>
-                          <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.description?default(shoppingListType.shoppingListTypeId)}</option>
+                          <option value="${shoppingListType.shoppingListTypeId}">${shoppingListType.get("description",locale)?default(shoppingListType.shoppingListTypeId)}</option>
                         </#list>
                       </select>
                     </td>
Index: party/webapp/partymgr/party/findMatches.ftl
===================================================================
--- party/webapp/partymgr/party/findMatches.ftl	(revision 7788)
+++ party/webapp/partymgr/party/findMatches.ftl	(working copy)
@@ -32,10 +32,10 @@
       <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
         <tr>
           <td valign="middle" align="left">
-            <div class="boxhead">Address Matches</div>
+            <div class="boxhead">${uiLabelMap.PageTitleAddressMatches}</div>
           </td>
           <td valign="middle" align="right">
-            <a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>" class="submenutextright">Match Map</a>
+            <a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>" class="submenutextright">${uiLabelMap.PageTitleAddressMatchMap}</a>
           </td>
         </tr>
       </table>
@@ -80,19 +80,19 @@
                   <option value="${currentStateGeo.geoId}">${currentStateGeo.geoName?default(currentStateGeo.geoId)}</option>
                   <option value="${currentStateGeo.geoId}">---</option>
                 </#if>
-                <option value="ANY">Any State/Province</option>
+                <option value="ANY">${uiLabelMap.CommonAny} ${uiLabelMap.CommonStateProvince}</option>
                 ${screens.render("component://common/widget/CommonScreens.xml#states")}
               </select>
             </td>
           </tr>
           <tr>
-            <td width="25%" align="right"><div class="tableheadtext">Postal Code :</div></td>
+            <td width="25%" align="right"><div class="tableheadtext">${uiLabelMap.PartyZipCode} :</div></td>
             <td width="5%">&nbsp;</td>
             <td><input type="text" class="inputBox" name="postalCode" value="${parameters.postalCode?if_exists}"/>*</td>
           </tr>
           <tr>
             <td colspan="2">&nbsp;</td>
-            <td><input type="submit" value="Find Matches" class="smallSubmit"></td>
+            <td><input type="submit" value="${uiLabelMap.PageTitleFindMatches}" class="smallSubmit"></td>
           </tr>
         </form>
         <tr><td colspan="5">&nbsp;</td></tr>
@@ -104,17 +104,17 @@
               <table border="0" cellspacing="5" cellpadding="5" width="100%">
                   <tr>
                     <td align="center" colspan="7">
-                      <div class="tabletext"><font color="blue"><b>Matching:</b> ${lastName} / ${firstName} @ ${addressString}</font></div>
+                      <div class="tabletext"><font color="blue"><b>${uiLabelMap.PartyAddressMatching}:</b> ${lastName} / ${firstName} @ ${addressString}</font></div>
                     </td>
                   </tr>
                   <tr>
-                    <td><div class="tableheadtext">Last Name</td>
-                    <td><div class="tableheadtext">First Name</td>
-                    <td><div class="tableheadtext">Address1</td>
-                    <td><div class="tableheadtext">Address2</td>
-                    <td><div class="tableheadtext">City</td>
-                    <td><div class="tableheadtext">Postal Code</td>
-                    <td><div class="tableheadtext">Party ID</td>
+                    <td><div class="tableheadtext">${uiLabelMap.PartyLastName}</td>
+                    <td><div class="tableheadtext">${uiLabelMap.PartyFirstName}</td>
+                    <td><div class="tableheadtext">${uiLabelMap.CommonAddress1}</td>
+                    <td><div class="tableheadtext">${uiLabelMap.CommonAddress2}</td>
+                    <td><div class="tableheadtext">${uiLabelMap.CommonCity}</td>
+                    <td><div class="tableheadtext">${uiLabelMap.PartyZipCode}</td>
+                    <td><div class="tableheadtext">${uiLabelMap.PartyPartyId}</td>
                   </tr>
                 <#if matches?has_content>
                   <#list matches as match>
@@ -137,7 +137,7 @@
                     </tr>
                   </#list>
                 <#else>
-                  <tr><td align="center" colspan="7"><div class="tabletext">No records match.</div></td></tr>
+                  <tr><td align="center" colspan="7"><div class="tabletext">${uiLabelMap.PartyNoMatch}</div></td></tr>
                 </#if>
               </table>
             </td>
Index: party/webapp/partymgr/party/linkparty.ftl
===================================================================
--- party/webapp/partymgr/party/linkparty.ftl	(revision 7788)
+++ party/webapp/partymgr/party/linkparty.ftl	(working copy)
@@ -39,7 +39,7 @@
       <table width="100%" border="0" cellspacing="0" cellpadding="0" class="boxtop">
         <tr>
           <td valign="middle" align="left">
-            <div class="boxhead">Link Party</div>
+            <div class="boxhead">${uiLabelMap.PartyLink}</div>
           </td>
         </tr>
       </table>
@@ -55,15 +55,14 @@
             <td colspan="2" align="center">
               <div class="head1">
                 <font color="red">
-                    WARNING: This cannot be un-done, confirm you wish to link the two
-                    party records listed below.
+                    ${uiLabelMap.PartyLinkMessage1}
                 </font>
               </div>
             </td>
           </tr>
           <tr><td colspan="2">&nbsp;</td></tr>
           <tr>
-            <td align="right"><span class="tabletext">&nbsp;Link Party:&nbsp;</span></td>
+            <td align="right"><span class="tabletext">&nbsp;${uiLabelMap.PartyLink}:&nbsp;</span></td>
             <td>
               <input type="hidden" name="partyId" value="${partyFrom.partyId}"/>
               <span class="tabletext">
@@ -72,14 +71,14 @@
                   <#elseif groupFrom?has_content>
                     ${groupFrom.groupName}
                   <#else>
-                    [Unknown]
+                    [${uiLabelMap.PartyUnknown}]
                   </#if>
                   &nbsp;<b>[${partyFrom.partyId}]</b>
               </span>
             </td>
           </tr>
           <tr>
-            <td align="right"><span class="tabletext">&nbsp;To:&nbsp;</span></td>
+            <td align="right"><span class="tabletext">&nbsp;${uiLabelMap.CommonTo}:&nbsp;</span></td>
             <td>
               <input type="hidden" name="partyIdTo" value="${partyTo.partyId}"/>
               <span class="tabletext">
@@ -88,7 +87,7 @@
                   <#elseif groupTo?has_content>
                     ${groupTo.groupName}
                   <#else>
-                    [Unknown]
+                    [${uiLabelMap.PartyUnknown}]
                   </#if>
                   &nbsp;<b>[${partyTo.partyId}]</b>
               </span>
@@ -97,19 +96,19 @@
           <tr><td colspan="2">&nbsp;</td></tr>
           <tr>
             <td colspan="2" align="center">
-              <a href="javascript:document.linkparty.submit()" class="buttontext">Confirm</a>&nbsp;&nbsp;
+              <a href="javascript:document.linkparty.submit()" class="buttontext">${uiLabelMap.CommonConfirm}</a>&nbsp;&nbsp;
             </td>
         </tr>
         </form>
         <#else>
           <form name="linkpartycnf" method="post" action="<@ofbizUrl>linkparty</@ofbizUrl>">
           <tr>
-            <td><span class="tabletext">&nbsp;Link Party:&nbsp;</span></td>
+            <td><span class="tabletext">&nbsp;${uiLabelMap.PartyLink}:&nbsp;</span></td>
             <td><input type="text" class="inputBox" name="partyId" value="${partyId?if_exists}"></td>
-            <td><span class="tabletext">&nbsp;To:&nbsp;</span></td>
+            <td><span class="tabletext">&nbsp;${uiLabelMap.CommonTo}:&nbsp;</span></td>
             <td><input type="text" class="inputBox" name="partyIdTo" value="${partyIdTo?if_exists}"></td>
             <td>
-              <a href="javascript:document.linkpartycnf.submit()" class="buttontext">Link</a>&nbsp;&nbsp;
+              <a href="javascript:document.linkpartycnf.submit()" class="buttontext">${uiLabelMap.CommonLink}</a>&nbsp;&nbsp;
             </td>
           </tr>
           </form>
Index: party/webapp/partymgr/party/viewprofile.ftl
===================================================================
--- party/webapp/partymgr/party/viewprofile.ftl	(revision 7788)
+++ party/webapp/partymgr/party/viewprofile.ftl	(working copy)
@@ -113,7 +113,7 @@
     </#if>
   </table>
 <#elseif lookupGroup?has_content>
-    <div class="tabletext">${lookupGroup.groupName} (${(lookupPartyType.description)?if_exists})</div>
+    <div class="tabletext">${lookupGroup.groupName} (${(lookupPartyType.get("description",locale))?if_exists})</div>
 <#else>
     <div class="tabletext">${uiLabelMap.PartyInformationNotFound}</div>
 </#if>
@@ -169,7 +169,7 @@
           <tr><td colspan="7"><hr class="sepbar"></td></tr>
           <tr>
             <td align="right" valign="top" width="10%">
-              <div class="tabletext">&nbsp;<b>${contactMechMap.contactMechType.description}</b></div>
+              <div class="tabletext">&nbsp;<b>${contactMechMap.contactMechType.get("description",locale)}</b></div>
             </td>
             <td width="5">&nbsp;</td>
             <td align="left" valign="top" width="80%">
@@ -177,7 +177,7 @@
                   <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
                     <div class="tabletext">
                       <#if contactMechPurposeType?has_content>
-                        <b>${contactMechPurposeType.description}</b>
+                        <b>${contactMechPurposeType.get("description",locale)}</b>
                       <#else>
                         <b>${uiLabelMap.PartyMechPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b>
                       </#if>
@@ -407,7 +407,7 @@
     </div>
     <div class="screenlet-body">
         <div class="tabletext">
-            <b>${uiLabelMap.PartyAvsString}:</b>&nbsp;${(avsOverride.avsDeclineString)?default("Global")}
+            <b>${uiLabelMap.PartyAvsString}:</b>&nbsp;${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")}
             <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
                 <a href="<@ofbizUrl>editAvsOverride?partyId=${party.partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
                 <#if avsOverride?exists>
Index: party/webapp/partymgr/party/viewroles.ftl
===================================================================
--- party/webapp/partymgr/party/viewroles.ftl	(revision 7788)
+++ party/webapp/partymgr/party/viewroles.ftl	(working copy)
@@ -52,7 +52,7 @@
               <tr>
                 <td align="right" valign="top" width="10%" nowrap><div class="tabletext"><b>${uiLabelMap.PartyRole}</b></div></td>
                 <td width="5">&nbsp;</td>
-                <td align="left" valign="top" width="70%"><div class="tabletext">${userRole.description} [${userRole.roleTypeId}]</div></td>
+                <td align="left" valign="top" width="70%"><div class="tabletext">${userRole.get("description",locale)} [${userRole.roleTypeId}]</div></td>
                 <#if hasDeletePermission>
                 <td align="right" valign="top" width="20%">
                   <a href="<@ofbizUrl>deleterole?partyId=${partyId}&roleTypeId=${userRole.roleTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>&nbsp;
@@ -83,7 +83,7 @@
           <td>
             <select name="roleTypeId" class="selectBox">
               <#list roles as role>
-                <option value="${role.roleTypeId}">${role.description}</option>
+                <option value="${role.roleTypeId}">${role.get("description",locale)}</option>
               </#list>
             </select>
           </td>
Index: party/widget/partymgr/CommunicationScreens.xml
===================================================================
--- party/widget/partymgr/CommunicationScreens.xml	(revision 7788)
+++ party/widget/partymgr/CommunicationScreens.xml	(working copy)
@@ -566,13 +566,13 @@
                                 <if-has-permission action="_VIEW" permission="PARTYMGR"/>
                             </condition>
                             <widgets>
-                                <container><label style="head1" text="${uiLabelMap.CommContent}"/></container>
+                                <container><label style="head1" text="${uiLabelMap.PartyCommContent}"/></container>
                                 <section>
                                     <condition>
                                         <if-compare field-name="okayToUpdate" operator="equals" type="Boolean" value="true"/>
                                     </condition>
                                     <widgets>
-                                        <container><link style="buttontext" target="AddCommContent?communicationEventId=${communicationEventId}&amp;partyId=${partyId}" text="${uiLabelMap.AddCommContent}"/></container>
+                                        <container><link style="buttontext" target="AddCommContent?communicationEventId=${communicationEventId}&amp;partyId=${partyId}" text="${uiLabelMap.PartyAddCommContent}"/></container>
                                     </widgets>
                                 </section>
                                 <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/>
@@ -655,7 +655,7 @@
                                         <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
                                     </widgets>
                                 </section>
-                                <container><label style="head1" text="${uiLabelMap.EditCommContent}"/></container>
+                                <container><label style="head1" text="${uiLabelMap.PageTitleEditCommContent}"/></container>
                                 <!--
                                 <container><label style="head1" text="parameters: ${parameters}"/></container>
                                 <container><label style="head1" text="commEventContentDataResource: ${commEventContentDataResource}"/></container>
@@ -682,7 +682,7 @@
                                     </condition>
                                     <widgets>
                                         <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="uploadCommContent"/>
-                                        <label text="View Image" style="head1"/>
+                                        <label text="${uiLabelMap.PartyViewImage}" style="head1"/>
                                         <content dataresource-id="${commEventContentDataResource.drDataResourceId}"/>
                                     </widgets>
                                 </section>
Index: party/widget/partymgr/PartyContactListScreens.xml
===================================================================
--- party/widget/partymgr/PartyContactListScreens.xml	(revision 7788)
+++ party/widget/partymgr/PartyContactListScreens.xml	(working copy)
@@ -58,10 +58,10 @@
    <screen name="ListLookupContactList">
         <section>
             <actions>
-                <set field="titleProperty" value="PageTitleListContactList"/>
+				<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="tabButtonItem" value="ContactList"/>
-                <set field="labelTitleProperty" value="PageTitleListContactList"/>
-                <set field="title" value="ContactList Lookup"/>
+                <set field="labelTitleProperty" value="${uiLabelMap.PageTitleListContactList}"/>
+                <set field="title" value="${uiLabelMap.PageTitleListContactList}"/>
 
                 <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/>
                 <set field="contactListId" from-field="parameters.contactListId"/>
@@ -70,7 +70,7 @@
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <container><label style="head1">${uiLabelMap.PartyContactList}</label></container>
+                        <container><label style="head1">${uiLabelMap.PageTitleListContactList}</label></container>
                         <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListLookupContactList"/>
                     </decorator-section>
                 </decorator-screen>
Index: party/widget/partymgr/PartyMenus.xml
===================================================================
--- party/widget/partymgr/PartyMenus.xml	(revision 7788)
+++ party/widget/partymgr/PartyMenus.xml	(working copy)
@@ -32,7 +32,7 @@
         <menu-item name="viewroles" title="${uiLabelMap.PartyRoles}">
             <link target="viewroles?partyId=${partyId}"/>
         </menu-item>
-        <menu-item name="linkparty" title="Link Party">
+        <menu-item name="linkparty" title="${uiLabelMap.PartyLink}">
             <link target="linkparty?partyId=${partyId}"/>
         </menu-item>
         <menu-item name="EditPartyRelationships" title="${uiLabelMap.PartyRelationships}">
Index: party/widget/partymgr/PartyScreens.xml
===================================================================
--- party/widget/partymgr/PartyScreens.xml	(revision 7788)
+++ party/widget/partymgr/PartyScreens.xml	(working copy)
@@ -109,7 +109,7 @@
     <screen name="linkparty">
         <section>
             <actions>
-                <set field="title" value="Link Party"/>
+                <set field="titleProperty" value="PartyLink"/>
                 <set field="headerItem" value="link"/>
                 <set field="tabButtonItem" value="linkparty"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.bsh"/>
Index: product/config/ProductEntityLabels.properties
===================================================================
--- product/config/ProductEntityLabels.properties	(revision 7788)
+++ product/config/ProductEntityLabels.properties	(working copy)
@@ -190,3 +190,35 @@
 ProdConfItemContentType.description.DESCRIPTION=Description
 ProdConfItemContentType.description.LONG_DESCRIPTION=Description - Long
 ProdConfItemContentType.description.INSTRUCTIONS=Instructions
+
+FacilityType.description.BUILDING=Building
+FacilityType.description.FLOOR=Floor
+FacilityType.description.OFFICE=Office
+FacilityType.description.CALL_CENTER=Call Center
+FacilityType.description.PLANT=Plant
+FacilityType.description.ROOM=Room
+FacilityType.description.RETAIL_STORE=Retail Store
+FacilityType.description.WAREHOUSE=Warehouse
+
+VarianceReason.description.VAR_LOST=Lost
+VarianceReason.description.VAR_STOLEN=Stolen
+VarianceReason.description.VAR_FOUND=Found
+VarianceReason.description.VAR_DAMAGED=Damaged
+VarianceReason.description.VAR_INTEGR=Integration
+VarianceReason.description.VAR_SAMPLE=Sample (Giveaway)
+
+RejectionReason.description.SRJ_DAMAGED=Damaged
+RejectionReason.description.SRJ_NOT_ORDERED=Not Ordered
+RejectionReason.description.SRJ_OVER_SHIPPED=Over Shipped
+
+ShipmentType.description.INCOMING_SHIPMENT=Incoming
+ShipmentType.description.OUTGOING_SHIPMENT=Outgoing
+ShipmentType.description.SALES_RETURN=Sales Return
+ShipmentType.description.SALES_SHIPMENT=Sales Shipment
+ShipmentType.description.PURCHASE_SHIPMENT=Purchase Shipment
+ShipmentType.description.PURCHASE_RETURN=Purchase Return
+ShipmentType.description.DROP_SHIPMENT=Drop Shipment
+ShipmentType.description.TRANSFER=Transfer
+
+FacilityGroupType.description.MGMT_STRUCTURE=Management Structure
+FacilityGroupType.description.PRICING_GROUP=Pricing Group
\ No newline at end of file
Index: product/config/ProductEntityLabels_it.properties
===================================================================
--- product/config/ProductEntityLabels_it.properties	(revision 7788)
+++ product/config/ProductEntityLabels_it.properties	(working copy)
@@ -190,3 +190,35 @@
 ProdConfItemContentType.description.DESCRIPTION=Descrizione
 ProdConfItemContentType.description.LONG_DESCRIPTION=Descrizione - Lunga
 ProdConfItemContentType.description.INSTRUCTIONS=Istruzioni
+
+FacilityType.description.BUILDING=Palazzo
+FacilityType.description.FLOOR=Piano
+FacilityType.description.OFFICE=Ufficio
+FacilityType.description.CALL_CENTER=Call Center
+FacilityType.description.PLANT=Fabbrica
+FacilityType.description.ROOM=Stanza
+FacilityType.description.RETAIL_STORE=Negozio al Dettagio
+FacilityType.description.WAREHOUSE=Magazzino
+
+VarianceReason.description.VAR_LOST=Perso
+VarianceReason.description.VAR_STOLEN=Rubato
+VarianceReason.description.VAR_FOUND=Trovato
+VarianceReason.description.VAR_DAMAGED=Danneggiato
+VarianceReason.description.VAR_INTEGR=Integrazione
+VarianceReason.description.VAR_SAMPLE=Campione (Dato via)
+
+RejectionReason.description.SRJ_DAMAGED=Danneggiato
+RejectionReason.description.SRJ_NOT_ORDERED=Non Ordinato
+RejectionReason.description.SRJ_OVER_SHIPPED=Sovra Spedito
+
+ShipmentType.description.INCOMING_SHIPMENT=Ingresso
+ShipmentType.description.OUTGOING_SHIPMENT=Uscita
+ShipmentType.description.SALES_RETURN=Reso di Vendita
+ShipmentType.description.SALES_SHIPMENT=Spedizione di Vendita
+ShipmentType.description.PURCHASE_SHIPMENT=Spedizione di Acquisto
+ShipmentType.description.PURCHASE_RETURN=Reso di Acquisto
+ShipmentType.description.DROP_SHIPMENT=Drop Shipment
+ShipmentType.description.TRANSFER=Trasferimento
+
+FacilityGroupType.description.MGMT_STRUCTURE=Gestione Struttura
+FacilityGroupType.description.PRICING_GROUP=Gruppo Prezzo
\ No newline at end of file
Index: product/config/ProductUiLabels.properties
===================================================================
--- product/config/ProductUiLabels.properties	(revision 7788)
+++ product/config/ProductUiLabels.properties	(working copy)
@@ -140,6 +140,7 @@
 PageTitleEditProductStoreWebSites=Edit Product Store Web Sites
 PageTitleEditShipmentItems=Edit Shipment Items
 PageTitleEditShipmentPackages=Edit Shipment Packages
+PageTitleEditShipmentPlan=Edit Shipment Plan
 PageTitleEditShipmentRouteSegments=Edit Shipment Route Segments
 PageTitleEditSupplierProduct=Edit Supplier Product
 PageTitleFindConfigItems=Find Config Items
@@ -400,6 +401,7 @@
 ProductCouldNotFindProductPromotion=Could not find Product Promotion with ID
 ProductCouldNotFindProductCatalogWithId=Could not Find Product Catalog with Id
 ProductCouldNotFindProductConfigItemWithId=Could not find Config Item with ID
+ProductCouldNotFindProductShipmentWithId=Could not find Shipment with ID
 ProductCountry=Country
 ProductCreateAProductFeatureCategory=Create a Product Feature Category
 ProductCreateInformationNewSupplier=Create information for new supplier
@@ -757,6 +759,7 @@
 ProductNoFacility=no Facility
 ProductNoFileSpecifiedForUpload=No file specified for Upload
 ProductNoInventoryFoundToPick=No Inventory found to pick
+ProductNoInventoryReservation=No Inventory Reservation Information Available
 ProductNoItemsLeft=there should be no items left to issue from this order
 ProductNoItemsPo=No Items in PO
 ProductNoItemsPoReceive=There are no items in the PO to receive
@@ -790,6 +793,7 @@
 ProductNotModificationRecreatingProductCatalog=This cannot be changed without re-creating the Product Catalog
 ProductNotModificationRecreatingProductStore=This cannot be changed without re-creating the Product Store
 ProductNotModificationRecreatingProductConfigItems=This cannot be changed without re-creating the Config Item
+ProductNotModificationRecreatingProductShipment=This cannot be changed without re-creating the Shipment
 ProductNotOriginFacility=Not In Origin Facility
 ProductNotPurchaseShipment=but this is NOT a Purchase Shipment
 ProductNotSalesShipment=but this is NOT a Sales Shipment
@@ -865,6 +869,7 @@
 ProductPhysicalInventoryVariances=Physical Inventory Variances
 ProductPick=Pick
 ProductPickFirst=Pick first
+ProductPickList=Picklist
 ProductPickPackWarnings=Pick Pack Warnings
 ProductPickStarted=Pick started
 ProductPicking=Picking
@@ -970,7 +975,10 @@
 ProductQuantityAccepted=Quantity Accepted
 ProductQuantityIncluded=Quantity Included
 ProductQuantityNotSet=Quantity Not Set
+ProductQuantityRequested=Quantity Requested
 ProductQuantityRejected=Quantity Rejected
+ProductQuantityShipped=Quantity Shipped
+ProductQuantityToBin=Quantity To Bin
 ProductQuantityToTransfer=Quantity To Transfer
 ProductQuantityUomId=Quantity UomId
 ProductQuestion=Question
@@ -1101,10 +1109,13 @@
 ProductShipmentNotFoundId=The Shipment was not found with ID
 ProductShipmentPlan=Shipment Plan
 ProductShipmentPlanToOrderItems=Shipment Plan --> Order Items
+ProductShipmentTotalWeight=Total Weight
+ProductShipmentTotalVolume=Total Volume
 ProductShipmentType=Shipment Type
 ProductShipmentTypeId=Shipment type Id
 ProductShipments=Shipments
 ProductShipmentsFound=Shipments Found
+ProductShippingAddress=Shipping Address
 ProductShippingLabel=Shipping Label
 ProductShipToAddress=Ship-To Address
 ProductShortDescription=Short Description
@@ -1553,3 +1564,10 @@
 FormFieldTitle_facilityId=Facility Id
 FormFieldTitle_facilityName=Facility Name
 FormFieldTitle_facilityTypeId=Facility Type Id
+FormFieldTitle_physicalInventoryId=Physical Inventory Id
+FormFieldTitle_physicalInventoryDate=Physical Inventory Date
+FormFieldTitle_generalComments=General Comments
+FormFieldTitle_manufacturerPartyId=Manufacturer Party Id
+FormFieldTitle_serialNumber=Serial Number
+FormFieldTitle_inventoryItemId=Inventory Item Id
+FormFieldTitle_productId=Product Id
\ No newline at end of file
Index: product/config/ProductUiLabels_it.properties
===================================================================
--- product/config/ProductUiLabels_it.properties	(revision 7788)
+++ product/config/ProductUiLabels_it.properties	(working copy)
@@ -18,7 +18,7 @@
 ####
 # OFBiz UiLabel Properties used for the product component
 
-AccountingBillingAcc=Conto Fatturazione
+AccountingBillingAcc=Contabilit\u00e0 Fatture
 AccountingFixedAsset=Cespite
 AccountingFixedAssetId=Codice Cespite
 AccountingFixedAssetNew=Nuovo cespite
@@ -135,6 +135,7 @@
 PageTitleEditProductStoreWebSites=Aggiorna Siti Web Negozio
 PageTitleEditShipmentItems=Aggiorna Righe Spedizione
 PageTitleEditShipmentPackages=Aggiorna Pacchi Spedizione
+PageTitleEditShipmentPlan=Aggiorna Piano di Spedizione
 PageTitleEditShipmentRouteSegments=Aggiorna Segmenti Percorsi Spedizioni
 PageTitleEditSupplierProduct=Aggiorna Fornitori Prodotto
 PageTitleFindConfigItems=Ricerca Righe Configurazione
@@ -177,6 +178,7 @@
 PartyAttentionName=Attenzione Di
 PartyCity=Citt\u00e0
 PartyCompanyId=Soggeto Azienda
+PartyCompanyId=Soggeto Azienda
 PartyContactInfoNotBelongToYou=Le informazioni di contatto specificate non corrispondano a te, tu potresti non visualizzarli o modificarli
 PartyContactMechs=Contatto
 PartyContactNumber=Numero Contatto
@@ -197,7 +199,7 @@
 PartyRole=Ruolo
 PartyRoleFor=Ruoli per
 PartyRoleType=Tipo Ruolo
-PartyRoleTypeId=Codice Tipo Ruolo
+PartyRoleTypeId=Tipo Ruolo
 PartyRoles=Ruoli
 PartySelectContactType=Selezione Tipo Contatto
 PartyState=Stato/Provincia
@@ -291,9 +293,9 @@
 ProductAssetUsage=Uso Cespite
 ProductAssignPicker=Assegna Prelevatore
 ProductAssociatePartyToCategory=Associare Soggetto alla Categoria (inserire Codice Soggetto, seleziona Tipo, allora inserire opzionalmente Da Data)
-ProductAssociationNotFound=Associazione non trovata: Codice Prodotto =${productId?if_exists}, Codice Prodotto A=${productIdTo?if_exists}, Codice Tipo Associazione=${productAssocTypeId?if_exists}, Da Data=${fromDate?if_exists}
+ProductAssociationNotFound=Associazione non trovata: Codice Prodotto =${productId?if_exists}, Codice Prodotto A=${productIdTo?if_exists}, Tipo Associazione=${productAssocTypeId?if_exists}, Da Data=${fromDate?if_exists}
 ProductAssociationType=Tipo Associazione
-ProductAssociationTypeId=Codice Tipo Associazione
+ProductAssociationTypeId=Tipo Associazione
 ProductAssociations=Associazioni
 ProductAssociationsFromProduct=Associazioni DA questo Prodotto a
 ProductAssociationsToProduct=Associazioni A questo Prodotto da
@@ -395,6 +397,7 @@
 ProductCouldNotFindProductPromotion=Non Trovata Promozione Prodotto con Codice
 ProductCouldNotFindProductCatalogWithId=Non Trovata Catalogo Prodotti con Codice
 ProductCouldNotFindProductConfigItemWithId=Non Trovata Riga Configurazione con Codice
+ProductCouldNotFindProductShipmentWithId=Non Trovata Spedizione con Numero
 ProductCountry=Paese
 ProductCreateAProductFeatureCategory=Creare una Categoria Caratteristica Prodotto
 ProductCreateInformationNewSupplier=Creare informazione per un nuovo fornitore
@@ -423,8 +426,8 @@
 ProductCreatedByUserLogin=Creato Da Utente
 ProductCreatedDate=Data Creazione
 ProductCurrency=Valuta
-ProductCurrencyUom=Tipo Valuta
-ProductCurrencyUomId=Tipo Valuta
+ProductCurrencyUom=Valuta
+ProductCurrencyUomId=Valuta
 ProductCustomerRating=Classifica Soggetto
 ProductDateFilter=Data Filtro
 ProductDateReceived=Data Ricezione
@@ -522,7 +525,7 @@
 ProductFacilityOwner=Proprietario
 ProductFacilityRoleMemberMaintenance=Manutenzione Membri Ruoli Stabilimento
 ProductFacilityType=Tipo Stabilimento
-ProductFacilityTypeId=Codice Tipo Stabilimento
+ProductFacilityTypeId=Tipo Stabilimento
 ProductFacilityViewPermissionError=Tu non hai l'autorizzazione per vedere questa pagina. (Permesso "FACILITY_VIEW" o "FACILITY_ADMIN" necessario)
 ProductFacilityDefaultWeightUnit=Unit\u00e0 per Pesi di Default
 ProductFastLoadCatalogIntoCache=Caricamento Veloce Catalogo nella Cache
@@ -566,6 +569,7 @@
 ProductGlAccount=Conto Contabilit\u00e0 Generale
 ProductGlAccounts=Conti Contabilit\u00e0 Generale
 ProductGlobal=Globale
+ProductGlobal=Globale
 ProductGlobalPriceRule=Regola Globale Prezzi
 ProductGlobalPriceRules=Regole Globali Prezzi
 ProductGoToFeatureCategory=Vai alle Categoria Caratteristiche
@@ -599,6 +603,15 @@
 ProductIncludeFeatureMessage=Visualizzato solo se tutte le righe hanno tutte le caratteristiche in questo gruppo
 ProductIncludeFeature=Includi Gruppo Caratteristica
 ProductIncFeature=Inc Car.
+ProductIncludeFreeshipMessage=Impostato ad N per nascondere il carrrello quando contiene SOLO righe spedizioni gratuite
+ProductIncFreeship=Inc Sped Grat
+ProductIncludeFreeship=Includi Righe Spedizione Gratuita
+ProductIncludeGeoMessage=Visualizzato solo se spedizione destinazione è in questa geografia
+ProductIncludeGeo=Includi Geo
+ProductIncGeo=Inc Geo
+ProductIncludeFeatureMessage=Visualizzato solo se tutte le righe hanno tutte le caratteristiche in questo gruppo
+ProductIncludeFeature=Includi Gruppo Caratteristica
+ProductIncFeature=Inc Car.
 ProductIncludePromotions=Includi Nelle Promozioni
 ProductIncludeSubCategories=Includi Sotto-Categorie
 ProductIncomingProductionRuns=Esegui Produzione in Arrivo
@@ -615,7 +628,7 @@
 ProductInventoryItem=Riga Inventario
 ProductInventoryItemId=Numero Riga Inventario
 ProductInventoryItemType=Tipo Riga Inventario
-ProductInventoryItemTypeId=Codice Tipo Riga Inventario
+ProductInventoryItemTypeId=Tipo Riga Inventario
 ProductInventoryItems=Righe Inventario
 ProductInventoryItemsFor=Righe Inventario per
 ProductInventoryItemsToPick=Righe Inventario da Prelevare
@@ -752,6 +765,7 @@
 ProductNoFacility=nessuna Stabilimento
 ProductNoFileSpecifiedForUpload=Nessun file specificato da Caricare
 ProductNoInventoryFoundToPick=Nessun Inventario trovato da prelevare
+ProductNoInventoryReservation=Nessuna Informazione Disponibile sulla Riservazione di Inventario
 ProductNoItemsLeft=non ci dovrebbero essere righe lasciate a prelievi per questo ordine
 ProductNoItemsPo=Nessuna Riga nel OA
 ProductNoItemsPoReceive=Non ci sono righe nel OA da ricevere
@@ -785,6 +799,7 @@
 ProductNotModificationRecreatingProductCatalog=Questo non pu\u00f2 essere cambiata senza ri-creare il Catalogo Prodotti
 ProductNotModificationRecreatingProductStore=Questo non pu\u00f2 essere cambiata senza ri-creare il Negozio Prodotti
 ProductNotModificationRecreatingProductConfigItems=Questo non pu\u00f2 essere cambiata senza ri-creare la Riga Configurazione
+ProductNotModificationRecreatingProductShipment=Questo non pu\u00f2 essere cambiata senza ri-creare la Spedizione
 ProductNotOriginFacility=Non In Origine Stabilimento
 ProductNotPurchaseShipment=ma questo NON \u00e8 una Spedizione di un'Acquisto
 ProductNotSalesShipment=ma questo NON \u00e8 una Spedizione di una Vendita
@@ -825,8 +840,8 @@
 ProductOriginDestinationAddressId=Indirizzo Origine-Destinazione
 ProductOriginDestinationFacility=Stabilimento Origine-Destinazione
 ProductOriginDestinationPhoneId=Numero Telefono Origine-Destinazione
-ProductOriginFacility=Origine Stabilimento
-ProductOriginFacilityIs=Origine Stabilimento \u00e8
+ProductOriginFacility=Stabilimento Origine
+ProductOriginFacilityIs=Stabilimento Origine \u00e8
 ProductOriginPhoneNumberId=Numero Telefono Origine
 ProductOriginPostalAddressId=Indirizzo Postale Origine
 ProductOutstandingPurchaseOrders=Ordini Acquisto Inevasi
@@ -860,6 +875,7 @@
 ProductPhysicalInventoryVariances=Varianza Inventario Fisico
 ProductPick=Prelievo
 ProductPickFirst=Prima Preleva
+ProductPickList=N.Lista di Prelievo
 ProductPickPackWarnings=Avvertimenti Prelievo Pacco
 ProductPickStarted=Prelievo Iniziato
 ProductPicking=Prelievo
@@ -965,7 +981,10 @@
 ProductQuantityAccepted=Quantit\u00e0 Accettata
 ProductQuantityIncluded=Quantit\u00e0 Inclusa
 ProductQuantityNotSet=Quantit\u00e0 Non Impostata
+ProductQuantityRequested=Quantit\u00e0 Richiesta
 ProductQuantityRejected=Quantit\u00e0 Scartata
+ProductQuantityShipped=Quantit\u00e0 Spedita
+ProductQuantityToBin=Quantit\u00e0 Da Cestinare
 ProductQuantityToTransfer=Quantit\u00e0 Da Trasferire
 ProductQuantityUomId=Udm Quantit\u00e0
 ProductQuestion=Domanda
@@ -1096,10 +1115,13 @@
 ProductShipmentNotFoundId=La Spedizione non \u00e8 stata trovata con Codice
 ProductShipmentPlan=Piano di Spedizione
 ProductShipmentPlanToOrderItems=Piano di Spedizione --> Righe Ordine
+ProductShipmentTotalWeight=Totale Peso
+ProductShipmentTotalVolume=Totale Volume
 ProductShipmentType=Tipo Spedizione
-ProductShipmentTypeId=Codice Tipo Spedizione
+ProductShipmentTypeId=Tipo Spedizione
 ProductShipments=Spedizioni
 ProductShipmentsFound=Spedizioni Trovate
+ProductShippingAddress=Indirizzo di Spedizione
 ProductShippingLabel=Etichetta Spedizione
 ProductShipToAddress=Spedizione All'Indirizzo
 ProductShortDescription=Descrizione Breve
@@ -1142,7 +1164,7 @@
 ProductSupplierPrefOrderId=Codice Fornitore preferito ordine
 ProductSupplierProductId=Codice prodotto Fornitore
 ProductSupplierProductName=Nome prodotto Fornitore
-ProductSupplierRatingTypeId=Codice tipo classifica Prodotto Fornitore
+ProductSupplierRatingTypeId=Tipo classifica Prodotto Fornitore
 ProductSupplierSpecificFeatureInformation=Informazione Caratteristica Specifica Fornitore
 ProductSupplier=Fornitore
 ProductSuppliers=Fornitori
@@ -1259,7 +1281,7 @@
 productSearchEvents.error_casting_types=Errore di casting tipi dato
 productSearchEvents.error_getting_results=Errore nella ricerca risultati
 productSearchEvents.removed_param_features=Cancellato(i) ${numRemoved} caratteristiche con Codice ${productFeatureId}
-productevents.association_type_ID_missing=Codice Tipo Associazione \u00e8 mancante.
+productevents.association_type_ID_missing=Tipo Associazione \u00e8 mancante.
 productevents.attribute_name_missing=Nome Attributo \u00e8 mancante.
 productevents.could_not_create_attribute_write=Non \u00e8 possibile creare l'attributo (errore scrittura).
 productevents.could_not_create_keywords_write=Non \u00e8 possibile creare le chiavi (errore scrittura).
@@ -1431,7 +1453,7 @@
 FormFieldTitle_dataResourceId=Codice Risorsa Dati
 FormFieldTitle_templateDataResourceId=Template Codice Risorsa Dati
 FormFieldTitle_dataSourceId=Codice Sorgente Dati
-FormFieldTitle_privilegeEnumId=Codice Tipo Privilegio
+FormFieldTitle_privilegeEnumId=Tipo Privilegio
 FormFieldTitle_serviceName=Nome Servizio
 FormFieldTitle_contentName=Nome Contenuto
 FormFieldTitle_localeString=Stringa Locale
@@ -1441,8 +1463,8 @@
 FormFieldTitle_createdByUserLogin=Creato Dall'Utente
 FormFieldTitle_lastModifiedDate=Data Ultima Modifica
 FormFieldTitle_lastModifiedByUserLogin=Ultima Modifica Dell'Utente
-FormFieldTitle_dataResourceTypeId=Codice Tipo Risorsa Dati
-FormFieldTitle_dataTemplateTypeId=Codice Tipo Template Dati
+FormFieldTitle_dataResourceTypeId=Tipo Risorsa Dati
+FormFieldTitle_dataTemplateTypeId=Tipo Template Dati
 FormFieldTitle_dataCategoryId=Codice Categoria Dati
 FormFieldTitle_dataResourceName=Nome Risorsa Dati
 FormFieldTitle_objectInfo=Oggetto Informazioni
@@ -1501,7 +1523,7 @@
 FormFieldTitle_availableToPromiseVar=Varianza Disponibilit\u00e0 Da Promettere
 FormFieldTitle_quantityOnHandVar=Varianza Quantit\u00e0 Disponibile
 FormFieldTitle_itemComments=Commenti Riga
-FormFieldTitle_varianceReasonId=Codice Motivazione Varianza			   
+FormFieldTitle_varianceReasonId=Motivazione Varianza			   
 FormFieldTitle_partyId=Codice Soggetto
 FormFieldTitle_selectedAmount=Importo Selezionato
 FormFieldTitle_isPromo=E' una Promozione
@@ -1548,3 +1570,31 @@
 FormFieldTitle_facilityId=Codice Stabilimento
 FormFieldTitle_facilityName=Nome Stabilimento
 FormFieldTitle_facilityTypeId=Tipo Stabilimento
+FormFieldTitle_useDaysLimit=Usa Limite Giorni
+FormFieldTitle_productContentTypeId=Tipo Contenuto Prodotto
+FormFieldTitle_estimateCalcMethod=Metodo Calcolo Stimato
+FormFieldTitle_comments=Commenti
+FormFieldTitle_productMaintTypeId=Tipo Manutenzione Prodotto
+FormFieldTitle_maintName=Nome Manutenzione
+FormFieldTitle_intervalQuantity=Quantità Intervallo
+FormFieldTitle_intervalMeterTypeId=Tipo Contatore Intervallo
+FormFieldTitle_repeatCount=Ripeti Conteggio
+FormFieldTitle_intervalUomId=Udm Intervallo
+FormFieldTitle_meterUomId=Udm Contatore
+FormFieldTitle_meterName=Nome Contatore
+FormFieldTitle_productMeterTypeId=Tipo Contatore Prodotto
+FormFieldTitle_sequenceNum=Num.Sequenza
+FormFieldTitle_configTypeId=Tipo Configurazione
+FormFieldTitle_isMandatory=E' Obbligatorio
+FormFieldTitle_productPromoCodeId=Codice Promozione Prodotto
+FormFieldTitle_userEntered=Inserito dall'Utente
+FormFieldTitle_requireEmailOrParty=Richiesta Email O Soggetto
+FormFieldTitle_targetTypeEnumId=Tipo Destinazione
+FormFieldTitle_target=Destinazione
+FormFieldTitle_physicalInventoryId=Numero Inventario Fisico
+FormFieldTitle_physicalInventoryDate=Data Inventario Fisico
+FormFieldTitle_generalComments=Commenti Generali
+FormFieldTitle_manufacturerPartyId=Codice Soggetto Produttore
+FormFieldTitle_serialNumber=Numero di Serie
+FormFieldTitle_inventoryItemId=Numero Riga Inventario
+FormFieldTitle_productId=Codice Prodotto
\ No newline at end of file
Index: product/webapp/facility/facility/Picklist.fo.ftl
===================================================================
--- product/webapp/facility/facility/Picklist.fo.ftl	(revision 7788)
+++ product/webapp/facility/facility/Picklist.fo.ftl	(working copy)
@@ -52,7 +52,7 @@
         </fo:table-cell>
         <fo:table-cell padding="2pt" background-color="${rowColor}">
             <#list picklistBinInfoList as picklistBinInfo>
-                <fo:block>${picklistBinInfo.quantity} to #${picklistBinInfo.picklistBin.binLocationNumber}</fo:block>
+                <fo:block>${picklistBinInfo.quantity} ${uiLabelMap.CommonTo} #${picklistBinInfo.picklistBin.binLocationNumber}</fo:block>
             </#list>
         </fo:table-cell>
     </fo:table-row>
@@ -130,9 +130,9 @@
     <#if security.hasEntityPermission("FACILITY", "_VIEW", session)>
 
     <#if picklistInfo?has_content>
-        <fo:block font-size="12pt">Picklist ${picklistInfo.picklist.picklistId} in Facility ${picklistInfo.facility.facilityName} <fo:inline font-size="8pt">[${picklistInfo.facility.facilityId}]</fo:inline></fo:block>
+        <fo:block font-size="12pt">${uiLabelMap.ProductPickList} ${picklistInfo.picklist.picklistId} ${uiLabelMap.CommonIn} ${uiLabelMap.ProductFacility} ${picklistInfo.facility.facilityName} <fo:inline font-size="8pt">[${picklistInfo.facility.facilityId}]</fo:inline></fo:block>
         <#if picklistInfo.shipmentMethodType?has_content>
-            <fo:block font-size="10pt">for Shipment Method Type ${picklistInfo.shipmentMethodType.description?default(picklistInfo.shipmentMethodType.shipmentMethodTypeId)}</fo:block>
+            <fo:block font-size="10pt">${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentMethodType} ${picklistInfo.shipmentMethodType.description?default(picklistInfo.shipmentMethodType.shipmentMethodTypeId)}</fo:block>
         </#if>
         <fo:block><fo:leader/></fo:block>
     </#if>
@@ -148,7 +148,7 @@
                 <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductLocation}</fo:block></fo:table-cell>
                 <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProductId}</fo:block></fo:table-cell>
                 <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductToPick}</fo:block></fo:table-cell>
-                <fo:table-cell border-bottom="thin solid grey"><fo:block>Quantity to Bin#</fo:block></fo:table-cell>
+                <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductQuantityToBin}#</fo:block></fo:table-cell>
 
               <#-- Not display details here, just the summary info for the bins
                 <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.OrderOrderItems}</fo:block></fo:table-cell>
@@ -214,7 +214,7 @@
             </fo:block>
             <fo:block><fo:leader/></fo:block>
 
-            <fo:block font-size="14pt">Bin ${picklistBin.binLocationNumber} to Pack, Order ID: ${picklistBinInfo.primaryOrderHeader.orderId}, Ship Group ID: ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</fo:block>
+            <fo:block font-size="14pt">${uiLabelMap.ProductBinNumber} ${picklistBin.binLocationNumber} ${uiLabelMap.ProductToPack}, ${uiLabelMap.ProductOrderId}: ${picklistBinInfo.primaryOrderHeader.orderId}, ${uiLabelMap.ProductOrderShipGroupId}: ${picklistBinInfo.primaryOrderItemShipGroup.shipGroupSeqId}</fo:block>
             <fo:block><fo:leader/></fo:block>
 
             <fo:block space-after.optimum="10pt" font-size="10pt">
@@ -255,7 +255,7 @@
                                 <#if orderItemShipGrpInvRes?has_content>
                                     <fo:block>${orderItemShipGrpInvRes.inventoryItemId}:${orderItemShipGrpInvRes.quantity}:${orderItemShipGrpInvRes.quantityNotAvailable?if_exists}</fo:block>
                                 <#else>
-                                    <fo:block>No Inventory Reservation Information Available</fo:block>
+                                    <fo:block>${uiLabelMap.ProductNoInventoryReservation}</fo:block>
                                 </#if>
                             </fo:table-cell>
                         </fo:table-row>
Index: product/webapp/facility/facility/PicklistManage.ftl
===================================================================
--- product/webapp/facility/facility/PicklistManage.ftl	(revision 7788)
+++ product/webapp/facility/facility/PicklistManage.ftl	(working copy)
@@ -40,8 +40,8 @@
 
                 <#-- Picklist -->
                 <div class="tabletext">
-                    <b>Picklist</b> <span class="head2">${picklist.picklistId}</span>
-                    <b>date</b> ${picklist.picklistDate}
+                    <b>${uiLabelMap.ProductPickList}</b> <span class="head2">${picklist.picklistId}</span>
+                    <b>${uiLabelMap.CommonDate}</b> ${picklist.picklistDate}
                     <form method="post" action="<@ofbizUrl>updatePicklist</@ofbizUrl>" style="display: inline;">
                         <input type="hidden" name="facilityId" value="${facilityId}"/>
                         <input type="hidden" name="picklistId" value="${picklist.picklistId}"/>
@@ -49,12 +49,12 @@
                             <option value="${picklistInfo.statusItem.statusId}" selected>${picklistInfo.statusItem.get("description",locale)}</option>
                             <option value="${picklistInfo.statusItem.statusId}">---</option>
                             <#list picklistInfo.statusValidChangeToDetailList as statusValidChangeToDetail>
-                                <option value="${statusValidChangeToDetail.statusIdTo}">${statusValidChangeToDetail.description} (${statusValidChangeToDetail.transitionName})</option>
+                                <option value="${statusValidChangeToDetail.statusIdTo}">${statusValidChangeToDetail.get("description",locale)} (${statusValidChangeToDetail.transitionName})</option>
                             </#list>
                         </select>
                         <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
                     </form>
-                    <b>created/modified by</b> ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin}
+                    <b>${uiLabelMap.ProductCreatedByUserLogin}/${uiLabelMap.ProductLastModifiedByUserLogin}</b> ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin}
                     <a href="<@ofbizUrl>PicklistReport.pdf?picklistId=${picklist.picklistId}</@ofbizUrl>" target="_blank" class="buttontext">[${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking} ${uiLabelMap.CommonReports}]</a>
                 </div>
                 <#if picklistInfo.shipmentMethodType?has_content>
@@ -67,9 +67,9 @@
                 <#list picklistInfo.picklistRoleInfoList?if_exists as picklistRoleInfo>
                     <div class="tabletext" style="margin-left: 15px;">
                         <b>${uiLabelMap.PartyParty}</b> ${picklistRoleInfo.partyNameView.firstName?if_exists} ${picklistRoleInfo.partyNameView.middleName?if_exists} ${picklistRoleInfo.partyNameView.lastName?if_exists} ${picklistRoleInfo.partyNameView.groupName?if_exists}
-                        <b>${uiLabelMap.PartyRole}</b> ${picklistRoleInfo.roleType.description}
+                        <b>${uiLabelMap.PartyRole}</b> ${picklistRoleInfo.roleType.get("description",locale)}
                         <b>${uiLabelMap.CommonFrom}</b> ${picklistRoleInfo.picklistRole.fromDate}
-                        <#if picklistRoleInfo.picklistRole.thruDate?exists><b>thru</b> ${picklistRoleInfo.picklistRole.thruDate}</#if>
+                        <#if picklistRoleInfo.picklistRole.thruDate?exists><b>${uiLabelMap.CommonThru}</b> ${picklistRoleInfo.picklistRole.thruDate}</#if>
                     </div>
                 </#list>
                 <div class="tabletext" style="margin-left: 15px;">
@@ -91,7 +91,7 @@
                 <#list picklistInfo.picklistStatusHistoryInfoList?if_exists as picklistStatusHistoryInfo>
                     <div class="tabletext" style="margin-left: 15px;">
                         <b>${uiLabelMap.CommonStatus}</b> ${uiLabelMap.CommonChange} ${uiLabelMap.CommonFrom} ${picklistStatusHistoryInfo.statusItem.get("description",locale)}
-                        ${uiLabelMap.CommonTo} ${picklistStatusHistoryInfo.statusItemTo.description}
+                        ${uiLabelMap.CommonTo} ${picklistStatusHistoryInfo.statusItemTo.get("description",locale)}
                         ${uiLabelMap.CommonOn} ${picklistStatusHistoryInfo.picklistStatusHistory.changeDate}
                         ${uiLabelMap.CommonBy} ${picklistStatusHistoryInfo.picklistStatusHistory.changeUserLoginId}
                     </div>
@@ -115,7 +115,7 @@
                             <select name="picklistId" class="smallSelect">
                                 <#list picklistActiveList as picklistActive>
                                     <#assign picklistActiveStatusItem = picklistActive.getRelatedOneCache("StatusItem")>
-                                    <option value="${picklistActive.picklistId}"<#if picklistActive.picklistId == picklist.picklistId> selected</#if>>${picklistActive.picklistId} [${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.description}]</option>
+                                    <option value="${picklistActive.picklistId}"<#if picklistActive.picklistId == picklist.picklistId> selected</#if>>${picklistActive.picklistId} [${uiLabelMap.CommonDate}:${picklistActive.picklistDate},${uiLabelMap.CommonStatus}:${picklistActiveStatusItem.get("description",locale)}]</option>
                                 </#list>
                             </select>
                             <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
Index: product/webapp/facility/shipment/PackingSlip.fo.ftl
===================================================================
--- product/webapp/facility/shipment/PackingSlip.fo.ftl	(revision 7788)
+++ product/webapp/facility/shipment/PackingSlip.fo.ftl	(working copy)
@@ -69,13 +69,13 @@
                 <fo:table-header>
                     <fo:table-row font-weight="bold">
                         <fo:table-cell padding="2pt" background-color="#D4D0C8">
-                            <fo:block>Shipping Address</fo:block>
+                            <fo:block>${uiLabelMap.ProductShippingAddress}</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt" background-color="#D4D0C8">
-                            <fo:block text-align="center">Shipping Method</fo:block>
+                            <fo:block text-align="center">${uiLabelMap.ProductShipmentMethod}</fo:block>
                         </fo:table-cell>
                         <fo:table-cell padding="2pt" background-color="#D4D0C8">
-                            <fo:block text-align="right">Handling Instructions</fo:block>
+                            <fo:block text-align="right">${uiLabelMap.ProductHandlingInstructions}</fo:block>
                         </fo:table-cell>
                     </fo:table-row>
                 </fo:table-header>
@@ -84,9 +84,9 @@
                         <fo:table-cell padding="2pt">
                             <fo:block>
                                 <#if destinationPostalAddress?has_content>
-                                  <fo:block>To: ${destinationPostalAddress.toName?if_exists}</fo:block>
+                                  <fo:block>${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName?if_exists}</fo:block>
                                   <#if destinationPostalAddress.attnName?has_content>
-                                    <fo:block>Attn: ${destinationPostalAddress.attnName?if_exists}</fo:block>
+                                    <fo:block>${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName?if_exists}</fo:block>
                                   </#if>
                                   <fo:block>${destinationPostalAddress.address1?if_exists}</fo:block>
                                   <fo:block>${destinationPostalAddress.address2?if_exists}</fo:block>
@@ -120,9 +120,9 @@
                 <fo:table-column column-width="100pt"/>
                 <fo:table-header>
                     <fo:table-row font-weight="bold">
-                        <fo:table-cell padding="2pt" background-color="#D4D0C8"><fo:block>Product</fo:block></fo:table-cell>
-                        <fo:table-cell padding="2pt" background-color="#D4D0C8"><fo:block>Quantity Requested</fo:block></fo:table-cell>
-                        <fo:table-cell padding="2pt" background-color="#D4D0C8"><fo:block>Quantity Shipped</fo:block></fo:table-cell>
+                        <fo:table-cell padding="2pt" background-color="#D4D0C8"><fo:block>${uiLabelMap.ProductProduct}</fo:block></fo:table-cell>
+                        <fo:table-cell padding="2pt" background-color="#D4D0C8"><fo:block>${uiLabelMap.ProductQuantityRequested}</fo:block></fo:table-cell>
+                        <fo:table-cell padding="2pt" background-color="#D4D0C8"><fo:block>${uiLabelMap.ProductQuantityShipped}</fo:block></fo:table-cell>
                     </fo:table-row>
                 </fo:table-header>
                 <fo:table-body>
Index: product/webapp/facility/shipment/PackOrder.ftl
===================================================================
--- product/webapp/facility/shipment/PackOrder.ftl	(revision 7788)
+++ product/webapp/facility/shipment/PackOrder.ftl	(working copy)
@@ -307,7 +307,7 @@
               <td><div class="tabletext">${line.getInventoryItemId()}</td>
               <td align="right"><div class="tabletext">${line.getQuantity()}</td>
               <td align="right"><div class="tabletext">${line.getPackageSeq()}</td>
-              <td align="right"><a href="<@ofbizUrl>ClearPackLine?facilityId=${facilityId}&orderId=${line.getOrderId()}&orderItemSeqId=${line.getOrderItemSeqId()}&shipGroupSeqId=${line.getShipGroupSeqId()}&inventoryItemId=${line.getInventoryItemId()}&packageSeqId=${line.getPackageSeq()}</@ofbizUrl>" class="buttontext">Clear</a></td>
+              <td align="right"><a href="<@ofbizUrl>ClearPackLine?facilityId=${facilityId}&orderId=${line.getOrderId()}&orderItemSeqId=${line.getOrderItemSeqId()}&shipGroupSeqId=${line.getShipGroupSeqId()}&inventoryItemId=${line.getInventoryItemId()}&packageSeqId=${line.getPackageSeq()}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClear}</a></td>
             </tr>
           </#list>
         </table>
Index: product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl
===================================================================
--- product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl	(revision 7788)
+++ product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl	(working copy)
@@ -101,8 +101,8 @@
             <div class="tabletext">[${(shipmentRouteSegment.actualStartDate.toString())?if_exists} - ${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}]</span>
         </td>
         <td>
-            <div class="tabletext">${shipmentRouteSegment.billingWeight?if_exists} ${(billingWeightUom.description)?if_exists} [${(billingWeightUom.abbreviation)?if_exists}]</div>
-            <div class="tabletext">${(currencyUom.description)?default("&nbsp;")}</div>
+            <div class="tabletext">${shipmentRouteSegment.billingWeight?if_exists} ${(billingWeightUom.get("description",locale))?if_exists} [${(billingWeightUom.abbreviation)?if_exists}]</div>
+            <div class="tabletext">${(currencyUom.get("description",locale))?default("&nbsp;")}</div>
             <div class="tabletext">${(shipmentRouteSegment.actualTransportCost)?default("&nbsp;")}</div>
             <div class="tabletext">${(shipmentRouteSegment.actualServiceCost)?default("&nbsp;")}</div>
             <div class="tabletext">${(shipmentRouteSegment.actualOtherCost)?default("&nbsp;")}</div>
Index: workeffort/config/WorkEffortUiLabels.properties
===================================================================
--- workeffort/config/WorkEffortUiLabels.properties	(revision 7788)
+++ workeffort/config/WorkEffortUiLabels.properties	(working copy)
@@ -1,4 +1,20 @@
+#####################################################################
 #
+# Copyright 2001-2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+######################################################################
+#
 # OFBiz UiLabel Properties used for the workEffort module 
 #
 ####
@@ -321,3 +337,43 @@
 FormFieldTitle_reservNthPPPerc=Reserv Nth P P Perc
 FormFieldTitle_requirementId=Requirement Id
 FormFieldTitle_estimateCalcMethod=Estimate Calc Method
+FormFieldTitle_workEffortIdTo=Work Effort Id To
+FormFieldTitle_workEffortAssocTypeId=Work Effort Assoc Type Id
+FormFieldTitle_workEffortIdFrom=Work Effort Id From
+FormFieldTitle_statusDateTime=Status Date Time
+FormFieldTitle_mustRsvp=Must Rsvp
+FormFieldTitle_comments=Comments
+FormFieldTitle_rate=Rate
+FormFieldTitle_custRequestTypeDescription=Cust Request Type Description
+FormFieldTitle_statusItemDescription=Status Item Description
+FormFieldTitle_workReqFulfTypeDescription=Work Req Fulf Type Description
+FormFieldTitle_workReqFulfTypeId=Work Req Fulf Type Id 
+FormFieldTitle_productProductId=Product Id
+FormFieldTitle_statusItemDescription=Status
+FormFieldTitle_statusId=Status
+FormFieldTitle_requirementStartDate=Requirement Start Date
+FormFieldTitle_requirementDescription=Requirement Description
+FormFieldTitle_quoteName=Quote Name
+FormFieldTitle_issueDate=Issue Date
+FormFieldTitle_quoteItemSeqId=Quote Item Seq Id
+FormFieldTitle_estimatedDeliveryDate=Estimated Delivery Date
+FormFieldTitle_orderTypeDescription=Order Type Description
+FormFieldTitle_timesheetId=Timesheet Id
+FormFieldTitle_hours=Hours
+FormFieldTitle_invoiceId=Invoice Id
+FormFieldTitle_invoiceInfo=Invoice Info
+FormFieldTitle_clientPartyId=Client Party Id
+FormFieldTitle_invoiceItemSeqId=Invoice Item Seq Id
+FormFieldTitle_workEffortTypeId=Work Effort Type Id
+FormFieldTitle_lastStatusUpdate=Last Status Update
+FormFieldTitle_workEffortPurposeTypeId=Work Effort Purpose Type Id
+FormFieldTitle_workEffortName=Work Effort Name
+FormFieldTitle_revisionNumber=Revision Number
+FormFieldTitle_percentComplete=Percent Complete
+FormFieldTitle_createdDate=Created Date
+FormFieldTitle_createdByUserLogin=Created By User Login
+FormFieldTitle_lastModifiedDate=Last Modified Date
+FormFieldTitle_lastModifiedByUserLogin=Last Modified By User Login
+FormFieldTitle_contactMechTypeId=Contact Mech Type Id
+FormFieldTitle_marketingCampaignId=Marketing Campaign Id
+FormFieldTitle_partyId=Party Id
Index: workeffort/entitydef/entitymodel.xml
===================================================================
--- workeffort/entitydef/entitymodel.xml	(revision 7788)
+++ workeffort/entitydef/entitymodel.xml	(working copy)
@@ -68,6 +68,7 @@
     </entity>
     <entity entity-name="RateType"
             package-name="org.ofbiz.workeffort.timesheet"
+			default-resource-name="WorkEffortEntityLabels"
             title="Rate Type Entity">
       <field name="rateTypeId" type="id-ne"></field>
       <field name="description" type="description"></field>