You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/11/27 11:59:24 UTC

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

Modified: ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl (original)
+++ ofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl Sat Nov 27 10:59:21 2010
@@ -269,10 +269,10 @@ function lookupBom() {
         <td>&nbsp;${(assocFromProduct.estimateCalcMethod)?if_exists}</td>
         <td>&nbsp;${(assocFromProduct.routingWorkEffortId)?if_exists}</td>
         <td>
-        <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
+        <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a>
         </td>
         <td>
-        <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
+        <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
         </td>
       </tr>
       <#-- toggle the row color -->

Modified: ofbiz/branches/jquery/applications/marketing/config/MarketingEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/marketing/config/MarketingEntityLabels.xml?rev=1039651&r1=1039650&r2=1039651&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/marketing/config/MarketingEntityLabels.xml (original)
+++ ofbiz/branches/jquery/applications/marketing/config/MarketingEntityLabels.xml Sat Nov 27 10:59:21 2010
@@ -29,6 +29,7 @@
         <value xml:lang="ro">Anunturi</value>
         <value xml:lang="th">การประกาศ</value>
         <value xml:lang="zh">声明</value>
+        <value xml:lang="zh_TW">聲明</value>
     </property>
     <property key="ContactListType.description.MARKETING">
         <value xml:lang="en">Marketing</value>
@@ -40,6 +41,7 @@
         <value xml:lang="ro">Vanzari</value>
         <value xml:lang="th">การตลาด</value>
         <value xml:lang="zh">市场宣传</value>
+        <value xml:lang="zh_TW">行銷</value>
     </property>
     <property key="ContactListType.description.NEWSLETTER">
         <value xml:lang="en">Newsletter</value>
@@ -51,6 +53,7 @@
         <value xml:lang="ro">Noutati</value>
         <value xml:lang="th">จดหมายข่าว</value>
         <value xml:lang="zh">新闻</value>
+        <value xml:lang="zh_TW">新聞</value>
     </property>
     <property key="SegmentGroupType.description.MARKET_SEGMENT">
         <value xml:lang="en">Market Segment</value>
@@ -62,6 +65,7 @@
         <value xml:lang="ro">Segment de Piata</value>
         <value xml:lang="th">ส่วนของการตลาด</value>
         <value xml:lang="zh">市场分区</value>
+        <value xml:lang="zh_TW">行銷分區</value>
     </property>
     <property key="SegmentGroupType.description.SALES_SEGMENT">
         <value xml:lang="en">Sales Segment</value>
@@ -73,12 +77,14 @@
         <value xml:lang="ro">Segment de Vanzare</value>
         <value xml:lang="th">ส่วนของการขาย</value>
         <value xml:lang="zh">销售分区</value>
+        <value xml:lang="zh_TW">銷售分區</value>
     </property>
     <property key="TrackingCodeType.description.ACCESS">
         <value xml:lang="en">Access Code</value>
         <value xml:lang="it">Codice di accesso</value>
         <value xml:lang="pt_BR">Código de acesso</value>
         <value xml:lang="zh">访问码</value>
+        <value xml:lang="zh_TW">存取碼</value>
     </property>
     <property key="TrackingCodeType.description.EXTERNAL">
         <value xml:lang="en">External</value>
@@ -90,6 +96,7 @@
         <value xml:lang="ro">Extern</value>
         <value xml:lang="th">ภายนอก</value>
         <value xml:lang="zh">外部</value>
+        <value xml:lang="zh_TW">外部</value>
     </property>
     <property key="TrackingCodeType.description.INTERNAL">
         <value xml:lang="en">Internal</value>
@@ -101,6 +108,7 @@
         <value xml:lang="ro">Intern</value>
         <value xml:lang="th">ภายใน</value>
         <value xml:lang="zh">内部</value>
+        <value xml:lang="zh_TW">內部</value>
     </property>
     <property key="TrackingCodeType.description.PARTNER_MGD">
         <value xml:lang="en">Partner Managed</value>
@@ -112,5 +120,6 @@
         <value xml:lang="ro">Gestit de un Partener</value>
         <value xml:lang="th">หุ้นส่วนการควบคุม</value>
         <value xml:lang="zh">已管理的伙伴</value>
+        <value xml:lang="zh_TW">夥伴</value>
     </property>
 </resource>