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 2013/12/28 23:12:52 UTC

svn commit: r1553940 [6/8] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/config/ applications/commonext/config/ applications/content/config/ applications/manufacturing/webapp/manufacturing/bom/ applications/...

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/config/PartyUiLabels.xml Sat Dec 28 22:12:50 2013
@@ -3326,7 +3326,6 @@
         <value xml:lang="zh_TW">匹配</value>
     </property>
     <property key="PartyAdjustInAccountingComponent">
-        <value xml:lang="de"></value>
         <value xml:lang="en">Adjust in accounting component</value>
         <value xml:lang="fr">Ajuster en comptabilité</value>
         <value xml:lang="hi_IN">लेखांकन घटक(accounting component) में समायोजित करें</value>
@@ -4611,7 +4610,7 @@
         <value xml:lang="hi_IN">सम्पर्क सूची</value>
         <value xml:lang="it">Liste contatti</value>
         <value xml:lang="ja">連絡リスト</value>
-        <value xml:lang="nl">Kontactlijsten</value>
+        <value xml:lang="nl">Contactlijsten</value>
         <value xml:lang="pt_BR">Lista de contatos</value>
         <value xml:lang="ro">Liste Contacte</value>
         <value xml:lang="ru">Список контактов</value>
@@ -4628,7 +4627,7 @@
         <value xml:lang="hi_IN">सम्पर्क Mech ID नही है</value>
         <value xml:lang="it">Codice Contatto mancante</value>
         <value xml:lang="ja">連絡方法IDが正しくありません</value>
-        <value xml:lang="nl">Kontact Mechanisme ID mist</value>
+        <value xml:lang="nl">Contact Mechanisme ID ontbreekt</value>
         <value xml:lang="pt_BR">Id do mecanismo de contato faltando</value>
         <value xml:lang="pt_PT">Identificação do Modo de Contacto em Falta</value>
         <value xml:lang="ro">Contact Mech Cod lipseste</value>
@@ -4877,7 +4876,7 @@
         <value xml:lang="hi_IN">सम्पर्क नम्बर नही है</value>
         <value xml:lang="it">Contatto telefonico mancante</value>
         <value xml:lang="ja">連絡電話番号が正しくありません</value>
-        <value xml:lang="nl">Kontact telefoonnummer mist</value>
+        <value xml:lang="nl">Telefoonnummer contact ontbreekt</value>
         <value xml:lang="pt_BR">Telefone para contato está faltando</value>
         <value xml:lang="pt_PT">Telefone de Contacto em Falta</value>
         <value xml:lang="ro">Telefon Contact lipseste </value>
@@ -11844,7 +11843,7 @@
         <value xml:lang="hi_IN">कर(tax) क्रमांक</value>
         <value xml:lang="it">ID Tasse</value>
         <value xml:lang="ja">税務ID</value>
-        <value xml:lang="nl">BTW nummer</value>
+        <value xml:lang="nl">BTW nr.</value>
         <value xml:lang="pt_BR">ID de imposto</value>
         <value xml:lang="ro">ID Taxe</value>
         <value xml:lang="ru">Налоговый код</value>
@@ -12253,22 +12252,8 @@
         <value xml:lang="zh">无法定位目的；不能删除</value>
     </property>
     <property key="PartyURI">
-        <value xml:lang="de">URI</value>
         <value xml:lang="en">URI</value>
-        <value xml:lang="es">URI</value>
-        <value xml:lang="fr">URI</value>
         <value xml:lang="hi_IN">यूआरआइ(URI)</value>
-        <value xml:lang="it">URI</value>
-        <value xml:lang="ja">URI</value>
-        <value xml:lang="nl">URI</value>
-        <value xml:lang="pt_BR">URI</value>
-        <value xml:lang="pt_PT">URI</value>
-        <value xml:lang="ro">URI</value>
-        <value xml:lang="ru">URI</value>
-        <value xml:lang="th">URI</value>
-        <value xml:lang="vi">URI</value>
-        <value xml:lang="zh">URI</value>
-        <value xml:lang="zh_TW">URI</value>
     </property>
     <property key="PartyUnknown">
         <value xml:lang="de">Unbekannt</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl Sat Dec 28 22:12:50 2013
@@ -19,7 +19,7 @@ under the License.
 
 <div style="border-bottom: 1px solid #ccc; margin-bottom: 20px">
     <p>
-        <b>${uiLabelMap.AccountingAccountNumber}:</b> <a href="/accounting/control/EditFinAccount?finAccountId=${ownedFinAccount.finAccountId}${externalKeyParam}"
+        <b>${uiLabelMap.AccountingAccountNumber}:</b> <a href="/accounting/control/EditFinAccount?finAccountId=${ownedFinAccount.finAccountId}${StringUtil.wrapString(externalKeyParam)}"
              class="smallSubmit">${ownedFinAccount.finAccountId}</a>
         <b>${uiLabelMap.AccountingAccountType}:</b> ${(ownedFinAccountType.description)?default('N/A')}
         <b>${uiLabelMap.FormFieldTitle_finAccountName}:</b> ${ownedFinAccount.finAccountName?if_exists}

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Sat Dec 28 22:12:50 2013
@@ -81,7 +81,7 @@ under the License.
                 </td>
                 <td class="button-col">
                   <#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
-                    <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">${uiLabelMap.PartyManualTx}</a>
+                    <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyManualTx}</a>
                   </#if>
                   <#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)>
                     <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductEntityLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductEntityLabels.xml Sat Dec 28 22:12:50 2013
@@ -371,18 +371,7 @@
         <value xml:lang="zh_TW">谷歌用戶名</value>
     </property>
     <property key="GoodIdentificationType.description.ISBN">
-        <value xml:lang="de">ISBN</value>
         <value xml:lang="en">ISBN</value>
-        <value xml:lang="es">ISBN</value>
-        <value xml:lang="fr">ISBN</value>
-        <value xml:lang="it">ISBN</value>
-        <value xml:lang="ja">ISBN</value>
-        <value xml:lang="ro">ISBN</value>
-        <value xml:lang="ru">ISBN</value>
-        <value xml:lang="th">ISBN</value>
-        <value xml:lang="vi">ISBN</value>
-        <value xml:lang="zh">ISBN</value>
-        <value xml:lang="zh_TW">ISBN</value>
     </property>
     <property key="GoodIdentificationType.description.MANUFACTURER_ID_NO">
         <value xml:lang="de">Hersteller (Modell) Nummer</value>
@@ -444,29 +433,21 @@
         <value xml:lang="de">Barcode UPCA</value>
         <value xml:lang="en">UPCA</value>
         <value xml:lang="es">Código de barra UPCA</value>
-        <value xml:lang="fr">UPCA</value>
+        <value xml:lang="fr">Code barre UPCA</value>
         <value xml:lang="it">Codice a barre UPCA</value>
-        <value xml:lang="ja">UPCA</value>
         <value xml:lang="ro">Cod Bare UPCA</value>
-        <value xml:lang="ru">UPCA</value>
-        <value xml:lang="th">UPCA</value>
-        <value xml:lang="vi">UPCA</value>
         <value xml:lang="zh">UPCA条码</value>
-        <value xml:lang="zh_TW">UPCA條碼</value>
+        <value xml:lang="zh_TW">UPCA條碼</value>        
     </property>
     <property key="GoodIdentificationType.description.UPCE">
         <value xml:lang="de">Barcode UPCE</value>
         <value xml:lang="en">UPCE</value>
         <value xml:lang="es">Código de barra UPCE</value>
-        <value xml:lang="fr">UPCE</value>
+        <value xml:lang="fr">Code barre UPCE</value>
         <value xml:lang="it">Codice a barre UPCE</value>
-        <value xml:lang="ja">UPCE</value>
         <value xml:lang="ro">Cod Bare UPCE</value>
-        <value xml:lang="ru">UPCE</value>
-        <value xml:lang="th">UPCE</value>
-        <value xml:lang="vi">UPCE</value>
         <value xml:lang="zh">UPCE条码</value>
-        <value xml:lang="zh_TW">UPCE條碼</value>
+        <value xml:lang="zh_TW">UPCE條碼</value>        
     </property>
     <property key="InventoryItemType.description.NON_SERIAL_INV_ITEM">
         <value xml:lang="de">ohne Seriennummern</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml Sat Dec 28 22:12:50 2013
@@ -580,10 +580,6 @@
     </property>
     <property key="FacilityShipmentDhlLabelImageFormatPng">
         <value xml:lang="en">PNG</value>
-        <value xml:lang="it">PNG</value>
-        <value xml:lang="ja">PNG</value>
-        <value xml:lang="vi">PNG</value>
-        <value xml:lang="zh">PNG</value>
     </property>
     <property key="FacilityShipmentDhlMultiplePackagesNotSupported">
         <value xml:lang="en">Cannot confirm shipment: DHL ShipIT does not currently support more than one package per shipment.</value>
@@ -944,17 +940,9 @@
     </property>
     <property key="FacilityShipmentFedexLabelImageTypePdf">
         <value xml:lang="en">PDF</value>
-        <value xml:lang="it">PDF</value>
-        <value xml:lang="ja">PDF</value>
-        <value xml:lang="vi">PDF</value>
-        <value xml:lang="zh">PDF</value>
     </property>
     <property key="FacilityShipmentFedexLabelImageTypePng">
         <value xml:lang="en">PNG</value>
-        <value xml:lang="it">PNG</value>
-        <value xml:lang="ja">PNG</value>
-        <value xml:lang="vi">PNG</value>
-        <value xml:lang="zh">PNG</value>
     </property>
     <property key="FacilityShipmentFedexMeterNumberAlreadyExists">
         <value xml:lang="en">MeterNumber already exists: ${meterNumber}</value>
@@ -11439,7 +11427,7 @@
         <value xml:lang="zh_TW">添加總賬賬戶</value>
     </property>
     <property key="ProductAddGroupOrder">
-        <value xml:lang="en">Add GroupOrder</value>
+        <value xml:lang="en">Add Group Order</value>
         <value xml:lang="ja">グループ注文を追加</value>
         <value xml:lang="vi">Thêm Nhóm đặt hàng</value>
         <value xml:lang="zh">添加订单组</value>
@@ -15021,16 +15009,8 @@
         <value xml:lang="zh_TW">客戶評級</value>
     </property>
     <property key="ProductDL">
-        <value xml:lang="de">DL</value>
         <value xml:lang="en">DL</value>
-        <value xml:lang="es">DL</value>
         <value xml:lang="fr">Eff.</value>
-        <value xml:lang="it">DL</value>
-        <value xml:lang="ja">DL</value>
-        <value xml:lang="ro">DL</value>
-        <value xml:lang="ru">DL</value>
-        <value xml:lang="th">DL</value>
-        <value xml:lang="vi">DL</value>
         <value xml:lang="zh">效率</value>
         <value xml:lang="zh_TW">效率</value>
     </property>
@@ -15647,7 +15627,7 @@
         <value xml:lang="zh_TW">特性分類的特性修改</value>
     </property>
     <property key="ProductEditGroupOrder">
-        <value xml:lang="en">Edit GroupOrder</value>
+        <value xml:lang="en">Edit Group Order</value>
         <value xml:lang="ja">グループ注文を編集</value>
         <value xml:lang="zh">编辑订单组</value>
     </property>
@@ -17615,7 +17595,8 @@
         <value xml:lang="zh_TW">組成員維護</value>
     </property>
     <property key="ProductGroupOrder">
-        <value xml:lang="en">GroupOrder</value>
+        <value xml:lang="en">Group Order</value>
+        <value xml:lang="fr">Groupe de commandes</value>
         <value xml:lang="ja">グループ注文</value>
         <value xml:lang="vi">Nhóm đặt hàng</value>
         <value xml:lang="zh">订单组</value>
@@ -21775,7 +21756,6 @@
         <value xml:lang="es">NOTA: El flag "Requerir E-mail" está configurado como N (No). Cualquier dirección de e-mail o participantes listados aquí serán ignorados. Para usar alguna de estas direcciones, debe configurar el flag a Y(Si)</value>
         <value xml:lang="fr">NOTE: Pour rendre obligatoire et prendre en compte le champ acteur ou courriel, cocher (O), sinon mettre (N)</value>
         <value xml:lang="it">NOTA: L'email richiesta o se il flag soggetto è impostato a N (No), così qualsiasi indirizzo email o soggetti listati qui saranno ignorati. Per richiedere un'indirizzo email o il soggetto da queste liste, imposta il flag a Y (Si).</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="ro">NOTA: Email-ul cerut O daca flag Subiect este setat N (Nu), asa ca orice adresa email sau Subiectii listati aici vor fi ignorati. Pentru a cere o adresa email sau Subiectul din aceste liste, seteaza flag Y (Da).</value>
         <value xml:lang="ru">ПРИМЕЧАНИЕ: Флаги Требуется Email или Участник установлены в Н (Нет), поэтому все перечисленные адреса и участники будут проигнорированы. Если требуются адреса эл.почты или участники из этих списков, установите флаг в Д (Да).</value>
         <value xml:lang="vi">Ghi chú: Hệ thống yêu cầu phải có thông tin địa chỉ thư điện tử của người dùng</value>
@@ -26537,11 +26517,8 @@
     </property>
     <property key="ProductST">
         <value xml:lang="en">ST</value>
-        <value xml:lang="es">ST</value>
         <value xml:lang="fr">Dates</value>
-        <value xml:lang="ja">ST</value>
         <value xml:lang="vi">Ngày</value>
-        <value xml:lang="it">ST</value>
         <value xml:lang="zh">销售终止</value>
     </property>
     <property key="ProductSaleRule">
@@ -27878,20 +27855,10 @@
         <value xml:lang="zh">英寸</value>
     </property>
     <property key="ProductShipmentUomAbbreviation_WT_g">
-        <value xml:lang="de">g</value>
         <value xml:lang="en">g</value>
-        <value xml:lang="es">g</value>
-        <value xml:lang="fr">g</value>
-        <value xml:lang="it">g</value>
-        <value xml:lang="ja">g</value>
     </property>
     <property key="ProductShipmentUomAbbreviation_WT_kg">
-        <value xml:lang="de">kg</value>
         <value xml:lang="en">kg</value>
-        <value xml:lang="es">kg</value>
-        <value xml:lang="fr">kg</value>
-        <value xml:lang="it">kg</value>
-        <value xml:lang="ja">kg</value>
         <value xml:lang="ru">кг</value>
         <value xml:lang="th">กิโลกรัม</value>
         <value xml:lang="vi">cân</value>
@@ -27906,8 +27873,6 @@
         <value xml:lang="it">libre</value>
         <value xml:lang="ja">ポンド</value>
         <value xml:lang="ru">фнт</value>
-        <value xml:lang="th">lbs</value>
-        <value xml:lang="vi">lbs</value>
         <value xml:lang="zh">磅</value>
         <value xml:lang="zh_TW">磅</value>
     </property>
@@ -29044,10 +29009,7 @@
     </property>
     <property key="ProductTD">
         <value xml:lang="en">TD</value>
-        <value xml:lang="es">TD</value>
         <value xml:lang="fr">Assoc.</value>
-        <value xml:lang="it">TD</value>
-        <value xml:lang="ja">TD</value>
         <value xml:lang="zh">特征结束日期</value>
     </property>
     <property key="ProductTag">
@@ -29693,9 +29655,6 @@
     <property key="ProductUPCA">
         <value xml:lang="en">UPCA</value>
         <value xml:lang="fr">CUP (UPC-A)</value>
-        <value xml:lang="it">UPCA</value>
-        <value xml:lang="ja">UPCA</value>
-        <value xml:lang="vi">UPCA</value>
         <value xml:lang="zh">UPC-A条码</value>
     </property>
     <property key="ProductUnitOfMeasure">
@@ -30345,6 +30304,7 @@
     </property>
     <property key="ProductVerifyPick">
         <value xml:lang="en">Verify Pick</value>
+        <value xml:lang="fr">Vérifier le prélèvement</value>
         <value xml:lang="it">Verifica prelievo</value>
         <value xml:lang="ja">ピッキングを確認</value>
         <value xml:lang="vi">Xác minh Xử lý đặt hàng (Pick)</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Sat Dec 28 22:12:50 2013
@@ -24,7 +24,7 @@ under the License.
     </div>
     <div class="screenlet-body">
         <#if productId?has_content>
-            <a href="/facility/control/EditInventoryItem?productId=${productId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductCreateNewInventoryItemProduct}</a>
+            <a href="/facility/control/EditInventoryItem?productId=${productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductCreateNewInventoryItemProduct}</a>
             <#if showEmpty>
                 <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductHideEmptyItems}</a>
             <#else>
@@ -61,7 +61,7 @@ under the License.
                     <#assign inventoryItemDetailFirst = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(inventoryItem.getRelated("InventoryItemDetail", null, Static["org.ofbiz.base.util.UtilMisc"].toList("effectiveDate"), false))?if_exists>
                     <#if curInventoryItemType?exists>
                         <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
-                            <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)?if_exists}${externalKeyParam}" class="buttontext">${(inventoryItem.inventoryItemId)?if_exists}</a></td>
+                            <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${(inventoryItem.inventoryItemId)?if_exists}</a></td>
                             <td>&nbsp;${(curInventoryItemType.get("description",locale))?if_exists}</td>
                             <td>
                                 <div>
@@ -80,13 +80,13 @@ under the License.
                                 <td style="color: red;">${uiLabelMap.ProductErrorFacility} (${inventoryItem.facilityId})
                                     ${uiLabelMap.ProductAndContainer} (${inventoryItem.containerId}) ${uiLabelMap.CommonSpecified}</td>
                             <#elseif inventoryItem.facilityId?exists>
-                                <td>${uiLabelMap.ProductFacilityLetter}:&nbsp;<a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${externalKeyParam}" class="linktext">${inventoryItem.facilityId}</a></td>
+                                <td>${uiLabelMap.ProductFacilityLetter}:&nbsp;<a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${StringUtil.wrapString(externalKeyParam)}" class="linktext">${inventoryItem.facilityId}</a></td>
                             <#elseif (inventoryItem.containerId)?exists>
                                 <td>${uiLabelMap.ProductContainerLetter}:&nbsp;<a href="<@ofbizUrl>EditContainer?containerId=${inventoryItem.containerId }</...@ofbizUrl>" class="linktext">${inventoryItem.containerId}</a></td>
                             <#else>
                                 <td>&nbsp;</td>
                             </#if>
-                            <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&amp;locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${externalKeyParam}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></td>
+                            <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&amp;locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></td>
                             <td>&nbsp;${(inventoryItem.lotId)?if_exists}</td>
                             <td>&nbsp;${(inventoryItem.binNumber)?if_exists}</td>
                             <td align="right"><@ofbizCurrency amount=inventoryItem.unitCost isoCode=inventoryItem.currencyUomId/></td>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/PicklistOptions.ftl Sat Dec 28 22:12:50 2013
@@ -273,14 +273,14 @@ under the License.
             <#assign orderProduct = oiasga.getRelatedOne("OrderItem", false).getRelatedOne("Product", false)?if_exists>
             <#assign product = oiasga.getRelatedOne("InventoryItem", false).getRelatedOne("Product", false)?if_exists>
             <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-              <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}" class="buttontext" target="_blank">${oiasga.orderId}</a></td>
+              <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${oiasga.orderId}</a></td>
               <td>${header.orderDate?string}</td>
               <td>${(channel.description)?if_exists}</td>
               <td>${oiasga.orderItemSeqId}</td>
               <td>
-                <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
+                <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
                 <#if orderProduct.productId != product.productId>
-                  &nbsp;[<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
+                  &nbsp;[<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
                 </#if>
               </td>
               <td>${oiasga.shipGroupSeqId}</td>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/inventory/receiveInventory.ftl Sat Dec 28 22:12:50 2013
@@ -403,7 +403,7 @@ under the License.
                             <td width="45%">
                                 <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}&nbsp;&nbsp;
                                 <input type="text" size="12" name="productId_o_${rowCount}"/>
-                                <a href="/catalog/control/EditProduct?${externalKeyParam}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
+                                <a href="/catalog/control/EditProduct?${StringUtil.wrapString(externalKeyParam)}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
                             </td>
                           </#if>
                           <td align="right">${uiLabelMap.ProductLocation}:</td>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/returns/receiveReturn.ftl Sat Dec 28 22:12:50 2013
@@ -120,7 +120,7 @@ under the License.
                               <div>
                                 ${returnItem.returnItemSeqId}:&nbsp;<b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}&nbsp;&nbsp;
                                 <input type="text" size="12" name="productId_o_${rowCount}" />
-                                <a href="/catalog/control/EditProduct?${externalKeyParam}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
+                                <a href="/catalog/control/EditProduct?${StringUtil.wrapString(externalKeyParam)}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
                               </div>
                             </td>
                           <#else>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/PackOrder.ftl Sat Dec 28 22:12:50 2013
@@ -58,8 +58,8 @@ under the License.
                     <ul>
                     <#list invoiceIds as invoiceId>
                       <li>
-                        ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
-                        (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
+                        ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
+                        (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
                       </li>
                     </#list>
                     </ul>
@@ -295,9 +295,9 @@ under the License.
                               </#if>
                           </td>
                           <td>
-                              <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
+                              <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
                               <#if orderProduct.productId != product.productId>
-                                  &nbsp;[<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
+                                  &nbsp;[<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
                               </#if>
                           </td>
                           <td align="right">${orderItemQuantity}</td>
@@ -459,7 +459,7 @@ under the License.
                       <td>${line.getOrderItemSeqId()}</td>
                       <td>${line.getProductId()?default("N/A")}</td>
                       <td>
-                          <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
+                          <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
                       </td>
                       <td>${line.getInventoryItemId()}</td>
                       <td align="right">${line.getQuantity()}</td>
@@ -503,7 +503,7 @@ under the License.
                       <td>${line.getOrderItemSeqId()}</td>
                       <td>${line.getProductId()?default("N/A")}</td>
                       <td>
-                          <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
+                          <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
                       </td>
                       <td>${line.getInventoryItemId()}</td>
                       <td align="right">${line.getQuantity()}</td>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/VerifyPick.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/VerifyPick.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/VerifyPick.ftl Sat Dec 28 22:12:50 2013
@@ -39,8 +39,8 @@ under the License.
           <ul>
             <#list invoiceIds as invoiceId>
               <li>
-                ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
-                (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
+                ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
+                (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
               </li>
             </#list>
           </ul>
@@ -234,7 +234,7 @@ under the License.
                   <td>${orderItemSeqId?if_exists}</td>
                   <td>${product.productId?default("N/A")}</td>
                   <td>
-                    <a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>
+                    <a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>
                   </td>
                   <td>
                     <select name="geo_${rowKey}">

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/WeightPackage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/WeightPackage.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/shipment/WeightPackage.ftl Sat Dec 28 22:12:50 2013
@@ -38,8 +38,8 @@ under the License.
               <ul>
                 <#list invoiceIds as invoiceId>
                   <li>
-                    ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
-                    (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
+                    ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
+                    (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
                   </li>
                 </#list>
               </ul>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/InventoryForms.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/InventoryForms.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/InventoryForms.xml Sat Dec 28 22:12:50 2013
@@ -34,15 +34,14 @@ under the License.
             </entity-one>
         </actions>
         <alt-target use-when="inventoryItemId==null" target="CreateInventoryItem"/>
-        <auto-fields-service service-name="updateInventoryItem" map-name="inventoryItem"/>
+        <auto-fields-service service-name="updateInventoryItem" map-name="inventoryItem"/>        
 
         <!-- ignored fields -->
         <field name="oldAvailableToPromise"><ignored/></field>
         <field name="oldQuantityOnHand"><ignored/></field>
-
+        
         <!-- custom formatted fields -->
-        <field use-when="inventoryItem!=null" name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field>
-        <field use-when="inventoryItem==null" name="inventoryItemId"><text/></field>
+        <field name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field>
         <field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="InventoryItemType" description="${description}" key-field-name="inventoryItemTypeId"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortEntityLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortEntityLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortEntityLabels.xml Sat Dec 28 22:12:50 2013
@@ -24,6 +24,7 @@
         <value xml:lang="fr">Taux horaire escompté</value>
         <value xml:lang="it">Percentuale oraria scontata</value>
         <value xml:lang="ja">割引時間給</value>
+        <value xml:lang="nl">Uurtarief - korting</value>
         <value xml:lang="ro">Procent Orar Redus</value>
         <value xml:lang="ru">Сниженные почасовые ставки</value>
         <value xml:lang="th">อัตราลดลงทุก ๆ ชั่วโมง</value>
@@ -36,6 +37,7 @@
         <value xml:lang="fr">Taux horaire des heures supplémentaires</value>
         <value xml:lang="it">Percentuale oraria straordinaria</value>
         <value xml:lang="ja">残業時間給</value>
+        <value xml:lang="nl">Uurtarief - overtime</value>
         <value xml:lang="ro">Procent Orar Straordinar</value>
         <value xml:lang="ru">Почасовые ставки при переработке</value>
         <value xml:lang="th">อัตราล่วงเวลาทุก ๆ ชั่วโมง</value>
@@ -48,6 +50,7 @@
         <value xml:lang="fr">Taux horaire standard</value>
         <value xml:lang="it">Percentuale oraria standard</value>
         <value xml:lang="ja">標準時間給</value>
+        <value xml:lang="nl">Uurtarief - standaard</value>
         <value xml:lang="ro">Procent Orar Standard</value>
         <value xml:lang="ru">Стандартные почасовые ставки</value>
         <value xml:lang="th">อัตรามาตรฐานทุก ๆ ชั่วโมง</value>
@@ -55,11 +58,16 @@
         <value xml:lang="zh">标准小时价格</value>
         <value xml:lang="zh_TW">標准小時價格</value>
     </property>
+    <property key="RateType.description.FLC">
+        <value xml:lang="en">Hourly rate - Fully loaded costprice</value>
+        <value xml:lang="nl">Uurtarief - FLC</value>
+    </property>
     <property key="WorkEffortAssocType.description.ROUTING_COMPONENT">
         <value xml:lang="en">Routing and Routing Task Association</value>
         <value xml:lang="fr">Routage et association de tâche de routage</value>
         <value xml:lang="it">Associazione rotta e rotta compito</value>
         <value xml:lang="ja">ルーティングとタスク関連付けのルーティング</value>
+        <value xml:lang="nl">Koppeling schema-taak</value>
         <value xml:lang="ru">Связи между маршрутизацией и задачами маршрутизации</value>
         <value xml:lang="th">Routing และ Routing กลุ่มภารกิจ</value>
         <value xml:lang="vi">Quy trình và các Tác vụ - Đầu việc của quy trình</value>
@@ -72,6 +80,7 @@
         <value xml:lang="fr">Détail/Ventilation</value>
         <value xml:lang="it">Interruzione/Dettaglio</value>
         <value xml:lang="ja">ブレークダウン/詳細</value>
+        <value xml:lang="nl">Break down/detail</value>
         <value xml:lang="ro">Intrerupere/Detaliu</value>
         <value xml:lang="ru">Поломка/Подробно</value>
         <value xml:lang="th">การวิเคราะห์/รายละเอียด</value>
@@ -85,6 +94,7 @@
         <value xml:lang="fr">Simultanéité</value>
         <value xml:lang="it">Concorrenza</value>
         <value xml:lang="ja">多重度</value>
+        <value xml:lang="nl">Gelijktijdig/parallel</value>
         <value xml:lang="ro">Concurenta</value>
         <value xml:lang="ru">Конкуренция</value>
         <value xml:lang="th">การเกิดขึ้นในเวลาเดียวกัน</value>
@@ -98,6 +108,7 @@
         <value xml:lang="fr">Dépendance</value>
         <value xml:lang="it">Dipendenza</value>
         <value xml:lang="ja">依存度</value>
+        <value xml:lang="nl">Afhankelijkheid</value>
         <value xml:lang="ro">Dependenta</value>
         <value xml:lang="ru">Зависимость</value>
         <value xml:lang="th">ส่วนเพิ่มเติม</value>
@@ -111,6 +122,7 @@
         <value xml:lang="fr">Phase</value>
         <value xml:lang="it">Fase</value>
         <value xml:lang="ja">フェーズ</value>
+        <value xml:lang="nl">Fase</value>
         <value xml:lang="th">ขั้นตอน</value>
         <value xml:lang="vi">Pha</value>
         <value xml:lang="zh">阶段</value>
@@ -122,6 +134,7 @@
         <value xml:lang="fr">Priorité</value>
         <value xml:lang="it">Precedenza</value>
         <value xml:lang="ja">先行度</value>
+        <value xml:lang="nl">Voorloop</value>
         <value xml:lang="ro">Precedenta</value>
         <value xml:lang="ru">Преимущество</value>
         <value xml:lang="th">Precedency</value>
@@ -135,6 +148,7 @@
         <value xml:lang="fr">Tâche</value>
         <value xml:lang="it">Compito</value>
         <value xml:lang="ja">タスク</value>
+        <value xml:lang="nl">Taak</value>
         <value xml:lang="th">ภารกิจ</value>
         <value xml:lang="vi">Tác vụ - Đầu việc</value>
         <value xml:lang="zh">任务</value>
@@ -146,6 +160,7 @@
         <value xml:lang="it">Template di</value>
         <value xml:lang="ja">テンプレート:</value>
         <value xml:lang="ro">Template de</value>
+        <value xml:lang="nl">Template:</value>
         <value xml:lang="ru">Шаблон</value>
         <value xml:lang="th">ของเทมเพลต</value>
         <value xml:lang="vi">Biểu mẫu dành cho</value>
@@ -157,6 +172,7 @@
         <value xml:lang="fr">Assemblage</value>
         <value xml:lang="it">Assemblaggio</value>
         <value xml:lang="ja">組立中</value>
+        <value xml:lang="nl">Assemblage</value>
         <value xml:lang="ro">Asamblare</value>
         <value xml:lang="ru">Монтаж</value>
         <value xml:lang="th">การรวมกลุ่ม</value>
@@ -169,6 +185,7 @@
         <value xml:lang="fr">Fabrication</value>
         <value xml:lang="it">Produzione</value>
         <value xml:lang="ja">生産中</value>
+        <value xml:lang="nl">Fabricage</value>
         <value xml:lang="ro">Productie</value>
         <value xml:lang="ru">Производство</value>
         <value xml:lang="th">การผลิต</value>
@@ -194,6 +211,7 @@
         <value xml:lang="fr">Déploiement</value>
         <value xml:lang="it">Distribuzione</value>
         <value xml:lang="ja">設置</value>
+        <value xml:lang="nl">Installatie</value>
         <value xml:lang="ro">Distributie</value>
         <value xml:lang="ru">Развертывание</value>
         <value xml:lang="th">แพร่กระจาย</value>
@@ -207,6 +225,7 @@
         <value xml:lang="fr">Développement</value>
         <value xml:lang="it">Sviluppo</value>
         <value xml:lang="ja">開発</value>
+        <value xml:lang="nl">Ontwikkeling</value>
         <value xml:lang="ro">Dezvoltare</value>
         <value xml:lang="ru">Совершенствование</value>
         <value xml:lang="th">การพัฒนา</value>
@@ -220,6 +239,7 @@
         <value xml:lang="fr">Maintenance</value>
         <value xml:lang="it">Manutenzione</value>
         <value xml:lang="ja">保守</value>
+        <value xml:lang="nl">Onderhoud</value>
         <value xml:lang="ro">Intretinere</value>
         <value xml:lang="ru">Обслуживание</value>
         <value xml:lang="th">การบำรุงรักษา</value>
@@ -233,6 +253,7 @@
         <value xml:lang="fr">Réunion</value>
         <value xml:lang="it">Incontro</value>
         <value xml:lang="ja">会議</value>
+        <value xml:lang="nl">Bijeenkomst</value>
         <value xml:lang="ro">Intalnire</value>
         <value xml:lang="ru">Встреча</value>
         <value xml:lang="th">พบประสังสรรค์</value>
@@ -246,6 +267,7 @@
         <value xml:lang="fr">Phase</value>
         <value xml:lang="it">Fase</value>
         <value xml:lang="ja">フェーズ</value>
+        <value xml:lang="nl">Fase</value>
         <value xml:lang="ro">Faze</value>
         <value xml:lang="ru">Этап</value>
         <value xml:lang="th">ขั้นตอน</value>
@@ -259,6 +281,7 @@
         <value xml:lang="fr">Ordre de fabrication</value>
         <value xml:lang="it">Ciclo di produzione</value>
         <value xml:lang="ja">本番運用</value>
+        <value xml:lang="nl">Productierun</value>
         <value xml:lang="ro">Ciclu Productie</value>
         <value xml:lang="ru">Производственный прогон</value>
         <value xml:lang="th">ดำเนินการผลิต</value>
@@ -285,6 +308,7 @@
         <value xml:lang="fr">Recherche</value>
         <value xml:lang="it">Ricerca</value>
         <value xml:lang="ja">研究</value>
+        <value xml:lang="nl">Onderzoek</value>
         <value xml:lang="ro">Cautare</value>
         <value xml:lang="ru">Исследование</value>
         <value xml:lang="th">งานวิจัย</value>
@@ -298,6 +322,7 @@
         <value xml:lang="fr">Support</value>
         <value xml:lang="it">Supporto</value>
         <value xml:lang="ja">サポート</value>
+        <value xml:lang="nl">Support/ondersteuning</value>
         <value xml:lang="ro">Suport</value>
         <value xml:lang="ru">Поддержка</value>
         <value xml:lang="th">สนับสนุน</value>
@@ -336,6 +361,7 @@
         <value xml:lang="fr">Activité</value>
         <value xml:lang="it">Attività impegno di lavoro</value>
         <value xml:lang="ja">ワークフローの活動</value>
+        <value xml:lang="nl">Activiteit</value>
         <value xml:lang="ro">Activitati Sarcini de Lucru</value>
         <value xml:lang="ru">Действие Workflow</value>
         <value xml:lang="th">ขั้นตอนกิจกรรม</value>
@@ -348,6 +374,7 @@
         <value xml:lang="fr">Utilisation d'immobilisation (location)</value>
         <value xml:lang="it">Uso cespite (noleggio)</value>
         <value xml:lang="ja">固定資産の使用(レンタル)</value>
+        <value xml:lang="nl">Gebruik productiemiddel</value>
         <value xml:lang="ro">Folosire Mijloc Fix (inchiriat)</value>
         <value xml:lang="ru">Использование ОС (аренда)</value>
         <value xml:lang="th">การใช้ทรัพย์สินที่ไม่หมุนเวียน (การเช่า)</value>
@@ -362,6 +389,7 @@
         <value xml:lang="fr">Disponible</value>
         <value xml:lang="it">Disponibile</value>
         <value xml:lang="ja">可能</value>
+        <value xml:lang="nl">Beschikbaar</value>
         <value xml:lang="ro">Disponibil</value>
         <value xml:lang="ru">Доступный</value>
         <value xml:lang="th">สามารถใช้ประโยชน์ได้</value>
@@ -374,6 +402,7 @@
         <value xml:lang="fr">Voyage professionnel</value>
         <value xml:lang="it">Viaggio di lavoro</value>
         <value xml:lang="ja">業務出張</value>
+        <value xml:lang="nl">Dienstreis</value>
         <value xml:lang="vi">Du lịch thương mại</value>
         <value xml:lang="zh">商务旅行</value>
         <value xml:lang="zh_TW">商務旅行</value>
@@ -393,6 +422,7 @@
         <value xml:lang="fr">Evènement</value>
         <value xml:lang="it">Evento</value>
         <value xml:lang="ja">イベント</value>
+        <value xml:lang="nl">Event/gebeurtenis</value>
         <value xml:lang="ro">Eveniment</value>
         <value xml:lang="ru">Событие</value>
         <value xml:lang="th">เหตุการณ์</value>
@@ -405,6 +435,7 @@
         <value xml:lang="fr">Réunion</value>
         <value xml:lang="it">Incontri</value>
         <value xml:lang="ja">会議</value>
+        <value xml:lang="nl">Bijeenkomst</value>
         <value xml:lang="vi">Cuộc họp</value>
         <value xml:lang="zh">会议</value>
         <value xml:lang="zh_TW">會議</value>
@@ -413,6 +444,7 @@
         <value xml:lang="en">Milestone</value>
         <value xml:lang="fr">Jalon</value>
         <value xml:lang="ja">マイルストーン</value>
+        <value xml:lang="nl">Mijlpaal</value>
         <value xml:lang="vi">Mốc thời gian</value>
         <value xml:lang="zh">里程碑</value>
     </property>
@@ -431,6 +463,7 @@
         <value xml:lang="fr">Phase de projet</value>
         <value xml:lang="it">Fase progetto</value>
         <value xml:lang="ja">プロジェクトフェーズ</value>
+        <value xml:lang="nl">Fase</value>
         <value xml:lang="ro">Faze Proiect</value>
         <value xml:lang="ru">Этап проекта</value>
         <value xml:lang="th">ขั้นตอน</value>
@@ -443,6 +476,7 @@
         <value xml:lang="fr">Modèle de phase de projet</value>
         <value xml:lang="it">Fase progetto template</value>
         <value xml:lang="ja">プロジェクトフェーズテンプレート</value>
+        <value xml:lang="nl">Fase template</value>
         <value xml:lang="vi">Mẫu pha dự án</value>
         <value xml:lang="zh">项目阶段模板</value>
         <value xml:lang="zh_TW">專案階段範本</value>
@@ -452,6 +486,7 @@
         <value xml:lang="fr">En-tête d'ordre de fabrication</value>
         <value xml:lang="it">Testata ciclo di produzione</value>
         <value xml:lang="ja">本番運用ヘッダ</value>
+        <value xml:lang="nl">Header productierun</value>
         <value xml:lang="ro">Antet Cliclu Productie</value>
         <value xml:lang="ru">Заголовок произв. прогона</value>
         <value xml:lang="th">หัวข้อดำเนินการการผลิต</value>
@@ -464,6 +499,7 @@
         <value xml:lang="fr">Tâche d'ordre de fabrication</value>
         <value xml:lang="it">Compito ciclo di produzione</value>
         <value xml:lang="ja">本番運用タスク</value>
+        <value xml:lang="nl">Taak productierun</value>
         <value xml:lang="ro">Tema Ciclu Productie</value>
         <value xml:lang="ru">Задача произв. прогона</value>
         <value xml:lang="th">งานดำเนินการการผลิต</value>
@@ -477,6 +513,7 @@
         <value xml:lang="fr">Programme</value>
         <value xml:lang="it">Programma</value>
         <value xml:lang="ja">プログラム</value>
+        <value xml:lang="nl">Programma</value>
         <value xml:lang="ro">Program</value>
         <value xml:lang="ru">Программа</value>
         <value xml:lang="th">โปรแกรม</value>
@@ -520,6 +557,7 @@
         <value xml:lang="fr">Routage</value>
         <value xml:lang="it">Rotta</value>
         <value xml:lang="ja">ルーティング</value>
+        <value xml:lang="nl">Schema (productie)</value>
         <value xml:lang="ro">Ruta</value>
         <value xml:lang="ru">Маршрутизация</value>
         <value xml:lang="th">Routing</value>
@@ -532,6 +570,7 @@
         <value xml:lang="fr">Tâche de routage</value>
         <value xml:lang="it">Compito rotta</value>
         <value xml:lang="ja">タスクのルーティング</value>
+        <value xml:lang="nl">Taak (productie)</value>
         <value xml:lang="ro">Tema Ruta</value>
         <value xml:lang="ru">Задача маршрутизации</value>
         <value xml:lang="th">งาน Routing </value>
@@ -545,6 +584,7 @@
         <value xml:lang="fr">Tâche</value>
         <value xml:lang="it">Compito</value>
         <value xml:lang="ja">タスク</value>
+        <value xml:lang="nl">Taak</value>
         <value xml:lang="ro">Tema</value>
         <value xml:lang="ru">Задача</value>
         <value xml:lang="th">งาน</value>
@@ -557,6 +597,7 @@
         <value xml:lang="fr">Modèle de tâche de projet</value>
         <value xml:lang="it">Compito progetto template</value>
         <value xml:lang="ja">プロジェクトタスクテンプレート</value>
+        <value xml:lang="nl">Taak template</value>
         <value xml:lang="vi">Biểu mẫu công việc dự án</value>
         <value xml:lang="zh">项目任务模板</value>
         <value xml:lang="zh_TW">專案任務範本</value>
@@ -597,6 +638,7 @@
         <value xml:lang="fr">Humain</value>
         <value xml:lang="it">Umano</value>
         <value xml:lang="ja">人</value>
+        <value xml:lang="nl">Mens</value>
         <value xml:lang="th">เกี่ยวกับคน</value>
         <value xml:lang="vi">NGƯỜI</value>
         <value xml:lang="zh">人</value>
@@ -608,6 +650,7 @@
         <value xml:lang="fr">Unité d'organisation</value>
         <value xml:lang="it">Unità organizzativa</value>
         <value xml:lang="ja">組織の単位</value>
+        <value xml:lang="nl">OU (organisatie-eenheid)</value>
         <value xml:lang="th">เกี่ยวกับองค์กร</value>
         <value xml:lang="vi">Đơn vị tổ chức</value>
         <value xml:lang="zh">组织机构单位</value>
@@ -619,6 +662,7 @@
         <value xml:lang="fr">Ressource</value>
         <value xml:lang="it">Risorsa</value>
         <value xml:lang="ja">リソース</value>
+        <value xml:lang="nl">Resource</value>
         <value xml:lang="th">แหล่งข้อมูล</value>
         <value xml:lang="vi">TÀI NGUYÊN</value>
         <value xml:lang="zh">资源</value>
@@ -641,6 +685,7 @@
         <value xml:lang="fr">Rôle</value>
         <value xml:lang="it">Ruolo</value>
         <value xml:lang="ja">ロール</value>
+        <value xml:lang="nl">Rol</value>
         <value xml:lang="th">สถานะ</value>
         <value xml:lang="vi">VAI TRÒ</value>
         <value xml:lang="zh">角色</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/workeffort/config/WorkEffortUiLabels.xml Sat Dec 28 22:12:50 2013
@@ -368,7 +368,6 @@
         <value xml:lang="fr">Code article</value>
         <value xml:lang="it">Codice prodotto</value>
         <value xml:lang="ja">製品ID</value>
-        <value xml:lang="nl">Produkt Id</value>
         <value xml:lang="ro">Cod Produs</value>
         <value xml:lang="th">รหัสสินค้า</value>
         <value xml:lang="vi">Sản phẩm</value>
@@ -2819,10 +2818,7 @@
         <value xml:lang="zh_TW">成品規範</value>
     </property>
     <property key="WorkEffortICalendar">
-        <value xml:lang="de">iCalendar</value>
         <value xml:lang="en">iCalendar</value>
-        <value xml:lang="it">iCalendar</value>
-        <value xml:lang="ja">iCalendar</value>
         <value xml:lang="vi">iCalendar (Xuất bản URL .ics)</value>
     </property>
     <property key="WorkEffortICalendarAdd">
@@ -2910,9 +2906,7 @@
         <value xml:lang="zh_TW">行事曆擁有者</value>
     </property>
     <property key="WorkEffortICalendarUrl">
-        <value xml:lang="de">iCalendar Url</value>
         <value xml:lang="en">iCalendar Url</value>
-        <value xml:lang="ja">iCalendar URL</value>
         <value xml:lang="vi">Liên kết URL iCalendar</value>
         <value xml:lang="zh">iCalendar网址</value>
         <value xml:lang="zh_TW">iCal網址</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonEntityLabels.xml Sat Dec 28 22:12:50 2013
@@ -1129,17 +1129,12 @@
         <value xml:lang="zh_TW">絕對網址</value>
     </property>
     <property key="Enumeration.description.KOTT_OFBURL">
-        <value xml:lang="de">OFBiz URL</value>
         <value xml:lang="en">OFBiz URL</value>
         <value xml:lang="es">URL OFBiz</value>
         <value xml:lang="fr">URL (lien internet) au sein d'OFBiz</value>
         <value xml:lang="it">URL OFBiz</value>
-        <value xml:lang="ja">OFBiz URL</value>
         <value xml:lang="pt">URL OFBiz</value>
         <value xml:lang="ro">URL OFBiz</value>
-        <value xml:lang="ru">OFBiz URL</value>
-        <value xml:lang="th">OFBiz URL</value>
-        <value xml:lang="vi">OFBiz URL</value>
         <value xml:lang="zh">OFBiz网址</value>
         <value xml:lang="zh_TW">OFBiz網址</value>
     </property>
@@ -11812,8 +11807,8 @@
         <value xml:lang="pt_BR">Enfileirado</value>
         <value xml:lang="ru">Очереди</value>
         <value xml:lang="vi">Đang trong hàng đợi</value>
-        <value xml:lang="zh">正在运行</value>
-        <value xml:lang="zh_TW">正在運行</value>
+        <value xml:lang="zh">已进入队列</value>
+        <value xml:lang="zh_TW">已進入佇列</value>
     </property>
     <property key="StatusItem.description.SERVICE_RUNNING">
         <value xml:lang="en">Running</value>
@@ -11824,8 +11819,8 @@
         <value xml:lang="pt_BR">Em execução</value>
         <value xml:lang="ru">Работающий</value>
         <value xml:lang="vi">Đang chạy</value>
-        <value xml:lang="zh">已进入队列</value>
-        <value xml:lang="zh_TW">已進入佇列</value>
+        <value xml:lang="zh">正在运行</value>
+        <value xml:lang="zh_TW">正在運行</value>
     </property>
     <property key="StatusItem.description.SHIPMENT_CANCELLED">
         <value xml:lang="de">Annulliert</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/config/CommonUiLabels.xml Sat Dec 28 22:12:50 2013
@@ -1320,7 +1320,6 @@
         <value xml:lang="fr">De</value>
         <value xml:lang="hi-IN">के द्वारा</value>
         <value xml:lang="it">Da</value>
-        <value xml:lang="ja">By</value>
         <value xml:lang="nl">bij</value>
         <value xml:lang="pt">Por</value>
         <value xml:lang="ro">De la </value>
@@ -2131,14 +2130,9 @@
         <value xml:lang="zh-TW">複制</value>
     </property>
     <property key="CommonCopyright">
-        <value xml:lang="cs">Copyright</value>
         <value xml:lang="en">Copyright</value>
-        <value xml:lang="es">Copyright</value>
         <value xml:lang="fr">Droit d'auteur</value>
         <value xml:lang="hi-IN">कॉपीराइट</value>
-        <value xml:lang="it">Copyright</value>
-        <value xml:lang="ja">Copyright</value>
-        <value xml:lang="pt-BR">Copyright</value>
         <value xml:lang="ru">Авторское право</value>
         <value xml:lang="vi">Bản quyền</value>
         <value xml:lang="zh">版权所有</value>
@@ -5054,16 +5048,11 @@
     </property>
     <property key="CommonId">
         <value xml:lang="ar">دليل</value>
-        <value xml:lang="cs">ID</value>
-        <value xml:lang="de">ID</value>
         <value xml:lang="en">ID</value>
         <value xml:lang="es">Código</value>
         <value xml:lang="fr">Réf.</value>
         <value xml:lang="hi-IN">क्रमांक</value>
         <value xml:lang="it">Codice</value>
-        <value xml:lang="ja">ID</value>
-        <value xml:lang="nl">ID</value>
-        <value xml:lang="pt">ID</value>
         <value xml:lang="ro">Id</value>
         <value xml:lang="ru">Код</value>
         <value xml:lang="th">รหัส</value>
@@ -5137,18 +5126,13 @@
     <property key="CommonIds">
         <value xml:lang="ar">دلائل</value>
         <value xml:lang="cs">Identifikátory</value>
-        <value xml:lang="de">IDs</value>
         <value xml:lang="en">IDs</value>
         <value xml:lang="es">Códigos</value>
         <value xml:lang="fr">Références</value>
         <value xml:lang="hi-IN">क्रमांक</value>
         <value xml:lang="it">Codici</value>
-        <value xml:lang="ja">ID</value>
-        <value xml:lang="nl">IDs</value>
-        <value xml:lang="pt">IDs</value>
         <value xml:lang="pt-BR">Identificações(IDs)</value>
         <value xml:lang="ro">Id Coduri</value>
-        <value xml:lang="ru">IDs</value>
         <value xml:lang="th">รหัส</value>
         <value xml:lang="vi">Định danh</value>
         <value xml:lang="zh">标识</value>
@@ -5181,7 +5165,6 @@
         <value xml:lang="fr">En</value>
         <value xml:lang="hi-IN">अंदर</value>
         <value xml:lang="it">In</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="nl">In</value>
         <value xml:lang="pt">Em</value>
         <value xml:lang="ro">In</value>
@@ -5201,7 +5184,6 @@
         <value xml:lang="fr">Dans le</value>
         <value xml:lang="hi-IN">इस में</value>
         <value xml:lang="it">Nel</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="nl">In De</value>
         <value xml:lang="pt">Em</value>
         <value xml:lang="pt-BR">No</value>
@@ -6622,19 +6604,8 @@
     </property>
     <property key="CommonN">
         <value xml:lang="ar">ل</value>
-        <value xml:lang="cs">N</value>
-        <value xml:lang="de">N</value>
         <value xml:lang="en">N</value>
-        <value xml:lang="es">N</value>
-        <value xml:lang="fr">N</value>
         <value xml:lang="hi-IN">ना</value>
-        <value xml:lang="it">N</value>
-        <value xml:lang="ja">N</value>
-        <value xml:lang="nl">N</value>
-        <value xml:lang="pt">N</value>
-        <value xml:lang="ro">N</value>
-        <value xml:lang="ru">Н</value>
-        <value xml:lang="th">N</value>
         <value xml:lang="vi">Không</value>
         <value xml:lang="zh">否</value>
         <value xml:lang="zh-CN">N</value>
@@ -8048,17 +8019,8 @@
         <value xml:lang="zh-TW">支付</value>
     </property>
     <property key="CommonPdf">
-        <value xml:lang="cs">PDF</value>
-        <value xml:lang="de">PDF</value>
-        <value xml:lang="en">Pdf</value>
-        <value xml:lang="es">Pdf</value>
-        <value xml:lang="fr">PDF</value>
+        <value xml:lang="en">PDF</value>
         <value xml:lang="hi-IN">पीडीऍफ़(PDF)</value>
-        <value xml:lang="it">Pdf</value>
-        <value xml:lang="ja">PDF</value>
-        <value xml:lang="pt-BR">Pdf</value>
-        <value xml:lang="ru">PDF </value>
-        <value xml:lang="zh">PDF</value>
     </property>
     <property key="CommonPerform">
         <value xml:lang="ar">إحراء</value>
@@ -8366,15 +8328,10 @@
         <value xml:lang="zh-TW">過賬日</value>
     </property>
     <property key="CommonPoweredBy">
-        <value xml:lang="cs">Powered by</value>
-        <value xml:lang="de">Powered by</value>
         <value xml:lang="en">Powered by</value>
-        <value xml:lang="es">Powered by</value>
         <value xml:lang="fr">Fonctionne grâce à </value>
         <value xml:lang="hi-IN">द्वारा संचालित</value>
         <value xml:lang="it">Realizzato con</value>
-        <value xml:lang="ja">Powered by</value>
-        <value xml:lang="pt-BR">Powered by</value>
         <value xml:lang="ru">Сделанно</value>
         <value xml:lang="vi">Tài trợ bởi</value>
         <value xml:lang="zh">运行平台</value>
@@ -9109,7 +9066,6 @@
         <value xml:lang="fr">Version officiellement distribuée</value>
         <value xml:lang="hi-IN">रिलीज संस्करणः</value>
         <value xml:lang="it">Versione release</value>
-        <value xml:lang="ja">Release Version</value>
         <value xml:lang="pt">1.0.0-Preview</value>
         <value xml:lang="pt-BR">Versão de Lançamento</value>
         <value xml:lang="ru">Версия релиза</value>
@@ -10231,7 +10187,6 @@
         <value xml:lang="fr">Depuis</value>
         <value xml:lang="hi-IN">क्योंकि</value>
         <value xml:lang="it">Fino a</value>
-        <value xml:lang="ja">Since</value>
         <value xml:lang="nl">Sinds</value>
         <value xml:lang="pt">Desde</value>
         <value xml:lang="ro">Pana la A</value>
@@ -10788,18 +10743,11 @@
     </property>
     <property key="CommonTelephoneAbbr">
         <value xml:lang="ar">هاتف</value>
-        <value xml:lang="cs">Tel</value>
-        <value xml:lang="de">Tel</value>
         <value xml:lang="en">Tel</value>
         <value xml:lang="es">Tel.</value>
         <value xml:lang="fr">Tél.</value>
         <value xml:lang="hi-IN">टेलीफोन</value>
-        <value xml:lang="it">Tel</value>
-        <value xml:lang="ja">Tel</value>
-        <value xml:lang="nl">Tel</value>
-        <value xml:lang="pt">Tel</value>
         <value xml:lang="pt-BR">Tel.</value>
-        <value xml:lang="ro">Tel</value>
         <value xml:lang="ru">Тел</value>
         <value xml:lang="th">หมายเลขโทรศัพท์</value>
         <value xml:lang="vi">Điện thoại</value>
@@ -10894,14 +10842,12 @@
         <value xml:lang="zh-TW">文本</value>
     </property>
     <property key="CommonThe">
-        <value xml:lang="cs"></value>
         <value xml:lang="de">Der</value>
         <value xml:lang="en">The</value>
         <value xml:lang="es">El/La</value>
         <value xml:lang="fr">Le</value>
         <value xml:lang="hi-IN">इस</value>
         <value xml:lang="it">Il</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="nl">de</value>
         <value xml:lang="pt-BR">O</value>
         <value xml:lang="ru">Это</value>
@@ -12424,9 +12370,7 @@
         <value xml:lang="fr">O</value>
         <value xml:lang="hi-IN">हाँ</value>
         <value xml:lang="it">S</value>
-        <value xml:lang="ja">Y</value>
         <value xml:lang="nl">J</value>
-        <value xml:lang="pt">Y</value>
         <value xml:lang="pt-BR">S</value>
         <value xml:lang="pt-PT">S</value>
         <value xml:lang="ro">D</value>
@@ -12706,18 +12650,8 @@
         <value xml:lang="zh-TW">新建資料源類型</value>
     </property>
     <property key="Ebay">
-        <value xml:lang="cs">eBay</value>
-        <value xml:lang="de">eBay</value>        
         <value xml:lang="en">eBay</value>
-        <value xml:lang="es">eBay</value>
-        <value xml:lang="fr">eBay</value>
-        <value xml:lang="hi-IN">eBay</value>
-        <value xml:lang="it">eBay</value>
-        <value xml:lang="ja">eBay</value>
-        <value xml:lang="pt-BR">eBay</value>
-        <value xml:lang="ru">eBay</value>
         <value xml:lang="th">อีเบย์</value>
-        <value xml:lang="zh">eBay</value>
         <value xml:lang="zh-TW">電子灣</value>
     </property>
     <property key="Example">
@@ -13797,19 +13731,12 @@
         <value xml:lang="zh-TW">更新</value>
     </property>
     <property key="Google Base">
-        <value xml:lang="cs">Google Base</value>
-        <value xml:lang="de">Google Base</value>
         <value xml:lang="en">Google Base</value>
-        <value xml:lang="es">Google Base</value>
-        <value xml:lang="fr">Google Base</value>
         <value xml:lang="hi-IN">गूगल बेस</value>
         <value xml:lang="it">Googleショッピング</value>
-        <value xml:lang="ja">Google Base</value>
         <value xml:lang="pt-BR">Base do Google</value>
         <value xml:lang="ru">Гугл база</value>
-        <value xml:lang="th">Google Base</value>
         <value xml:lang="vi">Trên nền tảng Google</value>
-        <value xml:lang="zh">Google Base</value>
     </property>
     <property key="HR">
         <value xml:lang="cs">Personální</value>
@@ -13944,19 +13871,9 @@
         <value xml:lang="zh-TW">OFBiz站點</value>
     </property>
     <property key="Oagis">
-        <value xml:lang="cs">Oagis</value>
-        <value xml:lang="de">Oagis</value>
         <value xml:lang="en">Oagis</value>
-        <value xml:lang="es">Oagis</value>
-        <value xml:lang="fr">Oagis</value>
-        <value xml:lang="hi-IN">Oagis</value>
-        <value xml:lang="it">Oagis</value>
-        <value xml:lang="ja">Oagis</value>
-        <value xml:lang="pt-BR">Oagis</value>
-        <value xml:lang="ru">Oagis</value>
         <value xml:lang="th">การรวมภาษาทางธุรกิจ</value>
         <value xml:lang="vi">Giao thức XML Oagis</value>
-        <value xml:lang="zh">Oagis</value>
     </property>
     <property key="Order">
         <value xml:lang="ar">طلبية</value>
@@ -14361,15 +14278,12 @@
         <value xml:lang="zh">销售管理</value>
         <value xml:lang="zh-TW">銷售</value>
     </property>
-        <value xml:lang="cs">Shark</value>
     <property key="Web Pos">
-        <value xml:lang="cs">Web Pos</value>
-        <value xml:lang="en">Web Pos</value>
+        <value xml:lang="en">Web POS</value>
         <value xml:lang="es">POS web</value>
         <value xml:lang="fr">POS Web</value>
         <value xml:lang="hi-IN">वेब Pos</value>
         <value xml:lang="it">POS web</value>
-        <value xml:lang="ja">Web POS</value>
         <value xml:lang="pt-BR">Ponto de venda Web</value>
         <value xml:lang="ru">POS web</value>
         <value xml:lang="vi">Điểm bán hàng Web POS</value>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/actions/includes/GeoLocation.groovy Sat Dec 28 22:12:50 2013
@@ -17,7 +17,11 @@
  * under the License.
  */
 
-if (geoPoint && geoPoint.elevationUomId) {
-    elevationUom = delegator.findOne("Uom", [uomId : geoPoint.elevationUomId], false);
-    context.elevationUomAbbr = elevationUom.abbreviation;
+if (context.geoChart.points) {    
+    //context.geoChart.points = ;
+    println "context.geoChart.points==========================================" + context.geoChart.points
 }
+if (geoPoints) {    
+    println "geoPoints==========================================" + geoPoints
+}
+

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd?rev=1553940&r1=1553939&r2=1553940&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entitymodel.xsd Sat Dec 28 22:12:50 2013
@@ -86,7 +86,14 @@ under the License.
         <xs:attribute name="package-name" type="xs:string" use="required"/>
         <xs:attribute name="default-resource-name" type="xs:string"/>
         <xs:attribute name="dependent-on" type="xs:string"/>
-        <xs:attribute name="sequence-bank-size" type="xs:string"/>
+        <xs:attribute name="sequence-bank-size" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    The 10 default value is defined in the SequenceBank class by the defaultBankSize constant.
+                    Can't be more than 5000 which is defined by the maxBankSize constant.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="enable-lock" default="false" type="boolean"/>
         <xs:attribute name="no-auto-stamp" default="false" type="boolean"/>
         <xs:attribute name="never-cache" default="false" type="boolean"/>
@@ -503,7 +510,14 @@ under the License.
         <xs:attribute name="entity-name" type="xs:string" use="required"/>
         <xs:attribute name="default-resource-name" type="xs:string"/>
         <xs:attribute name="dependent-on" type="xs:string"/>
-        <xs:attribute name="sequence-bank-size" type="xs:string"/>
+        <xs:attribute name="sequence-bank-size" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    The 10 default value is defined in the SequenceBank class by the defaultBankSize constant.
+                    Can't be more than 5000 which is defined by the maxBankSize constant.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute name="enable-lock" type="boolean"/>
         <xs:attribute name="no-auto-stamp" type="boolean"/>
         <xs:attribute name="never-cache" type="boolean"/>