OFBiz › OFBiz - Commits

svn commit: r730853 [1/4] - in /ofbiz/trunk/applications: accounting/config/ accounting/webapp/accounting/payment/ accounting/widget/ content/config/ humanres/config/ manufacturing/config/ order/config/ order/widget/ordermgr/ party/config/ product/conf...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mrisaliti

svn commit: r730853 [1/4] - in /ofbiz/trunk/applications: accounting/config/ accounting/webapp/accounting/payment/ accounting/widget/ content/config/ humanres/config/ manufacturing/config/ order/config/ order/widget/ordermgr/ party/config/ product/conf...

Author: mrisaliti
Date: Fri Jan 2 14:28:35 2009
New Revision: 730853

URL: http://svn.apache.org/viewvc?rev=730853&view=rev
Log:
A lot of Product labels renamed/moved or merged (Part of OFBIZ-1780).

Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml
ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
ofbiz/trunk/applications/content/config/ContentUiLabels.xml
ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
ofbiz/trunk/applications/product/config/ProductErrorUiLabels.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductUomFormulas.xml
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl
ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
ofbiz/trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/trunk/applications/product/widget/catalog/Menus.xml
ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
ofbiz/trunk/applications/product/widget/facility/CommonScreens.xml
ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.xml

Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Fri Jan 2 14:28:35 2009
@@ -5603,19 +5603,6 @@
<value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥à¸§à¸´à¸à¸µà¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
<value xml:lang="zh">æ¯ä»æ¹æ³ä¿¡æ¯</value>
</property>
- <property key="AccountingPaymentMethodType">
- <value xml:lang="ar">ÙÙØ¹ Ø·Ø±ÙÙØ© Ø§ÙØªØ³Ø¯ÙØ¯</value>
- <value xml:lang="de">Zahlungsmethode Typ</value>
- <value xml:lang="en">Payment Method Type</value>
- <value xml:lang="es">Tipo Metodo de Pago</value>
- <value xml:lang="fr">Type de mÃ©thode de paiement</value>
- <value xml:lang="it">Tipo Metodo Pagamento</value>
- <value xml:lang="nl">Type betaalmethode</value>
- <value xml:lang="ro">Tip Metoda Plata.</value>
- <value xml:lang="ru">Ð¢Ð¸Ð¿ ÑÐ¿Ð¾ÑÐ¾Ð±Ð° Ð¿Ð»Ð°ÑÐµÐ¶Ð°</value>
- <value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸§à¸´à¸à¸µà¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
- <value xml:lang="zh">æ¯ä»æ¹æ³ç±»å</value>
- </property>
<property key="AccountingPaymentMethodTypeNotHandled">
<value xml:lang="en">Payment method not handled paymentMethodTypeId :</value>
<value xml:lang="it">Metodo di pagamento non trattato :</value>
@@ -5666,17 +5653,6 @@
<value xml:lang="th">à¸£à¸¹à¸à¹à¸à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
<value xml:lang="zh">æ¯ä»åæ°</value>
</property>
- <property key="AccountingPaymentProps">
- <value xml:lang="de">Zahlung Einstellungen</value>
- <value xml:lang="en">Payment Props</value>
- <value xml:lang="es">Propiedades de Pago</value>
- <value xml:lang="fr">PropriÃ©tÃ©s du paiement</value>
- <value xml:lang="it">Prop. Pagamento</value>
- <value xml:lang="ro">Prop. Plata</value>
- <value xml:lang="ru">Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° Ð¿Ð»Ð°ÑÐµÐ¶Ð°</value>
- <value xml:lang="th">à¸£à¸¹à¸à¹à¸à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
- <value xml:lang="zh">æ¯ä»åæ°</value>
- </property>
<property key="AccountingPaymentReceiveViaPayPal">
<value xml:lang="en">Payment receive via PayPal</value>
<value xml:lang="fr">Paiement reÃ§u par PayPal</value>
@@ -5695,21 +5671,6 @@
<value xml:lang="th">à¹à¸¡à¹à¸à¸à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸ [${paymentId}]</value>
<value xml:lang="zh">æ²¡ææ¾å°æ¯ä»[${paymentId}]çè®°å½...</value>
</property>
- <property key="AccountingPayments">
- <value xml:lang="ar">Ø§ÙØªØ³Ø¯ÙØ¯Ø§Øª</value>
- <value xml:lang="de">Zahlungen</value>
- <value xml:lang="en">Payments</value>
- <value xml:lang="es">Pagos</value>
- <value xml:lang="fr">Paiements</value>
- <value xml:lang="it">Pagamenti</value>
- <value xml:lang="nl">Betalingen</value>
- <value xml:lang="pt_BR">Pagamentos</value>
- <value xml:lang="pt_PT">Pagamentos</value>
- <value xml:lang="ro">Plati</value>
- <value xml:lang="ru">ÐÐ»Ð°ÑÐµÐ¶Ð¸</value>
- <value xml:lang="th">à¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value>
- <value xml:lang="zh">æ¯ä»</value>
- </property>
<property key="AccountingPaymentsApplied">
<value xml:lang="ar">Ø§ÙØªØ³Ø¯ÙØ¯Ø§Øª Ø§ÙÙØ·Ø¨ÙØ©</value>
<value xml:lang="en">Payments Applied</value>

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl Fri Jan 2 14:28:35 2009
@@ -29,7 +29,7 @@

<table border='0' cellpadding='2' cellspacing='0'>
<tr>
- <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingPaymentMethodType}</b></td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonPaymentMethodType}</b></td>
<td width="5"> </td>
<td width='74%'>
<#if paymentMethodType?has_content>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Fri Jan 2 14:28:35 2009
@@ -571,7 +571,7 @@
<menu-item name="Costs" title="${uiLabelMap.ManufacturingCostCalcs}">
<link target="EditCostCalcs"/>
</menu-item>
- <menu-item name="PaymentMethodTypes" title="${uiLabelMap.AccountingPaymentMethodType}">
+ <menu-item name="PaymentMethodTypes" title="${uiLabelMap.CommonPaymentMethodType}">
<link target="editPaymentMethodType"/>
</menu-item>
<menu-item name="InvoiceItemTypes" title="${uiLabelMap.AccountingInvoiceItemType}">
@@ -647,7 +647,7 @@
<menu-item name="BillingAccountInvoices" title="${uiLabelMap.AccountingInvoices}">
<link target="BillingAccountInvoices?billingAccountId=${billingAccount.billingAccountId}"/>
</menu-item>
- <menu-item name="BillingAccountPayments" title="${uiLabelMap.AccountingPayments}">
+ <menu-item name="BillingAccountPayments" title="${uiLabelMap.CommonPayments}">
<link target="BillingAccountPayments?billingAccountId=${billingAccount.billingAccountId}"/>
</menu-item>
<menu-item name="BillingAccountOrders" title="${uiLabelMap.AccountingOrders}">

Modified: ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml Fri Jan 2 14:28:35 2009
@@ -25,7 +25,7 @@
<section>
<actions>
<set field="tabButtonItem" value="PaymentMethodTypes"/>
- <set field="titleProperty" value="AccountingPaymentMethodType"/>
+ <set field="titleProperty" value="CommonPaymentMethodType"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
<entity-condition entity-name="PaymentMethodType" list-name="paymentMethodTypes">

Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Fri Jan 2 14:28:35 2009
@@ -80,7 +80,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="orderId"><text/></field>
<field name="orderPaymentPreferenceId"><text/></field>
- <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}">
+ <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}">
<drop-down allow-empty="false">
<entity-options entity-name="PaymentMethodType" description="${description}"/>
</drop-down>
@@ -94,7 +94,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="orderId"><text/></field>
<field name="orderPaymentPreferenceId"><text/></field>
- <field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}">
+ <field name="paymentMethodTypeId" title="${uiLabelMap.CommonPaymentMethodType}">
<drop-down allow-empty="false">
<entity-options entity-name="PaymentMethodType" description="${description}"/>
</drop-down>

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Fri Jan 2 14:28:35 2009
@@ -17,7 +17,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<property key="ContentAnswer">
<value xml:lang="ar">Ø§ÙØ¬ÙØ§Ø¨</value>
<value xml:lang="de">Antwort</value>
@@ -865,36 +866,6 @@
<value xml:lang="th">AcroForm (PDF) Content ID</value>
<value xml:lang="zh">AcroForm (PDF)åå®¹æ è¯</value>
</property>
- <property key="FormFieldTitle_allowMultiple">
- <value xml:lang="ar">Ø§ÙØ³ÙØ§Ø Ø¨Ø§ÙØªØ¹Ø¯Ø¯</value>
- <value xml:lang="de">Mehrere Erlauben</value>
- <value xml:lang="en">Allow Multiple</value>
- <value xml:lang="fr">Permettre la multiplicitÃ©</value>
- <value xml:lang="it">Permette Multipli</value>
- <value xml:lang="ro">Permite Multipli</value>
- <value xml:lang="th">à¸¢à¸´à¸à¸¢à¸à¸¡à¹à¸«à¹à¸à¸³à¸«à¸¥à¸²à¸¢à¸à¸¢à¹à¸²à¸à¹à¸à¹</value>
- <value xml:lang="zh">åè®¸å¤ä¸ª</value>
- </property>
- <property key="FormFieldTitle_allowProductStoreChange">
- <value xml:lang="ar">Ø§ÙØ³ÙØ§Ø Ø¨ØªØºÙÙØ± Ø§ÙÙØªØ¬Ø±</value>
- <value xml:lang="de">Produktladen wechseln erlauben</value>
- <value xml:lang="en">Allow Product Store Change</value>
- <value xml:lang="fr">Permettre le changement de centre de profit</value>
- <value xml:lang="it">Permetti Cambio Negozio</value>
- <value xml:lang="ro">Permisie Schimb Magazin</value>
- <value xml:lang="th">à¸à¸à¸¸à¸à¸²à¸à¹à¸«à¹à¹à¸à¹à¹à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¹</value>
- <value xml:lang="zh">åè®¸äº§ååºéºä¿®æ¹</value>
- </property>
- <property key="FormFieldTitle_allowUpdate">
- <value xml:lang="ar">Ø§ÙØ³ÙØ§Ø Ø¨Ø§ÙØªØØ¯ÙØ«</value>
- <value xml:lang="de">Aktualisierung erlauben</value>
- <value xml:lang="en">Allow Update</value>
- <value xml:lang="fr">Permettre la mise Ã jour</value>
- <value xml:lang="it">Permette Aggiornamenti</value>
- <value xml:lang="ro">Permite Actualizari</value>
- <value xml:lang="th">à¸à¸à¸¸à¸à¸²à¸à¹à¸«à¹à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸à¹à¸à¹</value>
- <value xml:lang="zh">åè®¸æ´æ°</value>
- </property>
<property key="FormFieldTitle_amountBase">
<value xml:lang="ar">ÙØ§Ø¹Ø¯Ø© Ø§ÙÙØ¨ÙØº</value>
<value xml:lang="de">Basisbetrag</value>
@@ -925,26 +896,6 @@
<value xml:lang="th">à¸§à¸±à¸à¸à¸µà¹à¸¥à¸à¸à¸§à¸²à¸¡à¹à¸«à¹à¸</value>
<value xml:lang="zh">æ¹åæ¥æ</value>
</property>
- <property key="FormFieldTitle_attrName">
- <value xml:lang="ar">Ø§Ø³Ù Ø§ÙØ®Ø§ØµÙØ©</value>
- <value xml:lang="de">Attributnamen</value>
- <value xml:lang="en">Attr Name</value>
- <value xml:lang="fr">Nom d'attribut</value>
- <value xml:lang="it">Nome Attributo</value>
- <value xml:lang="ro">Nume Atribut</value>
- <value xml:lang="th">à¸à¸·à¹à¸à¸¥à¸±à¸à¸©à¸à¸°</value>
- <value xml:lang="zh">å±æ§åç§°</value>
- </property>
- <property key="FormFieldTitle_attrValue">
- <value xml:lang="ar">ÙÙÙØ© Ø§ÙØ®Ø§ØµÙØ©</value>
- <value xml:lang="de">Attributwert</value>
- <value xml:lang="en">Attr Value</value>
- <value xml:lang="fr">Valeur d'attribut</value>
- <value xml:lang="it">Valore Attributo</value>
- <value xml:lang="ro">Valoare Atribut</value>
- <value xml:lang="th">à¸¥à¸±à¸à¸©à¸à¸°</value>
- <value xml:lang="zh">å±æ§å¼</value>
- </property>
<property key="FormFieldTitle_caContentAssocPredicateId">
<value xml:lang="ar">ØªØ¹Ø±ÙÙ ØªÙÙØ¹Ø© Ø§Ø±ØªØ¨Ø§Ø· Ø§ÙÙØØªÙÙ</value>
<value xml:lang="de">Inhalt Zuordnung PrÃ¤dikat ID</value>
@@ -955,16 +906,6 @@
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸«à¸±à¸§à¸à¹à¸à¹à¸ªà¸à¸à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value>
<value xml:lang="zh">åå®¹å³èè°è¯æ è¯</value>
</property>
- <property key="FormFieldTitle_caContentAssocTypeId">
- <value xml:lang="ar">ØªØ¹Ø±ÙÙ ÙÙØ¹ Ø§ÙØ§Ø±ØªØ¨Ø§Ø·</value>
- <value xml:lang="de">Zuordnungstyp ID</value>
- <value xml:lang="en">Assoc Type Id</value>
- <value xml:lang="fr">RÃ©f. de type d'association</value>
- <value xml:lang="it">Tipo Associazione</value>
- <value xml:lang="ro">Tip Asociatie</value>
- <value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸£à¸°à¹à¸ à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value>
- <value xml:lang="zh">å³èç±»åæ è¯</value>
- </property>
<property key="FormFieldTitle_caContentIdTo">
<value xml:lang="ar">Ø§ÙÙØØªÙÙ Ø¥ÙÙ</value>
<value xml:lang="de">Inhalt ID zu</value>
@@ -992,26 +933,6 @@
<value xml:lang="th">à¹à¸à¸à¸à¸µà¹à¸ªà¸³à¸à¸±à¸</value>
<value xml:lang="zh">åæ¢é®</value>
</property>
- <property key="FormFieldTitle_categoryName">
- <value xml:lang="ar">Ø§Ø³Ù Ø§ÙÙØ¦Ø©</value>
- <value xml:lang="de">Kategorienname</value>
- <value xml:lang="en">Category Name</value>
- <value xml:lang="fr">Nom de catÃ©gorie</value>
- <value xml:lang="it">Nome Categoria</value>
- <value xml:lang="ro">Nume Categorie</value>
- <value xml:lang="th">à¸à¸·à¹à¸à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value>
- <value xml:lang="zh">åç±»åç§°</value>
- </property>
- <property key="FormFieldTitle_characterSetId">
- <value xml:lang="ar">ØªØ¹Ø±ÙÙ ÙØ¬ÙÙØ¹Ø© Ø§ÙØØ±ÙÙ</value>
- <value xml:lang="de">Zeichensatz ID</value>
- <value xml:lang="en">Character Set Id</value>
- <value xml:lang="fr">RÃ©f. de jeu de caractÃ¨res</value>
- <value xml:lang="it">Set di Caratteri</value>
- <value xml:lang="ro">Set de Caractere</value>
- <value xml:lang="th">à¸£à¸«à¸±à¸ªà¹à¸à¹à¸à¸¥à¸±à¸à¸©à¸à¸°</value>
- <value xml:lang="zh">åç¬¦éæ è¯</value>
- </property>
<property key="FormFieldTitle_childBranchCount">
<value xml:lang="ar">Ø¹Ø¯Ø¯ Ø§ÙÙØ±ÙØ¹</value>
<value xml:lang="de">ZÃ¤hler untergeordnete Verzweigungen</value>
@@ -1042,16 +963,6 @@
<value xml:lang="th">à¸à¸·à¹à¸à¸à¸à¸¥à¸±à¸¡à¸à¹</value>
<value xml:lang="zh">åæ é¢</value>
</property>
- <property key="FormFieldTitle_comments">
- <value xml:lang="ar">ØªØ¹Ø§ÙÙÙ</value>
- <value xml:lang="de">Anmerkungen</value>
- <value xml:lang="en">Comments</value>
- <value xml:lang="fr">Commentaires</value>
- <value xml:lang="it">Commenti</value>
- <value xml:lang="ro">Comentarii</value>
- <value xml:lang="th">à¸à¹à¸à¸à¸´à¸à¹à¸«à¹à¸</value>
- <value xml:lang="zh">è¯è®º</value>
- </property>
<property key="FormFieldTitle_committedByPartyId">
<value xml:lang="ar">ÙØ±ØªÙØ¨Ø© ÙÙ Ø·Ø±Ù</value>
<value xml:lang="de">Eingebracht von Akteur ID</value>
@@ -1096,9 +1007,12 @@
<value xml:lang="ar">ØªØ¹Ø±ÙÙ Ø§ÙÙØØªÙÙ</value>
<value xml:lang="de">Inhalt ID</value>
<value xml:lang="en">Content Id</value>
+ <value xml:lang="es">CÃ³digo de contenido</value>
<value xml:lang="fr">RÃ©f. de contenu</value>
<value xml:lang="it">Contenuto</value>
+ <value xml:lang="nl">Content-ID</value>
<value xml:lang="ro">Continut</value>
+ <value xml:lang="ru">ÐÐ¾Ð´ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°</value>
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸«à¸±à¸§à¸à¹à¸</value>
<value xml:lang="zh">åå®¹æ è¯</value>
</property>
@@ -1126,9 +1040,11 @@
<value xml:lang="ar">Ø§Ø³Ù Ø§ÙÙØØªÙÙ</value>
<value xml:lang="de">Inhalt Name</value>
<value xml:lang="en">Content Name</value>
+ <value xml:lang="es">Nombre de contenido</value>
<value xml:lang="fr">Nom de contenu</value>
- <value xml:lang="it">Nome Contenuto</value>
+ <value xml:lang="it">Nome contenuto</value>
<value xml:lang="ro">Nume Continut</value>
+ <value xml:lang="ru">ÐÐ¼Ñ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°</value>
<value xml:lang="th">à¸à¸·à¹à¸à¸«à¸±à¸§à¸à¹à¸</value>
<value xml:lang="zh">åå®¹åç§°</value>
</property>
@@ -1166,9 +1082,11 @@
<value xml:lang="ar">ØªØ¹Ø±ÙÙ ÙÙØ¹ ÙØ¯Ù Ø§ÙÙØØªÙÙ</value>
<value xml:lang="de">Inhalt Zweck Typ ID</value>
<value xml:lang="en">Content Purpose Type Id</value>
+ <value xml:lang="es">CÃ³digo PropÃ³sito de contenido</value>
<value xml:lang="fr">Type de but de contenu</value>
- <value xml:lang="it">Tipo Funzione Contenuto</value>
+ <value xml:lang="it">Tipo funzione contenuto</value>
<value xml:lang="ro">Tip Functie Continut</value>
+ <value xml:lang="ru">ÐÐ¾Ð´ ÑÐ¸Ð¿Ð° Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°</value>
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸£à¸°à¹à¸ à¸à¸«à¸±à¸§à¸à¹à¸à¸§à¸±à¸à¸à¸¸à¸à¸£à¸°à¸ªà¸à¸à¹</value>
<value xml:lang="zh">åå®¹ç®çç±»åæ è¯</value>
</property>
@@ -1186,9 +1104,11 @@
<value xml:lang="ar">ÙÙØ¹ Ø§ÙÙØØªÙÙ</value>
<value xml:lang="de">Inhaltstyp</value>
<value xml:lang="en">Content Type</value>
+ <value xml:lang="es">Tipo de contenido</value>
<value xml:lang="fr">Type de contenu</value>
- <value xml:lang="it">Tipo Contenuto</value>
+ <value xml:lang="it">Tipo contenuto</value>
<value xml:lang="ro">Tip Continut</value>
+ <value xml:lang="ru">Ð¢Ð¸Ð¿ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°</value>
<value xml:lang="th">à¸à¸£à¸°à¹à¸ à¸à¸«à¸±à¸§à¸à¹à¸</value>
<value xml:lang="zh">åå®¹ç±»å</value>
</property>
@@ -1196,9 +1116,11 @@
<value xml:lang="ar"> ØªØ¹Ø±ÙÙ ÙÙØ¹ Ø§ÙÙØØªÙÙ</value>
<value xml:lang="de">Inhaltstyp ID</value>
<value xml:lang="en">Content Type Id</value>
+ <value xml:lang="es">CÃ³digo Tipo de contenido</value>
<value xml:lang="fr">RÃ©f. de type de contenu</value>
<value xml:lang="it">Tipo Contenuto</value>
<value xml:lang="ro">Tip Continut</value>
+ <value xml:lang="ru">ÐÐ¾Ð´ ÑÐ¸Ð¿Ð° ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°</value>
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸£à¸°à¹à¸ à¸à¸«à¸±à¸§à¸à¹à¸</value>
<value xml:lang="zh">åå®¹ç±»åæ è¯</value>
</property>
@@ -1206,9 +1128,11 @@
<value xml:lang="ar">ÙØ¬Ø§Ù Ø§ÙÙÙÙÙ</value>
<value xml:lang="de">Domain Cookie</value>
<value xml:lang="en">Domain Cookie</value>
+ <value xml:lang="es">Dominio de cookie</value>
<value xml:lang="fr">Cookie de domaine</value>
- <value xml:lang="it">Dominio Cookie</value>
+ <value xml:lang="it">Dominio cookie</value>
<value xml:lang="ro">Domeniu Cookie</value>
+ <value xml:lang="ru">Cookie Ð´Ð¾Ð¼ÐµÐ½</value>
<value xml:lang="th">à¸à¸à¸à¹à¸à¸à¸à¸¸à¸à¸à¸¥</value>
<value xml:lang="zh">å¯¹åå¯ç¨Cookie</value>
</property>
@@ -1343,15 +1267,6 @@
<value xml:lang="th">à¸¢à¸±à¸à¸¢à¸±à¹à¸à¸ªà¸´à¹à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹</value>
<value xml:lang="zh">ä»¤å·²åå¨çæ æ</value>
</property>
- <property key="CommonDescription">
- <value xml:lang="ar">ÙØµÙ</value>
- <value xml:lang="de">Beschreibung</value>
- <value xml:lang="en">Description</value>
- <value xml:lang="it">Descrizione</value>
- <value xml:lang="ro">Descriere</value>
- <value xml:lang="th">à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸</value>
- <value xml:lang="zh">æè¿°</value>
- </property>
<property key="FormFieldTitle_displayFailCond">
<value xml:lang="ar">Ø¹Ø±Ø¶ Ø¸Ø±ÙÙ Ø§ÙØ¥Ø®ÙØ§Ù</value>
<value xml:lang="de">Grund fÃ¼r fehlschlagen anzeigen</value>

Modified: ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml (original)
+++ ofbiz/trunk/applications/humanres/config/HumanResUiLabels.xml Fri Jan 2 14:28:35 2009
@@ -17,7 +17,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<property key="FormFieldTitle_accountNumber">
<value xml:lang="en">Account Number</value>
<value xml:lang="fr">NÂ° de compte</value>
@@ -60,12 +61,6 @@
<value xml:lang="it">Soggetto Applicato</value>
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value>
</property>
- <property key="FormFieldTitle_availableTime">
- <value xml:lang="en">Available Time</value>
- <value xml:lang="fr">Temps disponible</value>
- <value xml:lang="it">Tempo Disponibile</value>
- <value xml:lang="th">à¹à¸§à¸¥à¸²à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹</value>
- </property>
<property key="FormFieldTitle_bankName">
<value xml:lang="en">Bank Name</value>
<value xml:lang="fr">Nom de la banque</value>
@@ -102,18 +97,6 @@
<value xml:lang="it">Tipo Budget</value>
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸£à¸°à¹à¸ à¸à¸à¸à¸à¸£à¸°à¸¡à¸²à¸</value>
</property>
- <property key="FormFieldTitle_comments">
- <value xml:lang="en">Comments</value>
- <value xml:lang="fr">Commentaires</value>
- <value xml:lang="it">Commenti</value>
- <value xml:lang="th">à¸à¸§à¸²à¸¡à¸à¸´à¸à¹à¸«à¹à¸</value>
- </property>
- <property key="FormFieldTitle_cost">
- <value xml:lang="en">Cost</value>
- <value xml:lang="fr">CoÃ»t</value>
- <value xml:lang="it">Costo</value>
- <value xml:lang="th">à¸£à¸²à¸à¸²</value>
- </property>
<property key="FormFieldTitle_customTimePeriodId">
<value xml:lang="en">Custom Time Period Id</value>
<value xml:lang="fr">RÃ©f. de pÃ©riode de temps adaptÃ©e</value>

Modified: ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml (original)
+++ ofbiz/trunk/applications/manufacturing/config/ManufacturingReportsUiLabels.xml Fri Jan 2 14:28:35 2009
@@ -99,15 +99,6 @@
<value xml:lang="th">à¹à¸à¸à¸à¸³à¸¥à¸à¸</value>
<value xml:lang="zh">æ¨¡å</value>
</property>
- <property key="CommonNote">
- <value xml:lang="en">Note</value>
- <value xml:lang="es">Nota</value>
- <value xml:lang="fr">Note</value>
- <value xml:lang="it">Annotazioni</value>
- <value xml:lang="ro">Anotari</value>
- <value xml:lang="th">à¸«à¸¡à¸²à¸¢à¹à¸«à¸à¸¸</value>
- <value xml:lang="zh">ä¾¿ç¬º</value>
- </property>
<property key="CommonPrintoutDate">
<value xml:lang="en">Printout Date</value>
<value xml:lang="es">Fecha de ImpresiÃ³n</value>

Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Fri Jan 2 14:28:35 2009
@@ -46,18 +46,6 @@
<value xml:lang="th">à¹à¸à¹à¸ªà¸£à¹à¸à¸à¸¶à¸à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸¥à¸¹à¸à¸à¹à¸²</value>
<value xml:lang="zh">è´¦åè®°å¥å®¢æ·ä¼åæ è¯</value>
</property>
- <property key="FormFieldTitle_carrierPartyId">
- <value xml:lang="de">Spediteur Akteur ID</value>
- <value xml:lang="en">Carrier Party Id</value>
- <value xml:lang="es">CÃ³digo Transportista</value>
- <value xml:lang="fr">RÃ©f. de transporteur</value>
- <value xml:lang="it">Codice Corriere</value>
- <value xml:lang="nl">Vervoerder Id</value>
- <value xml:lang="ro">Cod Curier</value>
- <value xml:lang="ru">ÐÐ¾Ð´ Ð¿ÐµÑÐµÐ²Ð¾Ð·ÑÐ¸ÐºÐ°</value>
- <value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¸ªà¹à¸</value>
- <value xml:lang="zh">éè´§äººä¼åæ è¯</value>
- </property>
<property key="FormFieldTitle_carrierRoleTypeId">
<value xml:lang="de">Spediteur Rollentyp ID</value>
<value xml:lang="en">Carrier Role Type Id</value>
@@ -1692,6 +1680,14 @@
<value xml:lang="th">à¹à¸à¸´à¸à¸à¹à¸§à¸</value>
<value xml:lang="zh">è´§å°ä»æ¬¾</value>
</property>
+ <property key="OrderCalculatedMarkup">
+ <value xml:lang="de">Berechneter Aufschlag</value>
+ <value xml:lang="en">Calculated Markup</value>
+ <value xml:lang="es">Margen calculado</value>
+ <value xml:lang="fr">Marge bÃ©nÃ©ficiaire calculÃ©e</value>
+ <value xml:lang="it">Markup calcolato</value>
+ <value xml:lang="th">à¸à¸²à¸£à¸à¸³à¸à¸§à¸à¸£à¸²à¸à¸²à¸à¸µà¹à¹à¸à¸´à¹à¸¡à¸à¸¶à¹à¸</value>
+ </property>
<property key="OrderCalculatedOffline">
<value xml:lang="en">Calculated Offline</value>
<value xml:lang="es">Calculado sin conexiÃ³n</value>
@@ -6118,6 +6114,14 @@
<value xml:lang="zh">æ£ççéå®æ¯ä»æç» (åæ¬ä¿é)</value>
<value xml:lang="zh_CN">ä¸ºæ¯ä»çéå®é¡¹ (åæ¬ä¿é)</value>
</property>
+ <property key="OrderPercentageMarkup">
+ <value xml:lang="de">Prozent Zuschlag</value>
+ <value xml:lang="en">Percentage Markup</value>
+ <value xml:lang="es">Porcentaje de margen</value>
+ <value xml:lang="fr">Pourcentage de marge bÃ©nÃ©ficiaire</value>
+ <value xml:lang="it">Markup Percentuale</value>
+ <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸£à¸²à¸à¸²à¸à¸±à¸à¸£à¸²à¸£à¹à¸à¸¢à¸¥à¸°</value>
+ </property>
<property key="OrderPickOrders">
<value xml:lang="de">AuftrÃ¤ge komissionieren</value>
<value xml:lang="en">Pick Orders</value>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/ReportForms.xml Fri Jan 2 14:28:35 2009
@@ -146,8 +146,8 @@
<field name="listPrice" title="${uiLabelMap.ProductListPrice}"><display/></field>
<field name="retailPrice" title="${uiLabelMap.ProductRetailPrice}"><display/></field>
<field name="discount" title="${uiLabelMap.ProductDiscount}"><display/></field>
- <field name="calculatedMarkup" title="${uiLabelMap.CalculatedMarkup}"><display/></field>
- <field name="percentMarkup" title="${uiLabelMap.PercentageMarkup}"><display/></field>
+ <field name="calculatedMarkup" title="${uiLabelMap.OrderCalculatedMarkup}"><display/></field>
+ <field name="percentMarkup" title="${uiLabelMap.OrderPercentageMarkup}"><display/></field>
</form>

<form name="OpenOrderItemsTotal" type="list" list-name="totalAmountList"

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Fri Jan 2 14:28:35 2009
@@ -63,29 +63,6 @@
<value xml:lang="en">Annual revenue</value>
<value xml:lang="es">Ingresos anuales</value>
</property>
- <property key="FormFieldTitle_attrName">
- <value xml:lang="de">Attribut Name</value>
- <value xml:lang="en">Attr Name</value>
- <value xml:lang="fr">Nom d'attribut</value>
- <value xml:lang="it">Nome Attributo</value>
- <value xml:lang="nl">Attr. naam</value>
- <value xml:lang="ro">Nume Atribut</value>
- <value xml:lang="ru">ÐÐ¼Ñ Ð°ÑÑÑ.</value>
- <value xml:lang="th">à¸à¸·à¹à¸</value>
- <value xml:lang="zh">å±æ§åç§°</value>
- </property>
- <property key="FormFieldTitle_attrValue">
- <value xml:lang="de">Attribut Wert</value>
- <value xml:lang="en">Attr Value</value>
- <value xml:lang="es">Valor de atributo</value>
- <value xml:lang="fr">Valeur de l'attribut</value>
- <value xml:lang="it">Valore Attributo</value>
- <value xml:lang="nl">Attr. waarde</value>
- <value xml:lang="ro">Valoare Atribut</value>
- <value xml:lang="ru">ÐÐ½Ð°Ñ. Ð°ÑÑÑ.</value>
- <value xml:lang="th">à¸à¹à¸²</value>
- <value xml:lang="zh">å±æ§å¼</value>
- </property>
<property key="FormFieldTitle_birthDate">
<value xml:lang="de">Geburtsdatum</value>
<value xml:lang="en">Birth Date</value>
@@ -146,16 +123,17 @@
<value xml:lang="ru">ÐÐ±ÑÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ</value>
<value xml:lang="th">à¸à¸·à¹à¸</value>
</property>
+
<property key="FormFieldTitle_communicationEventId">
- <value xml:lang="de">Kommunkationsereignis ID</value>
- <value xml:lang="en">communication Event Id</value>
+ <value xml:lang="de">Kommunikationsereignis ID</value>
+ <value xml:lang="en">Communication Event Id</value>
<value xml:lang="es">CÃ³digo Evento de comunicaciÃ³n</value>
- <value xml:lang="fr">RÃ©f. Ã©vÃ¨nement de communication</value>
- <value xml:lang="it">Evento Comunicazione</value>
- <value xml:lang="nl">ID communicatie-actie</value>
- <value xml:lang="ro">Code Eveniment Comunicare</value>
- <value xml:lang="ru">ÐÐ¾Ð´ ÐºÐ¾Ð¼Ð¼ÑÐ½Ð¸ÐºÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¾Ð±ÑÑÐ¸Ñ</value>
- <value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸ªà¸·à¹à¸à¸ªà¸²à¸£</value>
+ <value xml:lang="fr">RÃ©f. d'Ã©vÃ¨nement de communication</value>
+ <value xml:lang="it">Codice evento comunicazioni</value>
+ <value xml:lang="nl">Communication Event Id</value>
+ <value xml:lang="ro">Cod Eveniment Comunicatii i</value>
+ <value xml:lang="ru">ÐÐ¾Ð´ ÑÐ¾Ð±ÑÑÐ¸Ñ ÑÐ²ÑÐ·Ð¸</value>
+ <value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸¥à¸¥à¸±à¸à¸à¹à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸ªà¸·à¹à¸à¸ªà¸²à¸£</value>
<value xml:lang="zh">æ²éäºä»¶æ è¯</value>
</property>
<property key="FormFieldTitle_communicationEventPrpTypId">
@@ -175,7 +153,7 @@
<value xml:lang="en">Comm.Type Id</value>
<value xml:lang="es">CÃ³digo Tipo de evento de comunicaciÃ³n</value>
<value xml:lang="fr">RÃ©f. de type d'Ã©vÃ¨nement de communication</value>
- <value xml:lang="it">Tipo Evento Communicazioni</value>
+ <value xml:lang="it">Tipo evento communicazioni</value>
<value xml:lang="nl">Soort communicatie-actie</value>
<value xml:lang="ro">Tip Eveniment Comunicatii</value>
<value xml:lang="ru">ÐÐ¾Ð´ ÑÐ¸Ð¿Ð° ÐºÐ¾Ð¼Ð¼ÑÐ½Ð¸ÐºÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¾Ð±ÑÑÐ¸Ñ</value>
@@ -230,18 +208,6 @@
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸£à¸°à¹à¸ à¸à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value>
<value xml:lang="zh">èç³»æ¹å¼ç±»åæ è¯</value>
</property>
- <property key="FormFieldTitle_contentId">
- <value xml:lang="de">Inhalt ID</value>
- <value xml:lang="en">Content Id</value>
- <value xml:lang="es">CÃ³digo Contenido</value>
- <value xml:lang="fr">RÃ©f. de contenu</value>
- <value xml:lang="it">Codice Contenuto</value>
- <value xml:lang="nl">Content-ID</value>
- <value xml:lang="ro">Cod Contenut</value>
- <value xml:lang="ru">ÐÐ¾Ð´ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°</value>
- <value xml:lang="th">à¸£à¸«à¸±à¸ªà¸«à¸±à¸§à¸à¹à¸</value>
- <value xml:lang="zh">åå®¹æ è¯</value>
- </property>
<property key="FormFieldTitle_contentMimeTypeId">
<value xml:lang="de">Inhalt Mime Typ ID</value>
<value xml:lang="en">Content Mime Type Id</value>
@@ -253,18 +219,6 @@
<value xml:lang="th">à¸£à¸«à¸±à¸ªà¸à¸£à¸°à¹à¸ à¸à¸ªà¸³à¹à¸à¸²à¸«à¸±à¸§à¸à¹à¸</value>
<value xml:lang="zh">åå®¹Mimeç±»åæ è¯</value>
</property>
- <property key="FormFieldTitle_contentName">
- <value xml:lang="de">Inhalt Name</value>
- <value xml:lang="en">Content Name</value>
- <value xml:lang="es">Nombre de contenido</value>
- <value xml:lang="fr">Nom de contenu</value>
- <value xml:lang="it">Nome Contenuto</value>
- <value xml:lang="nl">Contentnaam</value>
- <value xml:lang="ro">Nume Contenut</value>
- <value xml:lang="ru">ÐÐ¼Ñ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°</value>
- <value xml:lang="th">à¸à¸·à¹à¸à¸«à¸±à¸§à¸à¹à¸</value>
- <value xml:lang="zh">åå®¹åç§°</value>
- </property>
<property key="FormFieldTitle_country">
<value xml:lang="de">Land</value>
<value xml:lang="en">Country</value>
@@ -3425,6 +3379,17 @@
<value xml:lang="th">ERROR: à¸à¸´à¸à¸à¸¥à¸²à¸ ! à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¸¥à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸µà¹à¹à¸à¹ (à¹à¸¡à¹à¸à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸à¸´à¸à¸à¹à¸à¸à¸à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹à¸à¸µà¹)</value>
<value xml:lang="zh">éè¯¯ï¼æ æ³å é¤èç³»ä¿¡æ¯ (æ²¡ææ¾å°ä¼åèç³»æ¹å¼)</value>
</property>
+ <property key="PartyContactMechs">
+ <value xml:lang="de">Kontaktmechanismus</value>
+ <value xml:lang="en">ContactMechs</value>
+ <value xml:lang="es">Mecanismos de Contacto</value>
+ <value xml:lang="fr">CoordonnÃ©es</value>
+ <value xml:lang="it">Contatto</value>
+ <value xml:lang="ro">Contact</value>
+ <value xml:lang="ru">Ð¡Ð¿Ð¾ÑÐ¾Ð±Ð¡Ð²ÑÐ·Ð¸</value>
+ <value xml:lang="th">à¸§à¸´à¸à¸µà¸à¸²à¸£à¸à¸´à¸à¸à¹à¸</value>
+ <value xml:lang="zh">èç³»æ¹å¼</value>
+ </property>
<property key="PartyContactMechType">
<value xml:lang="de">Kontaktmechanismus Typ</value>
<value xml:lang="en">Contact Mech Type</value>
@@ -4322,6 +4287,17 @@
<value xml:lang="th">à¸à¸±à¸à¸à¸µà¸à¸à¸²à¸à¸²à¸£</value>
<value xml:lang="zh">çµåèµéè½¬è´¦è´¦æ·</value>
</property>
+ <property key="PartyEmailAddress">
+ <value xml:lang="de">E-Mail Adresse</value>
+ <value xml:lang="en">E-Mail Address</value>
+ <value xml:lang="es">DirecciÃ³n de E-Mail</value>
+ <value xml:lang="fr">Adresse courriel</value>
+ <value xml:lang="it">Indirizzo E-Mail</value>
+ <value xml:lang="ro">Adresa E-Mail</value>
+ <value xml:lang="ru">ÐÐ´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ</value>
+ <value xml:lang="th">à¸à¸µà¹à¸à¸¢à¸¹à¹à¸à¸µà¹à¸¡à¸¥</value>
+ <value xml:lang="zh">çµåé®ä»¶å°å</value>
+ </property>
<property key="PartyEmailAddresses">
<value xml:lang="cs">E-mailovÃ© adresy</value>
<value xml:lang="de">E-Mail Adressen</value>

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.xml?rev=730853&r1=730852&r2=730853&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels.xml Fri Jan 2 14:28:35 2009
@@ -17,7 +17,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<property key="CostComponentType.description.ACTUAL_LABOR_COST">
<value xml:lang="de">Effektive Arbeitskosten</value>
<value xml:lang="en">Actual Labor Cost</value>
@@ -2389,4 +2390,4 @@
<value xml:lang="th">à¸à¸à¸à¹à¸à¸·à¹à¸à¸</value>
<value xml:lang="zh">è¢«ç</value>
</property>
-</resource>
+</resource>
\ No newline at end of file