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/23 10:27:00 UTC

svn commit: r1553086 [3/10] - in /ofbiz/branches/jackrabbit20120501: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ applications/commonext/config/ applications/content/config/ applications/cont...

Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingErrorUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingErrorUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -558,7 +558,6 @@
     <property key="AccountingTaxSettingError">
         <value xml:lang="en">Data error getting tax settings: ${errorString}</value>
         <value xml:lang="it">Errore di lettura impostazioni tasse: ${errorString}</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="zh">获取税务设置时数据错误：${errorString}</value>
     </property>
     <property key="payPalEvents.failedToExecuteServiceCreatePaymentFromPreference">
@@ -731,7 +730,6 @@
         <value xml:lang="fr">Échec sur l'execution du service de création d'un payment suivant les préférence (CreatePaymentFromPreference)</value>
         <value xml:lang="hi_IN">सर्विस CreatePaymentFromPreference पर अमल(execute) करने में असफल</value>
         <value xml:lang="it">Fallita esecuzione servizio CreatePaymentFromPreference</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="zh">执行从设置创建支付（CreatePaymentFromPreference）这个服务时出错</value>
     </property>
     <property key="idealEvents.noValidOrderIdReturned">
@@ -740,7 +738,6 @@
         <value xml:lang="fr">Référence commande retournée n'est pas valide</value>
         <value xml:lang="hi_IN">मान्य OrderId वापस नहीं लौटा</value>
         <value xml:lang="it">Nessun numero ordine restituito</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="zh">返回的订单标识无效</value>
     </property>
     <property key="idealEvents.problemsConnectingWithIdeal">
@@ -749,7 +746,6 @@
         <value xml:lang="fr">Problème rencontré dans la connexion avec iDEAL</value>
         <value xml:lang="hi_IN">iDEAL के साथ जोड़ने में समस्या</value>
         <value xml:lang="it">Problema nella connessione con iDEAL</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="zh">连接 iDEAL 时出错</value>
     </property>
     <property key="idealEvents.problemsGettingAuthenticationUser">
@@ -758,7 +754,6 @@
         <value xml:lang="fr">Problème sur l'authentification de l'utilisateur</value>
         <value xml:lang="hi_IN">उपयोगकर्ता(user) के प्रमाणीकरण में समस्याएँ हो रही</value>
         <value xml:lang="it">Problema durante l'autenticazione utente</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="zh">获取认证用户时出错</value>
     </property>
     <property key="idealEvents.problemsGettingMerchantConfiguration">

Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/accounting/config/AccountingUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -1706,10 +1706,9 @@
         <value xml:lang="fr">Carte de crédit</value>
         <value xml:lang="hi_IN">सीसी (क्रेडिट कार्ड)</value>
         <value xml:lang="it">Carta di credito</value>
-        <value xml:lang="ja">CC</value>
-        <value xml:lang="pt">CC</value>
         <value xml:lang="vi">Thẻ tín dụng (CC)</value>
         <value xml:lang="zh">信用卡</value>
+        <value xml:lang="pt">CC</value>
         <value xml:lang="zh_TW">信用卡</value>
     </property>
     <property key="AccountingAuthorizeNetRelayResponse">
@@ -3006,7 +3005,6 @@
         <value xml:lang="fr">Un module de la famille Open For Business, logiciel libre de gestion d'entreprise.</value>
         <value xml:lang="hi_IN">Open Source Software के Open For Business परिवार का हिस्सा</value>
         <value xml:lang="it">Un modulo della famiglia di software open source Open For Business</value>
-        <value xml:lang="ja">Part of the Open For Business Family of Open Source Software</value>
         <value xml:lang="nl">Deel van de Open For Business-suite van Open Source Software</value>
         <value xml:lang="pt_BR">Parte da família OfBiz de software livre</value>
         <value xml:lang="pt_PT">Parte da família OfBiz de software de fonte aberta</value>
@@ -7788,21 +7786,8 @@
         <value xml:lang="zh_TW">總覽</value>
     </property>
     <property key="AccountingInvoicePDF">
-        <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="hi_IN">पीडीऍफ़(PDF)</value>
-        <value xml:lang="it">PDF</value>
-        <value xml:lang="ja">PDF</value>
-        <value xml:lang="nl">PDF</value>
-        <value xml:lang="pt">PDF</value>
-        <value xml:lang="ro">PDF</value>
-        <value xml:lang="ru">PDF</value>
-        <value xml:lang="th">PDF</value>
-        <value xml:lang="vi">PDF</value>
-        <value xml:lang="zh">PDF</value>
-        <value xml:lang="zh_TW">PDF</value>
     </property>
     <property key="AccountingInvoicePDFDefaultCur">
         <value xml:lang="de">PDF Standardwährung</value>
@@ -10053,17 +10038,8 @@
         <value xml:lang="zh_TW">覆蓋收入總帳科目編號</value>
     </property>
     <property key="AccountingPIN">
-        <value xml:lang="cs">PIN</value>
-        <value xml:lang="de">PIN</value>
         <value xml:lang="en">PIN</value>
-        <value xml:lang="es">PIN</value>
-        <value xml:lang="fr">PIN</value>
         <value xml:lang="hi_IN">पिन</value>
-        <value xml:lang="it">PIN</value>
-        <value xml:lang="ja">PIN</value>
-        <value xml:lang="nl">PIN</value>
-        <value xml:lang="pt">PIN</value>
-        <value xml:lang="ro">PIN</value>
         <value xml:lang="ru">ПИН</value>
         <value xml:lang="th">รหัสส่วนตัว</value>
         <value xml:lang="vi">PIN (mật mã cá nhân)</value>
@@ -14943,8 +14919,8 @@
         <value xml:lang="zh_TW">總帳不平原因</value>
     </property>
     <property key="AccountingVat">
-    	<value xml:lang="en">VAT</value>
-    	<value xml:lang="nl">BTW</value>
+        <value xml:lang="en">VAT</value>
+        <value xml:lang="nl">BTW</value>
     </property>
     <property key="AccountingVendorParty">
         <value xml:lang="en">Vendor Party</value>

Modified: ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original)
+++ ofbiz/branches/jackrabbit20120501/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Mon Dec 23 09:26:58 2013
@@ -114,26 +114,25 @@ public class ValueLinkApi {
      * @return ValueLinkApi reference
      */
     public static ValueLinkApi getInstance(Delegator delegator, Properties props, boolean reload) {
-        String merchantId = (String) props.get("payment.valuelink.merchantId");
         if (props == null) {
             throw new IllegalArgumentException("Properties cannot be null");
         }
+        String merchantId = (String) props.get("payment.valuelink.merchantId");
 
         ValueLinkApi api = (ValueLinkApi) objectCache.get(merchantId);
-        if (api == null || reload) {
+        if (api == null) {
+            throw new RuntimeException("Runtime problems with ValueLinkApi; unable to create instance");
+        }
+        if (reload) {
             synchronized(ValueLinkApi.class) {
                 api = (ValueLinkApi) objectCache.get(merchantId);
-                if (api == null || reload) {
+                if (api == null) {
                     api = new ValueLinkApi(delegator, props);
                     objectCache.put(merchantId, api);
                 }
             }
         }
 
-        if (api == null) {
-            throw new RuntimeException("Runtime problems with ValueLinkApi; unable to create instance");
-        }
-
         return api;
     }
 

Modified: ofbiz/branches/jackrabbit20120501/applications/commonext/config/SetupUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/commonext/config/SetupUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/commonext/config/SetupUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/commonext/config/SetupUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -141,7 +141,6 @@
     <property key="SetupFacilityNameIsMissing">
         <value xml:lang="en">Facility Name is missing</value>
         <value xml:lang="it">Stabilimento mancante</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="pt_BR">Nome da Instalação está faltando</value>
         <value xml:lang="vi">Bạn chưa nhập tên cơ sở (Facility Name)</value>
         <value xml:lang="zh">缺少场所名称</value>
@@ -212,7 +211,6 @@
     <property key="SetupOrganizationNameIsMissing">
         <value xml:lang="en">Organization name is missing</value>
         <value xml:lang="it">Nome organizzazione è mancante</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="pt_BR">Nome da organização está faltando</value>
         <value xml:lang="vi">Bạn chưa nhập tên doanh nghiệp</value>
         <value xml:lang="zh">缺少组织名称</value>
@@ -265,7 +263,6 @@
     <property key="SetupProductStoreNameIsMissing">
         <value xml:lang="en">Store Name is missing</value>
         <value xml:lang="it">Nome negozio è mancante</value>
-        <value xml:lang="ja"></value>
         <value xml:lang="pt_BR">Nome da loja está faltando</value>
         <value xml:lang="vi">Bạn chưa nhập tên cửa hàng</value>
         <value xml:lang="zh">缺少店铺名称</value>

Modified: ofbiz/branches/jackrabbit20120501/applications/content/config/ContentEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/content/config/ContentEntityLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/content/config/ContentEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/content/config/ContentEntityLabels.xml Mon Dec 23 09:26:58 2013
@@ -20,160 +20,51 @@
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="CharacterSet.description.ISO-8859-1">
-        <value xml:lang="da">ISO-8859-1</value>
-        <value xml:lang="de">ISO-8859-1</value>
         <value xml:lang="en">ISO-8859-1</value>
         <value xml:lang="es">ISO-8859-1 Inglés</value>
-        <value xml:lang="fr">ISO-8859-1</value>
-        <value xml:lang="it">ISO-8859-1</value>
-        <value xml:lang="ja">ISO-8859-1</value>
-        <value xml:lang="pt">ISO-8859-1</value>
-        <value xml:lang="th">ISO-8859-1</value>
-        <value xml:lang="zh">ISO-8859-1</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-10">
-        <value xml:lang="da">ISO-8859-10</value>
-        <value xml:lang="de">ISO-8859-10</value>
         <value xml:lang="en">ISO-8859-10</value>
-        <value xml:lang="es">ISO-8859-10 ?</value>
-        <value xml:lang="fr">ISO-8859-10</value>
-        <value xml:lang="it">ISO-8859-10</value>
-        <value xml:lang="ja">ISO-8859-10</value>
-        <value xml:lang="pt">ISO-8859-10</value>
-        <value xml:lang="th">ISO-8859-10</value>
-        <value xml:lang="zh">ISO-8859-10</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-2">
-        <value xml:lang="da">ISO-8859-2</value>
-        <value xml:lang="de">ISO-8859-2</value>
         <value xml:lang="en">ISO-8859-2</value>
-        <value xml:lang="es">ISO-8859-2 ?</value>
-        <value xml:lang="fr">ISO-8859-2</value>
-        <value xml:lang="it">ISO-8859-2</value>
-        <value xml:lang="ja">ISO-8859-2</value>
-        <value xml:lang="pt">ISO-8859-2</value>
-        <value xml:lang="th">ISO-8859-2</value>
-        <value xml:lang="zh">ISO-8859-2</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-3">
-        <value xml:lang="da">ISO-8859-3</value>
-        <value xml:lang="de">ISO-8859-3</value>
         <value xml:lang="en">ISO-8859-3</value>
-        <value xml:lang="es">ISO-8859-3 ?</value>
-        <value xml:lang="fr">ISO-8859-3</value>
-        <value xml:lang="it">ISO-8859-3</value>
-        <value xml:lang="ja">ISO-8859-3</value>
-        <value xml:lang="pt">ISO-8859-3</value>
-        <value xml:lang="th">ISO-8859-3</value>
-        <value xml:lang="zh">ISO-8859-3</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-4">
-        <value xml:lang="da">ISO-8859-4</value>
-        <value xml:lang="de">ISO-8859-4</value>
         <value xml:lang="en">ISO-8859-4</value>
-        <value xml:lang="es">ISO-8859-4 ?</value>
-        <value xml:lang="fr">ISO-8859-4</value>
-        <value xml:lang="it">ISO-8859-4</value>
-        <value xml:lang="ja">ISO-8859-4</value>
-        <value xml:lang="pt">ISO-8859-4</value>
-        <value xml:lang="th">ISO-8859-4</value>
-        <value xml:lang="zh">ISO-8859-4</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-5">
-        <value xml:lang="da">ISO-8859-5</value>
-        <value xml:lang="de">ISO-8859-5</value>
         <value xml:lang="en">ISO-8859-5</value>
-        <value xml:lang="es">ISO-8859-5 ?</value>
-        <value xml:lang="fr">ISO-8859-5</value>
-        <value xml:lang="it">ISO-8859-5</value>
-        <value xml:lang="ja">ISO-8859-5</value>
-        <value xml:lang="pt">ISO-8859-5</value>
-        <value xml:lang="th">ISO-8859-5</value>
-        <value xml:lang="zh">ISO-8859-5</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-6">
-        <value xml:lang="da">ISO-8859-6</value>
-        <value xml:lang="de">ISO-8859-6</value>
         <value xml:lang="en">ISO-8859-6</value>
         <value xml:lang="es">ISO-8859-6 Latino/árabe</value>
-        <value xml:lang="fr">ISO-8859-6</value>
-        <value xml:lang="it">ISO-8859-6</value>
-        <value xml:lang="ja">ISO-8859-6</value>
-        <value xml:lang="pt">ISO-8859-6</value>
-        <value xml:lang="th">ISO-8859-6</value>
-        <value xml:lang="zh">ISO-8859-6</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-7">
-        <value xml:lang="da">ISO-8859-7</value>
-        <value xml:lang="de">ISO-8859-7</value>
         <value xml:lang="en">ISO-8859-7</value>
-        <value xml:lang="es">ISO-8859-7 ?</value>
-        <value xml:lang="fr">ISO-8859-7</value>
-        <value xml:lang="it">ISO-8859-7</value>
-        <value xml:lang="ja">ISO-8859-7</value>
-        <value xml:lang="pt">ISO-8859-7</value>
-        <value xml:lang="th">ISO-8859-7</value>
-        <value xml:lang="zh">ISO-8859-7</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-8">
-        <value xml:lang="da">ISO-8859-8</value>
-        <value xml:lang="de">ISO-8859-8</value>
         <value xml:lang="en">ISO-8859-8</value>
         <value xml:lang="es">ISO-8859-8 Latino/Hebreo</value>
-        <value xml:lang="fr">ISO-8859-8</value>
-        <value xml:lang="it">ISO-8859-8</value>
-        <value xml:lang="ja">ISO-8859-8</value>
-        <value xml:lang="pt">ISO-8859-8</value>
-        <value xml:lang="th">ISO-8859-8</value>
-        <value xml:lang="zh">ISO-8859-8</value>
     </property>
     <property key="CharacterSet.description.ISO-8859-9">
-        <value xml:lang="da">ISO-8859-9</value>
-        <value xml:lang="de">ISO-8859-9</value>
         <value xml:lang="en">ISO-8859-9</value>
         <value xml:lang="es">ISO-8859-9 ?</value>
-        <value xml:lang="fr">ISO-8859-9</value>
-        <value xml:lang="it">ISO-8859-9</value>
-        <value xml:lang="ja">ISO-8859-9</value>
-        <value xml:lang="pt">ISO-8859-9</value>
-        <value xml:lang="th">ISO-8859-9</value>
-        <value xml:lang="zh">ISO-8859-9</value>
     </property>
     <property key="CharacterSet.description.US-ASCII">
-        <value xml:lang="da">US-ASCII</value>
-        <value xml:lang="de">US-ASCII</value>
         <value xml:lang="en">US-ASCII</value>
-        <value xml:lang="es">US-ASCII</value>
-        <value xml:lang="fr">US-ASCII</value>
-        <value xml:lang="it">US-ASCII</value>
-        <value xml:lang="ja">US-ASCII</value>
-        <value xml:lang="pt">US-ASCII</value>
-        <value xml:lang="th">US-ASCII</value>
-        <value xml:lang="zh">US-ASCII</value>
     </property>
     <property key="CharacterSet.description.UTF-16">
-        <value xml:lang="da">UTF-16</value>
-        <value xml:lang="de">UTF-16</value>
         <value xml:lang="en">UTF-16</value>
         <value xml:lang="es">Unicode 16 bit</value>
-        <value xml:lang="fr">UTF-16</value>
-        <value xml:lang="it">UTF-16</value>
-        <value xml:lang="ja">UTF-16</value>
-        <value xml:lang="pt">UTF-16</value>
-        <value xml:lang="th">UTF-16</value>
-        <value xml:lang="zh">UTF-16</value>
+        <value xml:lang="fr">Unicode 16 bit</value>
     </property>
     <property key="CharacterSet.description.UTF-8">
-        <value xml:lang="da">UTF-8</value>
-        <value xml:lang="de">UTF-8</value>
         <value xml:lang="en">UTF-8</value>
         <value xml:lang="es">Unicode 8 bit</value>
-        <value xml:lang="fr">UTF-8</value>
-        <value xml:lang="it">UTF-8</value>
-        <value xml:lang="ja">UTF-8</value>
-        <value xml:lang="pt">UTF-8</value>
-        <value xml:lang="th">UTF-8</value>
-        <value xml:lang="zh">UTF-8</value>
+        <value xml:lang="fr">Unicode 8 bit</value>
     </property>
     <property key="ContentAssocPredicate.description.categorizes">
         <value xml:lang="da">kategorier</value>
@@ -1738,44 +1629,17 @@
         <value xml:lang="zh_TW">軟件</value>
     </property>
     <property key="DataCategory.categoryName.TECH_SOFT_JAVA">
-        <value xml:lang="da">Java</value>
-        <value xml:lang="de">Java</value>
         <value xml:lang="en">Java</value>
-        <value xml:lang="fr">Java</value>
-        <value xml:lang="it">Java</value>
-        <value xml:lang="ja">Java</value>
-        <value xml:lang="pt">Java</value>
-        <value xml:lang="ro">Java</value>
         <value xml:lang="th">ภาษาจาวา</value>
-        <value xml:lang="vi">Java</value>
-        <value xml:lang="zh">Java</value>
-        <value xml:lang="zh_TW">Java</value>
     </property>
     <property key="DataCategory.categoryName.TECH_SOFT_LINUX">
-        <value xml:lang="da">Linux</value>
-        <value xml:lang="de">Linux</value>
         <value xml:lang="en">Linux</value>
-        <value xml:lang="fr">Linux</value>
-        <value xml:lang="it">Linux</value>
-        <value xml:lang="ja">Linux</value>
-        <value xml:lang="pt">Linux</value>
-        <value xml:lang="ro">Linux</value>
         <value xml:lang="th">ระบบปฏิบัติการลีนุกซ์</value>
-        <value xml:lang="vi">Linux</value>
-        <value xml:lang="zh">Linux</value>
-        <value xml:lang="zh_TW">Linux</value>
     </property>
     <property key="DataCategory.categoryName.TECH_SOFT_OFBIZ">
-        <value xml:lang="da">Open for Business</value>
-        <value xml:lang="de">Open for Business</value>
         <value xml:lang="en">Open for Business</value>
-        <value xml:lang="fr">Open for Business</value>
-        <value xml:lang="it">Open for Business</value>
         <value xml:lang="ja">OFBiz</value>
-        <value xml:lang="pt">Open for Business</value>
-        <value xml:lang="ro">Open for Business</value>
         <value xml:lang="th">เปิดสำหรับทางธุรกิจ</value>
-        <value xml:lang="vi">Open for Business</value>
         <value xml:lang="zh">OFBiz</value>
         <value xml:lang="zh_TW">OFBiz</value>
     </property>
@@ -2006,17 +1870,7 @@
         <value xml:lang="zh_TW">視頻</value>
     </property>
     <property key="DataTemplateType.description.FTL">
-        <value xml:lang="da">FreeMarker</value>
-        <value xml:lang="de">FreeMarker</value>
         <value xml:lang="en">FreeMarker</value>
-        <value xml:lang="fr">FreeMarker</value>
-        <value xml:lang="it">FreeMarker</value>
-        <value xml:lang="ja">FreeMarker</value>
-        <value xml:lang="pt">FreeMarker</value>
-        <value xml:lang="ro">FreeMarker</value>
-        <value xml:lang="th">FreeMarker</value>
-        <value xml:lang="vi">FreeMarker</value>
-        <value xml:lang="zh">FreeMarker</value>
         <value xml:lang="zh_TW">FreeMarker</value>
     </property>
     <property key="DataTemplateType.description.NONE">
@@ -2048,46 +1902,16 @@
         <value xml:lang="zh_TW">螢幕挂件</value>
     </property>
     <property key="DataTemplateType.description.VTL">
-        <value xml:lang="da">Velocity</value>
-        <value xml:lang="de">Velocity</value>
         <value xml:lang="en">Velocity</value>
-        <value xml:lang="fr">Velocity</value>
-        <value xml:lang="it">Velocity</value>
-        <value xml:lang="ja">Velocity</value>
-        <value xml:lang="pt">Velocity</value>
         <value xml:lang="ro">Viteza</value>
         <value xml:lang="th">ความเร็ว</value>
-        <value xml:lang="vi">Velocity</value>
-        <value xml:lang="zh">Velocity</value>
-        <value xml:lang="zh_TW">Velocity</value>
     </property>
     <property key="DataTemplateType.description.WM">
-        <value xml:lang="da">WebMAcro</value>
-        <value xml:lang="de">WebMAcro</value>
         <value xml:lang="en">WebMacro</value>
-        <value xml:lang="fr">WebMacro</value>
-        <value xml:lang="it">WebMacro</value>
-        <value xml:lang="ja">WebMacro</value>
-        <value xml:lang="pt">WebMacro</value>
-        <value xml:lang="ro">WebMacro</value>
         <value xml:lang="th">เว็บ Macro</value>
-        <value xml:lang="vi">WebMAcro</value>
-        <value xml:lang="zh">WebMacro</value>
-        <value xml:lang="zh_TW">WebMacro</value>
     </property>
     <property key="DataTemplateType.description.XSLT">
-        <value xml:lang="da">XSLT</value>
-        <value xml:lang="de">XSLT</value>
         <value xml:lang="en">XSLT</value>
-        <value xml:lang="fr">XSLT</value>
-        <value xml:lang="it">XSLT</value>
-        <value xml:lang="ja">XSLT</value>
-        <value xml:lang="pt">XSLT</value>
-        <value xml:lang="ro">XSLT</value>
-        <value xml:lang="th">XSLT</value>
-        <value xml:lang="vi">XSLT</value>
-        <value xml:lang="zh">XSLT</value>
-        <value xml:lang="zh_TW">XSLT</value>
     </property>
     <property key="DocumentType.description.BILL_OF_LADING">
         <value xml:lang="da">Kannossement</value>
@@ -2262,16 +2086,7 @@
         <value xml:lang="zh_TW">主題事件中牽扯到的人員姓名。</value>
     </property>
     <property key="MimeType.description.application/msword">
-        <value xml:lang="da">Microsoft Word</value>
-        <value xml:lang="de">Microsoft Word</value>
         <value xml:lang="en">Microsoft Word</value>
-        <value xml:lang="fr">Microsoft Word</value>
-        <value xml:lang="it">Microsoft Word</value>
-        <value xml:lang="ja">Microsoft Word</value>
-        <value xml:lang="pt">Microsoft Word</value>
-        <value xml:lang="ro">Microsoft Word</value>
-        <value xml:lang="th">Microsoft Word</value>
-        <value xml:lang="vi">Microsoft Word</value>
         <value xml:lang="zh">微软Word</value>
         <value xml:lang="zh_TW">微軟Word</value>
     </property>
@@ -2290,15 +2105,10 @@
         <value xml:lang="zh_TW">二進制資料</value>
     </property>
     <property key="MimeType.description.application/pdf">
-        <value xml:lang="da">Adobe Portable Document Format (PDF)</value>
-        <value xml:lang="de">Adobe Portable Document Format (PDF)</value>
         <value xml:lang="en">Adobe Portable Document Format (PDF)</value>
         <value xml:lang="fr">Format de document portable Adobe (PDF)</value>
         <value xml:lang="it">Formato Adobe Portable Document (PDF)</value>
         <value xml:lang="ja">Adobe PDF</value>
-        <value xml:lang="pt">Adobe Portable Document Format (PDF)</value>
-        <value xml:lang="ro">Format Adobe Portable Document (PDF)</value>
-        <value xml:lang="th">Adobe Portable Document Format (PDF)</value>
         <value xml:lang="vi">Adobe PDF</value>
         <value xml:lang="zh">Adobe PDF</value>
         <value xml:lang="zh_TW">Adobe PDF</value>
@@ -2318,27 +2128,12 @@
         <value xml:lang="zh_TW">Postsctipt應用/腳本</value>
     </property>
     <property key="MimeType.description.application/vnd.ms-excel">
-        <value xml:lang="da">Microsoft Excel</value>
-        <value xml:lang="de">Microsoft Excel</value>
         <value xml:lang="en">Microsoft Excel</value>
-        <value xml:lang="fr">Microsoft Excel</value>
-        <value xml:lang="it">Microsoft Excel</value>
-        <value xml:lang="ja">Microsoft Excel</value>
-        <value xml:lang="pt">Microsoft Excel</value>
-        <value xml:lang="th">Microsoft Excel</value>
-        <value xml:lang="vi">Microsoft Excel</value>
         <value xml:lang="zh">微软Excel</value>
         <value xml:lang="zh_TW">微軟Excel</value>
     </property>
     <property key="MimeType.description.application/vnd.ms-powerpoint">
-        <value xml:lang="da">Microsoft PowerPoint</value>
-        <value xml:lang="de">Microsoft PowerPoint</value>
         <value xml:lang="en">Microsoft PowerPoint</value>
-        <value xml:lang="fr">Microsoft PowerPoint</value>
-        <value xml:lang="it">Microsoft PowerPoint</value>
-        <value xml:lang="ja">Microsoft PowerPoint</value>
-        <value xml:lang="pt">Microsoft PowerPoint</value>
-        <value xml:lang="th">Microsoft PowerPoint</value>
         <value xml:lang="zh">微软PowerPoint</value>
         <value xml:lang="zh_TW">微軟PowerPoint</value>
     </property>
@@ -2618,7 +2413,6 @@
     </property>
     <property key="MimeType.description.message/s-http">
         <value xml:lang="da">HTTPS/S-HTTP besked</value>
-        <value xml:lang="de">HTTPS/S-HTTP Message</value>
         <value xml:lang="en">HTTPS/S-HTTP Message</value>
         <value xml:lang="fr">Message HTTPS/S-HTTP</value>
         <value xml:lang="it">Messaggio HTTPS/S-HTTP</value>
@@ -2631,14 +2425,10 @@
         <value xml:lang="zh_TW">HTTPS/S-HTTP消息</value>
     </property>
     <property key="MimeType.description.model/mesh">
-        <value xml:lang="da">MEsh model</value>
-        <value xml:lang="de">MEsh Model</value>
         <value xml:lang="en">Mesh Model</value>
         <value xml:lang="fr">Modèle de grille</value>
-        <value xml:lang="it">Mesh Model</value>
         <value xml:lang="ja">Mesh モデル</value>
         <value xml:lang="pt">Modelo Mesh</value>
-        <value xml:lang="ro">Mesh Model</value>
         <value xml:lang="th">แบบจำลองที่ทำงานร่วมกัน</value>
         <value xml:lang="zh">网格模型</value>
         <value xml:lang="zh_TW">網格模型</value>
@@ -2657,99 +2447,65 @@
         <value xml:lang="zh_TW">虛擬現實模型語言(VRML)模型</value>
     </property>
     <property key="MimeType.description.multipart/alternative">
-        <value xml:lang="da">Multiple Alternative Multipart</value>
-        <value xml:lang="de">Multiple Alternative Multipart</value>
         <value xml:lang="en">Mutliple Alternative Multipart</value>
-        <value xml:lang="fr">Multiple alternative multipart</value>
-        <value xml:lang="it">Mutliple Alternative Multipart</value>
         <value xml:lang="ja">マルチパートオールタナティブ</value>
-        <value xml:lang="pt">Mutliple Alternative Multipart</value>
-        <value xml:lang="ro">Mutliple Alternative Multipart</value>
         <value xml:lang="th">หลายๆ ทางเลือก</value>
         <value xml:lang="zh">多个二选一多段内容</value>
         <value xml:lang="zh_TW">多個二選一多段內容</value>
     </property>
     <property key="MimeType.description.multipart/digest">
-        <value xml:lang="da">Digest of Messages Multipart</value>
-        <value xml:lang="de">Digest of Messages Multipart</value>
         <value xml:lang="en">Digest of Messages Multipart</value>
         <value xml:lang="fr">Sommaire de messages multipart</value>
-        <value xml:lang="it">Digest of Messages Multipart</value>
         <value xml:lang="ja">マルチパートダイジェスト</value>
-        <value xml:lang="pt">Digest of Messages Multipart</value>
-        <value xml:lang="ro">Digest of Messages Multipart</value>
         <value xml:lang="th">บทสรุปของหลาย ๆ ข้อความ</value>
         <value xml:lang="zh">消息多段内容的摘要</value>
         <value xml:lang="zh_TW">消息多段內容的摘要</value>
     </property>
     <property key="MimeType.description.multipart/encrypted">
-        <value xml:lang="da">Encrypted Multipart</value>
-        <value xml:lang="de">Encrypted Multipart</value>
         <value xml:lang="en">Encrypted Multipart</value>
         <value xml:lang="fr">Multipart codé</value>
-        <value xml:lang="it">Encrypted Multipart</value>
         <value xml:lang="ja">マルチパートエンクリプテッド</value>
-        <value xml:lang="pt">Encrypted Multipart</value>
-        <value xml:lang="ro">Encrypted Multipart</value>
         <value xml:lang="th">การสร้างรหัสลับ</value>
         <value xml:lang="zh">加密的多段内容</value>
         <value xml:lang="zh_TW">加密的多段內容</value>
     </property>
     <property key="MimeType.description.multipart/form-data">
-        <value xml:lang="da">Form Data Multipart</value>
-        <value xml:lang="de">Form Data Multipart</value>
         <value xml:lang="en">Form Data Multipart</value>
         <value xml:lang="fr">Donnée de forme multipart </value>
-        <value xml:lang="it">Form Data Multipart</value>
         <value xml:lang="ja">マルチパートフォームデータ</value>
         <value xml:lang="pt">Formulário de dados Multipart</value>
-        <value xml:lang="ro">Form Data Multipart</value>
         <value xml:lang="th">รูปแบบส่วนของข้อมูล</value>
         <value xml:lang="zh">表单数据多段内容</value>
         <value xml:lang="zh_TW">表單資料多段內容</value>
     </property>
     <property key="MimeType.description.multipart/mixed">
-        <value xml:lang="da">Mixed Type Multipart</value>
-        <value xml:lang="de">Mixed Type Multipart</value>
         <value xml:lang="en">Mixed Type Multipart</value>
         <value xml:lang="fr">Type multipart varié</value>
         <value xml:lang="it">Mixed Type Multipart</value>
         <value xml:lang="ja">マルチパートミックスド</value>
-        <value xml:lang="pt">Mixed Type Multipart</value>
-        <value xml:lang="ro">Mixed Type Multipart</value>
         <value xml:lang="th">รวมประเภทซึ่งเป็นหลาย ๆ ส่วน</value>
         <value xml:lang="zh">混合类型多段内容</value>
         <value xml:lang="zh_TW">混合類型多段內容</value>
     </property>
     <property key="MimeType.description.multipart/related">
-        <value xml:lang="da">Related Multipart</value>
-        <value xml:lang="de">Related Multipart</value>
         <value xml:lang="en">Related Multipart</value>
         <value xml:lang="fr">Multipart apparenté</value>
-        <value xml:lang="it">Related Multipart</value>
         <value xml:lang="ja">マルチパートリテーテッド</value>
         <value xml:lang="pt">Multipart relacionado</value>
-        <value xml:lang="ro">Related Multipart</value>
         <value xml:lang="th">ส่วนที่เกี่ยวข้องกัน</value>
         <value xml:lang="zh">内嵌的多段内容</value>
         <value xml:lang="zh_TW">內嵌的多段內容</value>
     </property>
     <property key="MimeType.description.multipart/signed">
-        <value xml:lang="da">Signed Multipart</value>
-        <value xml:lang="de">Signed Multipart</value>
         <value xml:lang="en">Signed Multipart</value>
         <value xml:lang="fr">Multipart signé</value>
-        <value xml:lang="it">Signed Multipart</value>
         <value xml:lang="ja">マルチパートサインド</value>
-        <value xml:lang="pt">Signed Multipart</value>
-        <value xml:lang="ro">Signed Multipart</value>
         <value xml:lang="th">ส่วนเดียว</value>
         <value xml:lang="zh">签名的多段内容</value>
         <value xml:lang="zh_TW">簽名的多段內容</value>
     </property>
     <property key="MimeType.description.text/css">
         <value xml:lang="da">CSS Tekst</value>
-        <value xml:lang="de">CSS Text</value>
         <value xml:lang="en">CSS Text</value>
         <value xml:lang="fr">Texte CSS</value>
         <value xml:lang="it">Testo CSS</value>
@@ -2914,7 +2670,6 @@
         <value xml:lang="zh_TW">AVI視頻</value>
     </property>
     <property key="MimeType.description.video/mp4">
-        <value xml:lang="da">MPEG-4 (H.264) Video</value>
         <value xml:lang="en">MPEG-4 (H.264) Video</value>
         <value xml:lang="it">Video MPEG-4 (H.264)</value>
         <value xml:lang="ja">MPEG-4 (H.264) ビデオ</value>
@@ -2923,8 +2678,6 @@
         <value xml:lang="zh_TW">MPEG-4 (H.264)視頻</value>
     </property>
     <property key="MimeType.description.video/mpeg">
-        <value xml:lang="da">MPEG/MPG Video</value>
-        <value xml:lang="de">MPEG/MPG Video</value>
         <value xml:lang="en">MPEG/MPG Video</value>
         <value xml:lang="fr">Vidéo MPEG/MPG</value>
         <value xml:lang="it">Video MPEG/MPG</value>
@@ -2936,8 +2689,6 @@
         <value xml:lang="zh_TW">MPEG/MPG視頻</value>
     </property>
     <property key="MimeType.description.video/quicktime">
-        <value xml:lang="da">Quicktime Video</value>
-        <value xml:lang="de">Quicktime Video</value>
         <value xml:lang="en">Quicktime Video</value>
         <value xml:lang="fr">Vidéo Quicktime</value>
         <value xml:lang="it">Video Quicktime</value>
@@ -2949,7 +2700,6 @@
         <value xml:lang="zh_TW">Quicktime視頻</value>
     </property>
     <property key="MimeType.description.video/x-flv">
-        <value xml:lang="da">Flash Streaming Video</value>
         <value xml:lang="en">Flash Streaming Video</value>
         <value xml:lang="it">Video flash in streaming</value>
         <value xml:lang="ja">Flash ストリーミングビデオ</value>
@@ -2959,7 +2709,6 @@
         <value xml:lang="zh_TW">Flash流視頻</value>
     </property>
     <property key="MimeType.description.video/x-ms-asf">
-        <value xml:lang="da">ASF Video</value>
         <value xml:lang="en">ASF Video</value>
         <value xml:lang="it">Video ASF</value>
         <value xml:lang="ja">ASF ビデオ</value>
@@ -2968,7 +2717,6 @@
         <value xml:lang="zh_TW">ASF視頻</value>
     </property>
     <property key="MimeType.description.video/x-ms-wm">
-        <value xml:lang="da">WM Video</value>
         <value xml:lang="en">WM Video</value>
         <value xml:lang="it">Video WM</value>
         <value xml:lang="ja">WM ビデオ</value>
@@ -2977,7 +2725,6 @@
         <value xml:lang="zh_TW">WM視頻</value>
     </property>
     <property key="MimeType.description.video/x-ms-wmv">
-        <value xml:lang="da">WMV Video</value>
         <value xml:lang="en">WMV Video</value>
         <value xml:lang="it">Video WMV</value>
         <value xml:lang="ja">WMV ビデオ</value>
@@ -2986,7 +2733,6 @@
         <value xml:lang="zh_TW">WMV視頻</value>
     </property>
     <property key="MimeType.description.video/x-ms-wmx">
-        <value xml:lang="da">WMX Video</value>
         <value xml:lang="en">WMX Video</value>
         <value xml:lang="it">Video WMX</value>
         <value xml:lang="ja">WMX ビデオ</value>
@@ -2995,7 +2741,6 @@
         <value xml:lang="zh_TW">WMX視頻</value>
     </property>
     <property key="MimeType.description.video/x-ms-wvx">
-        <value xml:lang="da">WVX Video</value>
         <value xml:lang="en">WVX Video</value>
         <value xml:lang="it">Video WVX</value>
         <value xml:lang="ja">WVX ビデオ</value>
@@ -3405,17 +3150,7 @@
         <value xml:lang="zh_TW">簡短文本 (單行)</value>
     </property>
     <property key="SurveyQuestionType.description.URL">
-        <value xml:lang="da">URL</value>
-        <value xml:lang="de">URL</value>
         <value xml:lang="en">URL</value>
-        <value xml:lang="es">URL</value>
-        <value xml:lang="fr">URL</value>
-        <value xml:lang="it">URL</value>
-        <value xml:lang="ja">URL</value>
-        <value xml:lang="pt">URL</value>
-        <value xml:lang="ro">URL</value>
-        <value xml:lang="th">URL</value>
-        <value xml:lang="vi">URL</value>
         <value xml:lang="zh">网址</value>
         <value xml:lang="zh_TW">網址</value>
     </property>

Modified: ofbiz/branches/jackrabbit20120501/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/content/config/ContentUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/content/config/ContentUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -417,19 +417,7 @@
         <value xml:lang="zh_TW">瀏覽</value>
     </property>
     <property key="ContentCMS">
-        <value xml:lang="ar">CMS</value>
-        <value xml:lang="da">CMS</value>
-        <value xml:lang="de">CMS</value>
         <value xml:lang="en">CMS</value>
-        <value xml:lang="es">CMS</value>
-        <value xml:lang="fr">CMS</value>
-        <value xml:lang="it">CMS</value>
-        <value xml:lang="ja">CMS</value>
-        <value xml:lang="nl">CMS</value>
-        <value xml:lang="pt">CMS</value>
-        <value xml:lang="ro">CMS</value>
-        <value xml:lang="th">CMS</value>
-        <value xml:lang="vi">CMS</value>
         <value xml:lang="zh">内容管理系统</value>
         <value xml:lang="zh_TW">內容管理系統</value>
     </property>
@@ -1215,21 +1203,10 @@
         <value xml:lang="zh_TW">屬性</value>
     </property>
     <property key="ContentDataResourceHtml">
-        <value xml:lang="ar">Html</value>
-        <value xml:lang="da">Html</value>
-        <value xml:lang="de">Html</value>
         <value xml:lang="en">Html</value>
-        <value xml:lang="es">Html</value>
-        <value xml:lang="fr">Html</value>
-        <value xml:lang="it">Html</value>
         <value xml:lang="ja">HTML</value>
-        <value xml:lang="nl">Html</value>
         <value xml:lang="pt">HTML</value>
-        <value xml:lang="ro">Html</value>
-        <value xml:lang="th">Html</value>
         <value xml:lang="vi">HTML</value>
-        <value xml:lang="zh">Html</value>
-        <value xml:lang="zh_TW">Html</value>
     </property>
     <property key="ContentDataResourceImage">
         <value xml:lang="ar">صورة</value>
@@ -1699,14 +1676,8 @@
         <value xml:lang="zh">开始日期（fromDate）不是有效的日期格式</value>
     </property>
     <property key="ContentGIF">
-        <value xml:lang="da">GIF</value>
         <value xml:lang="en">GIF</value>
-        <value xml:lang="fr">GIF</value>
-        <value xml:lang="it">GIF</value>
-        <value xml:lang="ja">GIF</value>
-        <value xml:lang="pt">GIF</value>
         <value xml:lang="vi">Ảnh GIF</value>
-        <value xml:lang="zh">GIF</value>
     </property>
     <property key="ContentGoToContent">
         <value xml:lang="da">GÃ¥ til indhold</value>
@@ -1749,21 +1720,7 @@
         <value xml:lang="zh_TW">轉到查找</value>
     </property>
     <property key="ContentHtml">
-        <value xml:lang="ar">Html</value>
-        <value xml:lang="da">Html</value>
-        <value xml:lang="de">Html</value>
-        <value xml:lang="en">Html</value>
-        <value xml:lang="es">Html</value>
-        <value xml:lang="fr">HTML</value>
-        <value xml:lang="it">Html</value>
-        <value xml:lang="ja">HTML</value>
-        <value xml:lang="nl">Html</value>
-        <value xml:lang="pt">HTML</value>
-        <value xml:lang="ro">Html</value>
-        <value xml:lang="th">Html</value>
-        <value xml:lang="vi">HTML</value>
-        <value xml:lang="zh">Html</value>
-        <value xml:lang="zh_TW">Html</value>
+        <value xml:lang="en">HTML</value>
     </property>
     <property key="ContentHtmlText">
         <value xml:lang="da">Html tekst</value>
@@ -1859,14 +1816,8 @@
         <value xml:lang="zh">索引树时出错：${errorString}</value>
     </property>
     <property key="ContentJPEG">
-        <value xml:lang="da">JPEG</value>
         <value xml:lang="en">JPEG</value>
-        <value xml:lang="fr">JPG</value>
-        <value xml:lang="it">JPEG</value>
-        <value xml:lang="ja">JPEG</value>
-        <value xml:lang="pt">JPEG</value>
         <value xml:lang="vi">Ảnh JPEG</value>
-        <value xml:lang="zh">JPEG</value>
     </property>
     <property key="ContentKeyword">
         <value xml:lang="de">Schlüsselwörter</value>
@@ -2281,14 +2232,8 @@
         <value xml:lang="zh_TW">PDF/調查名稱</value>
     </property>
     <property key="ContentPNG">
-        <value xml:lang="da">PNG</value>
         <value xml:lang="en">PNG</value>
-        <value xml:lang="fr">PNG</value>
-        <value xml:lang="it">PNG</value>
-        <value xml:lang="ja">PNG</value>
-        <value xml:lang="pt">PNG</value>
         <value xml:lang="vi">Ảnh PNG</value>
-        <value xml:lang="zh">PNG</value>
     </property>
     <property key="ContentParent">
         <value xml:lang="da">Forældre indhold</value>
@@ -2582,9 +2527,6 @@
     </property>
     <property key="ContentSEO">
         <value xml:lang="en">SEO</value>
-        <value xml:lang="ja">SEO</value>
-        <value xml:lang="pt">SEO</value>
-        <value xml:lang="vi">SEO</value>
         <value xml:lang="zh">搜索引擎优化</value>
     </property>
     <property key="ContentSearchContents">
@@ -3271,14 +3213,8 @@
         <value xml:lang="zh_TW">帶有問題</value>
     </property>
     <property key="ContentTIFF">
-        <value xml:lang="da">TIFF</value>
         <value xml:lang="en">TIFF</value>
-        <value xml:lang="fr">TIFF</value>
-        <value xml:lang="it">TIFF</value>
-        <value xml:lang="ja">TIFF</value>
-        <value xml:lang="pt">TIFF</value>
         <value xml:lang="vi">Ảnh TIFF</value>
-        <value xml:lang="zh">TIFF</value>
     </property>
     <property key="ContentTemplate">
         <value xml:lang="ar">نموذج</value>
@@ -3529,17 +3465,10 @@
         <value xml:lang="zh_TW">已上傳的文件</value>
     </property>
     <property key="ContentUrl">
-        <value xml:lang="ar">Url</value>
-        <value xml:lang="da">Url</value>
-        <value xml:lang="de">Url</value>
         <value xml:lang="en">Url</value>
         <value xml:lang="fr">URL</value>
-        <value xml:lang="it">Url</value>
-        <value xml:lang="ja">UR</value>
+        <value xml:lang="ja">URL</value>
         <value xml:lang="pt">URL</value>
-        <value xml:lang="ro">Url</value>
-        <value xml:lang="th">Url</value>
-        <value xml:lang="vi">Url</value>
         <value xml:lang="zh">网址</value>
         <value xml:lang="zh_TW">網址</value>
     </property>
@@ -4814,11 +4743,10 @@
     </property>
     <property key="FormFieldTitle_httpHost">
         <value xml:lang="ar"> حاوي Http</value>
-        <value xml:lang="da">HTTP host</value>
         <value xml:lang="de">HTTP Server</value>
         <value xml:lang="en">Http Host</value>
         <value xml:lang="es">Host Http</value>
-        <value xml:lang="fr">Centre serveur HTTP</value>
+        <value xml:lang="fr">Serveur HTTP</value>
         <value xml:lang="it">Host Http</value>
         <value xml:lang="ja">HTTPサーバ</value>
         <value xml:lang="pt">Host http</value>
@@ -4831,8 +4759,6 @@
     </property>
     <property key="FormFieldTitle_httpPort">
         <value xml:lang="ar">بوابة Http</value>
-        <value xml:lang="da">Http port</value>
-        <value xml:lang="de">Http Port</value>
         <value xml:lang="en">Http Port</value>
         <value xml:lang="es">Puerto Http</value>
         <value xml:lang="fr">Port HTTP</value>
@@ -4852,7 +4778,7 @@
         <value xml:lang="de">Https Server</value>
         <value xml:lang="en">Https Host</value>
         <value xml:lang="es">Host Https</value>
-        <value xml:lang="fr">Centre serveur HTTPS</value>
+        <value xml:lang="fr">Serveur HTTPS</value>
         <value xml:lang="it">Host Https</value>
         <value xml:lang="ja">HTTPSサーバ</value>
         <value xml:lang="pt">Host https</value>
@@ -4865,8 +4791,6 @@
     </property>
     <property key="FormFieldTitle_httpsPort">
         <value xml:lang="ar">Https بوابة</value>
-        <value xml:lang="da">Https port</value>
-        <value xml:lang="de">Https Port</value>
         <value xml:lang="en">Https Port</value>
         <value xml:lang="es">Puerto Https</value>
         <value xml:lang="fr">Port HTTPS</value>

Modified: ofbiz/branches/jackrabbit20120501/applications/content/src/org/ofbiz/content/content/ContentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/content/src/org/ofbiz/content/content/ContentServices.java (original)
+++ ofbiz/branches/jackrabbit20120501/applications/content/src/org/ofbiz/content/content/ContentServices.java Mon Dec 23 09:26:58 2013
@@ -885,7 +885,7 @@ public class ContentServices {
             locale = (Locale) templateContext.get("locale");
         }
         GenericValue subContentDataResourceView = (GenericValue) context.get("subContentDataResourceView");
-        if (subContentDataResourceView != null && subContentDataResourceView == null) {
+        if (templateContext != null && subContentDataResourceView == null) {
             subContentDataResourceView = (GenericValue) templateContext.get("subContentDataResourceView");
         }
 

Modified: ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Mon Dec 23 09:26:58 2013
@@ -110,7 +110,7 @@ under the License.
           <#list productsData as productData>
             <#assign node = productData.node>
             <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-              <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}${externalKeyParam}" class="buttontext">${node.product.productId}</a></td>
+              <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${node.product.productId}</a></td>
               <td>${node.product.internalName?default("&nbsp;")}</td>
               <td align="right">${node.quantity}</td>
               <td align="right">${productData.qoh?if_exists}</td>
@@ -118,7 +118,7 @@ under the License.
               <#if productData.unitCost?exists && (productData.unitCost > 0)>
               <td align="right">${productData.unitCost?if_exists}</td>
               <#else>
-              <td align="right"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}${externalKeyParam}" class="buttontext">NA</a></td>
+              <td align="right"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">NA</a></td>
               </#if>
               <td align="right">${productData.totalCost?if_exists}</td>
             </tr>