[OFBiz] SVN: r7790 - in trunk/applications: accounting/config accounting/webapp/accounting ecommerce/config ecommerce/templates/email ecommerce/widget marketing/entitydef party/config party/entitydef party/webapp/partymgr/communication party/webapp/partymgr/contactlist party/webapp/partymgr/includes party/webapp/partymgr/party party/widget/partymgr product/config product/webapp/facility/facility product/webapp/facility/shipment
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Wed Jun 14 07:23:04 CDT 2006
Author: jacopo
Date: 2006-06-14 07:22:06 -0500 (Wed, 14 Jun 2006)
New Revision: 7790
Modified:
trunk/applications/accounting/config/AccountingEntityLabels.properties
trunk/applications/accounting/config/AccountingEntityLabels_it.properties
trunk/applications/accounting/webapp/accounting/main.ftl
trunk/applications/ecommerce/config/EcommerceUiLabels.properties
trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties
trunk/applications/ecommerce/templates/email/OrderNoticeEmail.ftl
trunk/applications/ecommerce/widget/EmailOrderScreens.xml
trunk/applications/marketing/entitydef/entitymodel.xml
trunk/applications/party/config/PartyEntityLabels_it.properties
trunk/applications/party/config/PartyUiLabels.properties
trunk/applications/party/config/PartyUiLabels_it.properties
trunk/applications/party/entitydef/entitymodel.xml
trunk/applications/party/webapp/partymgr/communication/CommForms.xml
trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml
trunk/applications/party/webapp/partymgr/includes/appheader.ftl
trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl
trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
trunk/applications/party/webapp/partymgr/party/findMatches.ftl
trunk/applications/party/webapp/partymgr/party/linkparty.ftl
trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
trunk/applications/party/webapp/partymgr/party/viewroles.ftl
trunk/applications/party/widget/partymgr/CommunicationScreens.xml
trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
trunk/applications/party/widget/partymgr/PartyMenus.xml
trunk/applications/party/widget/partymgr/PartyScreens.xml
trunk/applications/product/config/ProductUiLabels.properties
trunk/applications/product/config/ProductUiLabels_it.properties
trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl
Log:
i18n patches and labels from Marco Risaliti (AOFBIZ-23).
Modified: trunk/applications/accounting/config/AccountingEntityLabels.properties
===================================================================
--- trunk/applications/accounting/config/AccountingEntityLabels.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/accounting/config/AccountingEntityLabels.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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
Modified: trunk/applications/accounting/config/AccountingEntityLabels_it.properties
===================================================================
--- trunk/applications/accounting/config/AccountingEntityLabels_it.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/accounting/config/AccountingEntityLabels_it.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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
Modified: trunk/applications/accounting/webapp/accounting/main.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/main.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/accounting/webapp/accounting/main.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
Modified: trunk/applications/ecommerce/config/EcommerceUiLabels.properties
===================================================================
--- trunk/applications/ecommerce/config/EcommerceUiLabels.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/ecommerce/config/EcommerceUiLabels.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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
Modified: trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties
===================================================================
--- trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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
Modified: trunk/applications/ecommerce/templates/email/OrderNoticeEmail.ftl
===================================================================
--- trunk/applications/ecommerce/templates/email/OrderNoticeEmail.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/ecommerce/templates/email/OrderNoticeEmail.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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")}
Modified: trunk/applications/ecommerce/widget/EmailOrderScreens.xml
===================================================================
--- trunk/applications/ecommerce/widget/EmailOrderScreens.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/ecommerce/widget/EmailOrderScreens.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
Modified: trunk/applications/marketing/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/marketing/entitydef/entitymodel.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/marketing/entitydef/entitymodel.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
Modified: trunk/applications/party/config/PartyEntityLabels_it.properties
===================================================================
--- trunk/applications/party/config/PartyEntityLabels_it.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/config/PartyEntityLabels_it.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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à 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à 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à 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
Modified: trunk/applications/party/config/PartyUiLabels.properties
===================================================================
--- trunk/applications/party/config/PartyUiLabels.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/config/PartyUiLabels.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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
Modified: trunk/applications/party/config/PartyUiLabels_it.properties
===================================================================
--- trunk/applications/party/config/PartyUiLabels_it.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/config/PartyUiLabels_it.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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 at bar.com
+PartyEmailAddressNotFormattedCorrectly=Indirizzo Email non \u00e8 formattato correttamente, dovrebbe essere simile a foo at 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
Modified: trunk/applications/party/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/party/entitydef/entitymodel.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/entitydef/entitymodel.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
@@ -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>
Modified: trunk/applications/party/webapp/partymgr/communication/CommForms.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/communication/CommForms.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/communication/CommForms.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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}&dataResourceId=${dataResourceId}&communicationEventId=${communicationEventId}&fromDate=${fromDate}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditCommContent?contentId=${contentId}&dataResourceId=${dataResourceId}&communicationEventId=${communicationEventId}&fromDate=${fromDate}"/>
</field>
<field name="viewContent" title="">
- <hyperlink also-hidden="false" description="View" target="ViewSimpleContent?contentId=${contentId}&dataResourceId=${dataResourceId}&communicationEventId=${communicationEventId}&fromDate=${fromDate}"/>
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonView}" target="ViewSimpleContent?contentId=${contentId}&dataResourceId=${dataResourceId}&communicationEventId=${communicationEventId}&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>
Modified: trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml
===================================================================
--- trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
Modified: trunk/applications/party/webapp/partymgr/includes/appheader.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/includes/appheader.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/includes/appheader.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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"> </div>
</div>
Modified: trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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"> ${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>
Modified: trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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"> Match Key: </span></td>
+ <td><span class="tabletext"> ${uiLabelMap.PartyAddressMatchKey}: </span></td>
<td><input type="text" class="inputBox" name="mapKey"></td>
- <td><span class="tabletext"> Match Value: </span></td>
+ <td><span class="tabletext"> ${uiLabelMap.PartyAddressMatchValue}: </span></td>
<td><input type="text" class="inputBox" name="mapValue"></td>
- <td><span class="tabletext"> Seq: </span></td>
+ <td><span class="tabletext"> ${uiLabelMap.CommonSequence}: </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>
+ <a href="javascript:document.addaddrmap.submit()" class="buttontext">${uiLabelMap.CommonCreate}</a>
</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> </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>
Modified: trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
Modified: trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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> <a href="javascript:document.createcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonCreate}]</a>
</td>
@@ -53,7 +53,7 @@
<a href="<@ofbizUrl>authview/${donePage?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
<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">
<#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"> </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"> </td>
<td width="74%">
<input type="text" class="inputBox" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}">
Modified: trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
Modified: trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
Modified: trunk/applications/party/webapp/partymgr/party/findMatches.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/findMatches.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/findMatches.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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%"> </td>
<td><input type="text" class="inputBox" name="postalCode" value="${parameters.postalCode?if_exists}"/>*</td>
</tr>
<tr>
<td colspan="2"> </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"> </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>
Modified: trunk/applications/party/webapp/partymgr/party/linkparty.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/linkparty.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/linkparty.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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"> </td></tr>
<tr>
- <td align="right"><span class="tabletext"> Link Party: </span></td>
+ <td align="right"><span class="tabletext"> ${uiLabelMap.PartyLink}: </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>
<b>[${partyFrom.partyId}]</b>
</span>
</td>
</tr>
<tr>
- <td align="right"><span class="tabletext"> To: </span></td>
+ <td align="right"><span class="tabletext"> ${uiLabelMap.CommonTo}: </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>
<b>[${partyTo.partyId}]</b>
</span>
@@ -97,19 +96,19 @@
<tr><td colspan="2"> </td></tr>
<tr>
<td colspan="2" align="center">
- <a href="javascript:document.linkparty.submit()" class="buttontext">Confirm</a>
+ <a href="javascript:document.linkparty.submit()" class="buttontext">${uiLabelMap.CommonConfirm}</a>
</td>
</tr>
</form>
<#else>
<form name="linkpartycnf" method="post" action="<@ofbizUrl>linkparty</@ofbizUrl>">
<tr>
- <td><span class="tabletext"> Link Party: </span></td>
+ <td><span class="tabletext"> ${uiLabelMap.PartyLink}: </span></td>
<td><input type="text" class="inputBox" name="partyId" value="${partyId?if_exists}"></td>
- <td><span class="tabletext"> To: </span></td>
+ <td><span class="tabletext"> ${uiLabelMap.CommonTo}: </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>
+ <a href="javascript:document.linkpartycnf.submit()" class="buttontext">${uiLabelMap.CommonLink}</a>
</td>
</tr>
</form>
Modified: trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/viewprofile.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/viewprofile.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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"> <b>${contactMechMap.contactMechType.description}</b></div>
+ <div class="tabletext"> <b>${contactMechMap.contactMechType.get("description",locale)}</b></div>
</td>
<td width="5"> </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> ${(avsOverride.avsDeclineString)?default("Global")}
+ <b>${uiLabelMap.PartyAvsString}:</b> ${(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>
Modified: trunk/applications/party/webapp/partymgr/party/viewroles.ftl
===================================================================
--- trunk/applications/party/webapp/partymgr/party/viewroles.ftl 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/webapp/partymgr/party/viewroles.ftl 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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"> </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>
@@ -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>
Modified: trunk/applications/party/widget/partymgr/CommunicationScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/CommunicationScreens.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/widget/partymgr/CommunicationScreens.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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}&partyId=${partyId}" text="${uiLabelMap.AddCommContent}"/></container>
+ <container><link style="buttontext" target="AddCommContent?communicationEventId=${communicationEventId}&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>
Modified: trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/PartyContactListScreens.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/widget/partymgr/PartyContactListScreens.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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>
Modified: trunk/applications/party/widget/partymgr/PartyMenus.xml
===================================================================
--- trunk/applications/party/widget/partymgr/PartyMenus.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/widget/partymgr/PartyMenus.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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}">
Modified: trunk/applications/party/widget/partymgr/PartyScreens.xml
===================================================================
--- trunk/applications/party/widget/partymgr/PartyScreens.xml 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/party/widget/partymgr/PartyScreens.xml 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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"/>
Modified: trunk/applications/product/config/ProductUiLabels.properties
===================================================================
--- trunk/applications/product/config/ProductUiLabels.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/product/config/ProductUiLabels.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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
Modified: trunk/applications/product/config/ProductUiLabels_it.properties
===================================================================
--- trunk/applications/product/config/ProductUiLabels_it.properties 2006-06-14 00:03:46 UTC (rev 7789)
+++ trunk/applications/product/config/ProductUiLabels_it.properties 2006-06-14 12:22:06 UTC (rev 7790)
@@ -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 Stabilim