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 2012/04/15 10:24:46 UTC

svn commit: r1326270 - in /ofbiz/trunk: applications/marketing/webapp/sfa/contact/ applications/marketing/webapp/sfa/lead/ applications/marketing/widget/sfa/forms/ applications/order/webapp/ordermgr/order/ applications/party/config/ applications/produc...

Author: jleroux
Date: Sun Apr 15 08:24:45 2012
New Revision: 1326270

URL: http://svn.apache.org/viewvc?rev=1326270&view=rev
Log:
Replaces ProductCountry and mostly PartyCountry by CommonCountry and merges all labels in CommonCountry

Modified:
    ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
    ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
    ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
    ofbiz/trunk/applications/party/config/PartyUiLabels.xml
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/customer/EditAddress.ftl
    ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl Sun Apr 15 08:24:45 2012
@@ -90,7 +90,7 @@ under the License.
               <td width="20%"></td>
             </tr>
             <tr>
-              <td width="20%" >${uiLabelMap.PartyCountry}</td>
+              <td width="20%" >${uiLabelMap.CommonCountry}</td>
               <td width="30%">${contactInfo1.country?if_exists}</td>
               <td width="30%">${contactInfo2.country?if_exists}</td>
               <td width="20%"></td>

Modified: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (original)
+++ ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl Sun Apr 15 08:24:45 2012
@@ -94,7 +94,7 @@ under the License.
               <td width="20%"></td>
             </tr>
             <tr>
-              <td width="20%" >${uiLabelMap.PartyCountry}</td>
+              <td width="20%" >${uiLabelMap.CommonCountry}</td>
               <td width="30%">${contactInfo1.country?if_exists}</td>
               <td width="30%">${contactInfo2.country?if_exists}</td>
               <td width="20%"></td>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/AccountForms.xml Sun Apr 15 08:24:45 2012
@@ -224,7 +224,7 @@ under the License.
             </drop-down>
         </field>
         <field name="paPostalCode"><text-find/></field>
-        <field name="paCountryGeoId" title="${uiLabelMap.PartyCountry}">
+        <field name="paCountryGeoId" title="${uiLabelMap.CommonCountry}">
             <drop-down allow-empty="true">
                 <list-options key-name="geoId" description="${geoName}" list-name="countries"/>
             </drop-down>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sun Apr 15 08:24:45 2012
@@ -320,7 +320,7 @@ under the License.
             <div class="form-field"><input type="text" class="required number" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div>
           </div>
           <div class="form-row">
-            <label for="countryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label>
+            <label for="countryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label>
             <div class="form-field">
               <select name="shipToCountryGeoId" id="countryGeoId" class="required" style="width: 70%">
                 <#if countryGeoId?exists>

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Sun Apr 15 08:24:45 2012
@@ -25,7 +25,7 @@
         <value xml:lang="fr">Revenu annuel</value>
         <value xml:lang="hi_IN">वार्षिक राजस्व</value>
         <value xml:lang="it">Revisione annuale</value>
-        <value xml:lang="nl">Jaaromzet</value>      
+        <value xml:lang="nl">Jaaromzet</value>
         <value xml:lang="pt_BR">Receita bruta anual</value>
         <value xml:lang="zh">年收入</value>
         <value xml:lang="zh_TW">年收益</value>
@@ -163,7 +163,7 @@
         <value xml:lang="en">Communication Party Id</value>
         <value xml:lang="hi_IN">संचार पार्टी क्रमांक</value>
         <value xml:lang="it">Soggetto comuicazione</value>
-        <value xml:lang="nl">Communicatie Party ID</value>      
+        <value xml:lang="nl">Communicatie Party ID</value>
         <value xml:lang="pt_BR">Id do participante da comunicação</value>
         <value xml:lang="zh">沟通会员标识</value>
         <value xml:lang="zh_TW">通訊成員ID</value>
@@ -260,7 +260,7 @@
         <value xml:lang="en">Deceased Date</value>
         <value xml:lang="fr">Date de décès</value>
         <value xml:lang="it">Data decesso</value>
-        <value xml:lang="nl">Datum overleden</value>        
+        <value xml:lang="nl">Datum overleden</value>
         <value xml:lang="pt_BR">Data de falecimento</value>
         <value xml:lang="zh_TW">忌日</value>
     </property>
@@ -291,7 +291,7 @@
         <value xml:lang="fr">Lieu de stockage de destination</value>
         <value xml:lang="hi_IN">गंतव्य सुविधा क्रमांक(destinationFacilityId)</value>
         <value xml:lang="it">Stabilimento destinazione</value>
-        <value xml:lang="nl">Bestemmingsmagazijn ID</value>     
+        <value xml:lang="nl">Bestemmingsmagazijn ID</value>
         <value xml:lang="pt_BR">Id da instalação de destino</value>
         <value xml:lang="zh">目的地设备标识</value>
         <value xml:lang="zh_TW">目的機構ID</value>
@@ -332,7 +332,7 @@
         <value xml:lang="fr">Mél</value>
         <value xml:lang="hi_IN">ईमेल पता</value>
         <value xml:lang="it">Indirizzo Email</value>
-        <value xml:lang="nl">Emailadres</value>     
+        <value xml:lang="nl">Emailadres</value>
         <value xml:lang="pt_BR">Endereço de e-mail</value>
         <value xml:lang="th">ที่อยู่อีเมล์</value>
         <value xml:lang="zh">电子邮件地址</value>
@@ -419,7 +419,7 @@
         <value xml:lang="fr">Expéditeur</value>
         <value xml:lang="hi_IN">पार्टी क्रमांक से</value>
         <value xml:lang="it">Dal Soggetto</value>
-        <value xml:lang="nl">Van relatie ID</value>     
+        <value xml:lang="nl">Van relatie ID</value>
         <value xml:lang="pt_BR">Id do participante remetente</value>
         <value xml:lang="ro">De la Subiect </value>
         <value xml:lang="ru">От участника</value>
@@ -4301,25 +4301,7 @@
         <value xml:lang="en">Could not create new purpose, a purpose with that type already exists</value>
         <value xml:lang="it">Non è possibile creare una nuova funzione, una funzione con quel tipo esiste già</value>
     </property>
-    <property key="PartyCountry">
-        <value xml:lang="cs">Země</value>
-        <value xml:lang="de">Land</value>
-        <value xml:lang="en">Country</value>
-        <value xml:lang="es">País</value>
-        <value xml:lang="fr">Pays</value>
-        <value xml:lang="hi_IN">देश</value>
-        <value xml:lang="it">Paese</value>
-        <value xml:lang="ja">Country</value>
-        <value xml:lang="nl">Land</value>
-        <value xml:lang="pt_BR">País</value>
-        <value xml:lang="pt_PT">País</value>
-        <value xml:lang="ro">Tara</value>
-        <value xml:lang="ru">Страна</value>
-        <value xml:lang="th">ประเทศ</value>
-        <value xml:lang="zh">国家</value>
-        <value xml:lang="zh_TW">國家</value>
-    </property>
-    <property key="PartyCountryCode">
+    <property key="CommonCountryCode">
         <value xml:lang="cs">Mezinárodní předvolba</value>
         <value xml:lang="de">Landesvorwahl</value>
         <value xml:lang="en">Country Code</value>
@@ -4337,7 +4319,7 @@
         <value xml:lang="zh">国家代码</value>
         <value xml:lang="zh_TW">國碼</value>
     </property>
-    <property key="PartyCountryCodeMissing">
+    <property key="CommonCountryCodeMissing">
         <value xml:lang="de">Landesvorwahl fehlt</value>
         <value xml:lang="en">Country code is Missing</value>
         <value xml:lang="fr">Le code pays manque</value>
@@ -4347,7 +4329,7 @@
         <value xml:lang="zh">找不到国家代码</value>
         <value xml:lang="zh_TW">沒有國碼</value>
     </property>
-    <property key="PartyCountryMissing">
+    <property key="CommonCountryMissing">
         <value xml:lang="cs">Chybí země</value>
         <value xml:lang="de">Land fehlt</value>
         <value xml:lang="en">Country is Missing</value>
@@ -6780,7 +6762,7 @@
         <value xml:lang="en">Main Role</value>
         <value xml:lang="fr">Rôle principal</value>
         <value xml:lang="it">Ruolo principale</value>
-        <value xml:lang="nl">Hoofdrol</value>       
+        <value xml:lang="nl">Hoofdrol</value>
         <value xml:lang="pt_BR">Pepel principal</value>
     </property>
     <property key="PartyManager">
@@ -7191,7 +7173,7 @@
         <value xml:lang="fr">Nom, téléphone et courriel</value>
         <value xml:lang="hi_IN">नाम, फोन और ईमेल</value>
         <value xml:lang="it">Nome, telefono ed Email</value>
-        <value xml:lang="nl">Naam, telefoon en email</value>        
+        <value xml:lang="nl">Naam, telefoon en email</value>
         <value xml:lang="pt_BR">Nome, telefone e e-mail</value>
         <value xml:lang="ru">Телефон и эл.почта </value>
         <value xml:lang="th">ชื่อ เบอร์โทรศัพท์ และอีเมล์</value>
@@ -9258,7 +9240,7 @@
         <value xml:lang="en">Related Company</value>
         <value xml:lang="fr">Société associée</value>
         <value xml:lang="it">Azienda relativa</value>
-        <value xml:lang="nl">Gerelateerd bedrijf</value>        
+        <value xml:lang="nl">Gerelateerd bedrijf</value>
         <value xml:lang="pt_BR">Empresa relacionada</value>
     </property>
     <property key="PartyRelationSecurity">
@@ -10905,7 +10887,7 @@
         <value xml:lang="en">Username in use, please choose another.</value>
         <value xml:lang="fr">Identifiant de connexion déjà utilisé, choisissez en un autre SVP.</value>
         <value xml:lang="it">Il nome utente è già in uso, per favore sceglierne un altro.</value>
-        <value xml:lang="nl">Deze gebruikersnaam bestaat al. Kiest u alstublieft een andere.</value>        
+        <value xml:lang="nl">Deze gebruikersnaam bestaat al. Kiest u alstublieft een andere.</value>
         <value xml:lang="zh_TW">使用者名稱已使用, 請另行選擇.</value>
     </property>
     <property key="PartyUserNameMissing">

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sun Apr 15 08:24:45 2012
@@ -1280,7 +1280,7 @@
         <value xml:lang="en">CarrierShipmentMethod not found for ShipmentRouteSegment with shipmentId ${shipmentId} and shipmentRouteSegmentId ${shipmentRouteSegmentId}; partyId is ${carrierPartyId} and shipmentMethodTypeId is ${shipmentMethodTypeId};</value>
         <value xml:lang="it">Metodo di spedizione corriere non trovato per la spedizione ${shipmentId} e percorso spedizione ${shipmentRouteSegmentId}; il soggetto è ${carrierPartyId} e il metodo di spedizione è ${shipmentMethodTypeId};</value>
     </property>
-    <property key="FacilityShipmentUpsRouteSegmentThirdPartyCountryNotFound">
+    <property key="FacilityShipmentUpsRouteSegmentThirdCommonCountryNotFound">
         <value xml:lang="en">Third-party country not found for ShipmentRouteSegment with shipmentId ${shipmentId} and shipmentRouteSegmentId ${shipmentRouteSegmentId}</value>
         <value xml:lang="it">Paese soggetto terzo non trovato per la spedizione ${shipmentId} e percorso spedizione ${shipmentRouteSegmentId}</value>
     </property>
@@ -11926,19 +11926,6 @@
         <value xml:lang="zh">没有找到货运——标识</value>
         <value xml:lang="zh_TW">沒有找到貨運ID</value>
     </property>
-    <property key="ProductCountry">
-        <value xml:lang="de">Land</value>
-        <value xml:lang="en">Country</value>
-        <value xml:lang="es">País</value>
-        <value xml:lang="fr">Pays</value>
-        <value xml:lang="it">Paese</value>
-        <value xml:lang="ro">Tara</value>
-        <value xml:lang="ru">Страна</value>
-        <value xml:lang="th">ประเทศ</value>
-        <value xml:lang="vi">Quốc gia</value>
-        <value xml:lang="zh">国家</value>
-        <value xml:lang="zh_TW">國家</value>
-    </property>
     <property key="ProductCountryOfOrigin">
         <value xml:lang="en">Country of Origin</value>
         <value xml:lang="it">Paese di origine</value>
@@ -23341,7 +23328,7 @@
         <value xml:lang="zh">第三方账户数字</value>
         <value xml:lang="zh_TW">第三方帳戶數字</value>
     </property>
-    <property key="ProductShipmentThirdPartyCountryCode">
+    <property key="ProductShipmentThirdCommonCountryCode">
         <value xml:lang="de">Landescode Dritter</value>
         <value xml:lang="en">Third Party Country Code</value>
         <value xml:lang="es">Código país de tercero</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sun Apr 15 08:24:45 2012
@@ -1904,6 +1904,7 @@
     </property>
     <property key="CommonCountry">
         <value xml:lang="ar">بلد</value>
+        <value xml:lang="cs">Země</value>
         <value xml:lang="de">Land</value>
         <value xml:lang="en">Country</value>
         <value xml:lang="es">País</value>
@@ -1911,7 +1912,8 @@
         <value xml:lang="hi_IN">देश</value>
         <value xml:lang="it">Paese</value>
         <value xml:lang="nl">Land</value>
-        <value xml:lang="pt">País</value>
+        <value xml:lang="pt_BR">País</value>
+        <value xml:lang="pt_PT">País</value>
         <value xml:lang="ro">Tara</value>
         <value xml:lang="ru">Страна</value>
         <value xml:lang="th">ประเทศ</value>
@@ -2608,7 +2610,7 @@
     </property>
     <property key="CommonEmailDeliveryFailed">
         <value xml:lang="en">Delivery to the following recipient(s) failed:</value>
-        <value xml:lang="es">El envío a los siguientes destinatarios ha fallado:</value>        
+        <value xml:lang="es">El envío a los siguientes destinatarios ha fallado:</value>
         <value xml:lang="it">Consegna ai seguenti destinatario(i) fallita:</value>
         <value xml:lang="vi">Gửi thất bại đến người nhận sau:</value>
     </property>
@@ -3252,7 +3254,7 @@
         <value xml:lang="zh_TW">女</value>
     </property>
     <property key="CommonFieldLookup">
-        <value xml:lang="de">Feldsuche</value>    
+        <value xml:lang="de">Feldsuche</value>
         <value xml:lang="en">Field Lookup</value>
         <value xml:lang="es">Búsqueda por campo</value>
         <value xml:lang="fr">Recherche pour ce champ</value>
@@ -5479,7 +5481,7 @@
         <value xml:lang="zh_TW">移動到門戶頁面...</value>
     </property>
     <property key="CommonMyPersonalPage">
-        <value xml:lang="de">Persönliche Seite</value>    
+        <value xml:lang="de">Persönliche Seite</value>
         <value xml:lang="en">My Personal Page</value>
         <value xml:lang="es">Mi página personal</value>
         <value xml:lang="fr">Ma propre page</value>
@@ -7596,7 +7598,7 @@
         <value xml:lang="zh_TW">刪除Portlet</value>
     </property>
     <property key="CommonReport">
-        <value xml:lang="de">Bericht</value>    
+        <value xml:lang="de">Bericht</value>
         <value xml:lang="en">Report</value>
         <value xml:lang="es">Informe</value>
         <value xml:lang="fr">Etat</value>
@@ -8861,7 +8863,7 @@
         <value xml:lang="es">Creado correctamente.</value>
         <value xml:lang="fr">Créé avec succès.</value>
         <value xml:lang="vi">Khởi tạo thành công</value>
-    </property>    
+    </property>
     <property key="CommonSummary">
         <value xml:lang="de">Zusammenfassung</value>
         <value xml:lang="en">Summary</value>
@@ -10114,7 +10116,7 @@
         <value xml:lang="zh_TW">視覺風格ID找不到。</value>
     </property>
     <property key="CommonVisualThemeInvalidRecord">
-        <value xml:lang="de">In der Layoutvorlage wurde ein ungültiger Ressourcen-Satz gefunden: visualThemeId = ${visualThemeId}, resourceTypeEnumId = ${resourceTypeEnumId}.</value>    
+        <value xml:lang="de">In der Layoutvorlage wurde ein ungültiger Ressourcen-Satz gefunden: visualThemeId = ${visualThemeId}, resourceTypeEnumId = ${resourceTypeEnumId}.</value>
         <value xml:lang="en">Invalid Visual Theme resource record found: visualThemeId = ${visualThemeId}, resourceTypeEnumId = ${resourceTypeEnumId}.</value>
         <value xml:lang="es">Se ha encontrado una entrada inválida de tema visual: visualThemeId = ${visualThemeId}, resourceTypeEnumId = ${resourceTypeEnumId}.</value>
         <value xml:lang="fr">Ressource de charte graphique trouvée non valable : visualThemeId = ${visualThemeId}, resourceTypeEnumId = ${resourceTypeEnumId}.</value>
@@ -10151,7 +10153,7 @@
         <value xml:lang="zh_TW">沒有找到視覺風格資源。</value>
     </property>
     <property key="CommonVisualThemeSelected">
-        <value xml:lang="de">Ausgewählte Layoutvorlage</value>    
+        <value xml:lang="de">Ausgewählte Layoutvorlage</value>
         <value xml:lang="en">Selected Visual Theme</value>
         <value xml:lang="es">Tema visual seleccionado</value>
         <value xml:lang="fr">Charte graphique sélectionnée</value>
@@ -10169,7 +10171,7 @@
         <value xml:lang="vi">Bấm vào hình để xem, bấm vào liên kết để chọn giao diện, và sau đó bấm vào nút Hoàn tất để lựa chọn của bạn có hiệu lực</value>
     </property>
     <property key="CommonVisualThemes">
-        <value xml:lang="de">Layoutvorlagen</value>    
+        <value xml:lang="de">Layoutvorlagen</value>
         <value xml:lang="en">Visual Themes</value>
         <value xml:lang="es">Temas visuales</value>
         <value xml:lang="fr">Chartes graphiques</value>
@@ -10920,7 +10922,7 @@
         <value xml:lang="zh_TW">建立的使用者</value>
     </property>
     <property key="FormFieldTitle_createdByUserLoginId">
-        <value xml:lang="de">Erstellt von Benutzer-Id</value>    
+        <value xml:lang="de">Erstellt von Benutzer-Id</value>
         <value xml:lang="en">Created By User Login Id</value>
         <value xml:lang="es">Creado por código de usuario</value>
         <value xml:lang="fr">Créé par l'identifiant de connexion</value>
@@ -11179,7 +11181,7 @@
         <value xml:lang="zh_TW">最近修改日</value>
     </property>
     <property key="FormFieldTitle_lastUpdatedTxStamp">
-        <value xml:lang="de">Zeitpunkt der letzten Aktualisierung</value>    
+        <value xml:lang="de">Zeitpunkt der letzten Aktualisierung</value>
         <value xml:lang="en">Last Updated Tx Stamp</value>
         <value xml:lang="es">Última fecha modificación Tx</value>
         <value xml:lang="fr">Dernière mise à jour d'estampille temporelle de transaction créée</value>
@@ -11644,7 +11646,7 @@
         <value xml:lang="zh_TW">入口</value>
     </property>
     <property key="OFBiz Site">
-        <value xml:lang="de">OFBiz Homepage</value>    
+        <value xml:lang="de">OFBiz Homepage</value>
         <value xml:lang="en">OFBiz Site</value>
         <value xml:lang="es">Página web de OFBiz</value>
         <value xml:lang="fr">Site officiel d'OFBiz</value>
@@ -11765,7 +11767,7 @@
         <value xml:lang="zh">结账选项</value>
     </property>
     <property key="PageTitleCommonGeoLocation">
-        <value xml:lang="de">Geografischer Ort des Elements</value>    
+        <value xml:lang="de">Geografischer Ort des Elements</value>
         <value xml:lang="en">Geo Location of requested element</value>
         <value xml:lang="es">Ubicación geográfica del elemento solicitado</value>
         <value xml:lang="fr">Géolocalisation de l'élément demandé</value>
@@ -11938,7 +11940,7 @@
         <value xml:lang="zh">快速添加</value>
     </property>
     <property key="PageTitleViewBlocked">
-        <value xml:lang="de">Zugriff blockiert</value>    
+        <value xml:lang="de">Zugriff blockiert</value>
         <value xml:lang="en">View Blocked</value>
         <value xml:lang="es">Página bloqueada</value>
         <value xml:lang="fr">Page bloquée</value>
@@ -11985,7 +11987,7 @@
         <value xml:lang="zh_TW">無法找到這個頁面(${parameters.portalPageId})！</value>
     </property>
     <property key="PortalPageNotOwned">
-        <value xml:lang="de">Sie sind nicht Besitzer der Seite '${portalPage.portalPageName}' [${portalPage.portalPageId}] deshalb können Sie sie nicht ändern!</value>    
+        <value xml:lang="de">Sie sind nicht Besitzer der Seite '${portalPage.portalPageName}' [${portalPage.portalPageId}] deshalb können Sie sie nicht ändern!</value>
         <value xml:lang="en">The page '${portalPage.portalPageName}' [${portalPage.portalPageId}] is not owned by you, so cannot be changed!</value>
         <value xml:lang="es">La página '${portalPage.portalPageName}' [${portalPage.portalPageId}] no es suya, por lo tanto no puede modificarla!</value>
         <value xml:lang="fr">La page : '${portalPage.portalPageName}' [${portalPage.portalPageId}] ne vous appartient pas, vous ne pouvez la changer !</value>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Sun Apr 15 08:24:45 2012
@@ -177,7 +177,7 @@ under the License.
         *</td>
       </tr>
       <tr>
-        <td align="right" valign="top">${uiLabelMap.PartyCountry}</td>
+        <td align="right" valign="top">${uiLabelMap.CommonCountry}</td>
         <td>&nbsp;</td>
         <td>
           <select name="countryGeoId" class='selectBox'>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Sun Apr 15 08:24:45 2012
@@ -202,7 +202,7 @@ will generally always be reserved for th
     </div>
 
     <div>
-      <label for="customerCountry">${uiLabelMap.PartyCountry}*</label>
+      <label for="customerCountry">${uiLabelMap.CommonCountry}*</label>
       <@fieldErrors fieldName="CUSTOMER_COUNTRY"/>
       <select name="CUSTOMER_COUNTRY" onclick="hideShowUsaStates();" id="customerCountry">
         <#if requestParameters.CUSTOMER_COUNTRY?exists>
@@ -243,7 +243,7 @@ will generally always be reserved for th
       <thead>
         <tr>
           <th></th>
-          <th scope="col">${uiLabelMap.PartyCountry}</th>
+          <th scope="col">${uiLabelMap.CommonCountry}</th>
           <th scope="col">${uiLabelMap.PartyAreaCode}</th>
           <th scope="col">${uiLabelMap.PartyContactNumber}</th>
           <th scope="col">${uiLabelMap.PartyExtension}</th>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl Sun Apr 15 08:24:45 2012
@@ -44,7 +44,7 @@ under the License.
       <span id="advice-required-billToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div>
-      <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*</label>
+      <label for="billToCountryGeoId">${uiLabelMap.CommonCountry}*</label>
       <select name="countryGeoId" id="billToCountryGeoId" class="required">
         <#if billToCountryGeoId??>
           <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo!(billToCountryGeoId!)}</option>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl Sun Apr 15 08:24:45 2012
@@ -45,7 +45,7 @@ under the License.
         <span id="advice-required-postalCode_${contactMech.contactMechId}" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
-        <label for="countryGeoId_${contactMech.contactMechId}">${uiLabelMap.PartyCountry}*</label>
+        <label for="countryGeoId_${contactMech.contactMechId}">${uiLabelMap.CommonCountry}*</label>
         <select name="countryGeoId" id="countryGeoId_${contactMech.contactMechId}" class="required">
           <#if postalAddress.countryGeoId??>
             <#assign geo = delegator.findOne("Geo", Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId", postalAddress.countryGeoId), true) />

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl Sun Apr 15 08:24:45 2012
@@ -44,7 +44,7 @@ under the License.
       <span id="advice-required-shipToPostalCode" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
     </div>
     <div>
-      <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}*</label>
+      <label for="shipToCountryGeoId">${uiLabelMap.CommonCountry}*</label>
       <select name="countryGeoId" id="shipToCountryGeoId" class="required">
         <#if shipToCountryGeoId??>
           <option value="${shipToCountryGeoId!}">${shipToCountryProvinceGeo!(shipToCountryGeoId!)}</option>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Sun Apr 15 08:24:45 2012
@@ -55,7 +55,7 @@ under the License.
             <input type="text" class="required" name="postalCode" id="postalCode" value="" maxlength="10" />
           </div>
           <div>
-            <label for="countryGeoId">${uiLabelMap.PartyCountry}*
+            <label for="countryGeoId">${uiLabelMap.CommonCountry}*
               <span id="advice-required-countryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span>
             </label>
              <select name="countryGeoId" id="countryGeoId" class="required" style="width: 70%">

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl Sun Apr 15 08:24:45 2012
@@ -79,7 +79,7 @@ under the License.
             <input type="text" name="shipToPostalCode" id="shipToPostalCode" class="required" value="${parameters.shipToPostalCode?if_exists}" maxlength="10" />
           </div>
           <div>
-            <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
+            <label for="shipToCountryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-shipToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
             <div>
               <select name="shipToCountryGeoId" id="shipToCountryGeoId">
                 <#if shipToCountryGeoId??>
@@ -136,7 +136,7 @@ under the License.
               <input type="text" name="billToPostalCode" id="billToPostalCode" class="required" value="${parameters.billToPostalCode?if_exists}" maxlength="10" />
             </div>
             <div>
-              <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
+              <label for="billToCountryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-billToCountryGeoId" style="display: none" class="errorMessage">(${uiLabelMap.CommonRequired})</span></label>
               <select name="billToCountryGeoId" id="billToCountryGeoId" class='required selectBox'>
               <#if billToCountryGeoId??>
                 <option value='${billToCountryGeoId!}'>${billToCountryProvinceGeo!(billToCountryGeoId!)}</option>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Sun Apr 15 08:24:45 2012
@@ -93,7 +93,7 @@ under the License.
                   <div>
                   <#if shipToTelecomNumber?has_content>
                       <span>
-                          <label for="shipToCountryCode">${uiLabelMap.PartyCountry}*
+                          <label for="shipToCountryCode">${uiLabelMap.CommonCountry}*
                               <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>
                           <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${shipToTelecomNumber.countryCode?if_exists}" size="5" maxlength="10" /> -
@@ -116,7 +116,7 @@ under the License.
                       </span>
                   <#else>
                       <span>
-                          <label for="shipToCountryCode">${uiLabelMap.PartyCountry}*
+                          <label for="shipToCountryCode">${uiLabelMap.CommonCountry}*
                               <span id="advice-required-shipToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                           </label>
                           <input type="text" name="shipToCountryCode" class="required" id="shipToCountryCode" value="${parameters.shipToCountryCode?if_exists}" size="5" maxlength="10" /> -
@@ -179,7 +179,7 @@ under the License.
                     </div>
                     <div>
                         <span>
-                            <label for="shipToCountryGeoId">${uiLabelMap.PartyCountry}*
+                            <label for="shipToCountryGeoId">${uiLabelMap.CommonCountry}*
                                 <span id="advice-required-shipToCountryGeo" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                             </label>
                             <select name="shipToCountryGeoId" id="shipToCountryGeoId">
@@ -318,7 +318,7 @@ under the License.
                         <div>  
                           <#if billToTelecomNumber?has_content>
                             <span>
-                                <label for="billToCountryCode">${uiLabelMap.PartyCountry}*
+                                <label for="billToCountryCode">${uiLabelMap.CommonCountry}*
                                     <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${billToTelecomNumber.countryCode?if_exists}" size="5" maxlength="10" /> -
@@ -341,7 +341,7 @@ under the License.
                             </span>
                           <#else>
                             <span>
-                                <label for="billToCountryCode">${uiLabelMap.PartyCountry}*
+                                <label for="billToCountryCode">${uiLabelMap.CommonCountry}*
                                     <span id="advice-required-billToCountryCode" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                                 </label>
                                 <input type="text" name="billToCountryCode" class="required" id="billToCountryCode" value="${parameters.billToCountryCode?if_exists}" size="5" maxlength="10" /> -
@@ -440,7 +440,7 @@ under the License.
                               <input id="billToPostalCode" name="billToPostalCode" class="required" type="text" value="${billToPostalCode?if_exists}" size="12" maxlength="10" />
                           </div>
                           <div>
-                              <label for="billToCountryGeoId">${uiLabelMap.PartyCountry}*
+                              <label for="billToCountryGeoId">${uiLabelMap.CommonCountry}*
                                 <span id="advice-required-billToCountryGeoId" style="display:none" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
                               </label>
                               <select name="billToCountryGeoId" id="billToCountryGeoId">

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl Sun Apr 15 08:24:45 2012
@@ -61,7 +61,7 @@ under the License.
   <caption>${uiLabelMap.PartyPhoneNumbers}</caption>
     <tr>
       <th></th>
-      <th scope="col">${uiLabelMap.PartyCountry}</th>
+      <th scope="col">${uiLabelMap.CommonCountry}</th>
       <th scope="col">${uiLabelMap.PartyAreaCode}</th>
       <th scope="col">${uiLabelMap.PartyContactNumber}</th>
       <th scope="col">${uiLabelMap.PartyExtension}</th>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl Sun Apr 15 08:24:45 2012
@@ -86,7 +86,7 @@ under the License.
   *</td>
 </tr>
 <tr>
-  <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
+  <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td>
   <td width="5">&nbsp;</td>
   <td width="74%">
     <select name="countryGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Sun Apr 15 08:24:45 2012
@@ -210,7 +210,7 @@ under the License.
                  *</td>
               </tr>
               <tr>
-                 <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
+                 <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td>
                  <td width="2%">&nbsp;</td>
                  <td width="72%">
                     <@fieldErrors fieldName="shipToCountryGeoId"/>
@@ -305,7 +305,7 @@ under the License.
                  *</td>
               </tr>
               <tr>
-                 <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.PartyCountry}</div></td>
+                 <td width="26%" align="right" valign="middle"><div class="tabletext">${uiLabelMap.CommonCountry}</div></td>
                  <td width="2%">&nbsp;</td>
                  <td width="72%">
                     <@fieldErrors fieldName="billToCountryGeoId"/>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/shipsettings.ftl Sun Apr 15 08:24:45 2012
@@ -43,7 +43,7 @@ under the License.
         <span id="advice-required-postalCode" class="custom-advice errorMessage" style="display:none"> (${uiLabelMap.CommonRequired})</span>
       </div>
       <div>
-        <label for="countryGeoId">${uiLabelMap.PartyCountry}*</label>
+        <label for="countryGeoId">${uiLabelMap.CommonCountry}*</label>
         <select name="countryGeoId" id="countryGeoId">
           <#if countryGeoId??>
             <option value="${countryGeoId!}">${countryProvinceGeo!(countryGeoId!)}</option>

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/customer/EditAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/customer/EditAddress.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/customer/EditAddress.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/customer/EditAddress.ftl Sun Apr 15 08:24:45 2012
@@ -56,7 +56,7 @@ under the License.
     </tr>
     <tr>
       <td width="15%">
-        <b>${uiLabelMap.PartyCountry}</b>
+        <b>${uiLabelMap.CommonCountry}</b>
       </td>
       <td width="35%">
         <input type="text" id="countryProvinceGeo" name="countryProvinceGeo" value="" />

Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl?rev=1326270&r1=1326269&r2=1326270&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl (original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl Sun Apr 15 08:24:45 2012
@@ -71,7 +71,7 @@ under the License.
           <td><b>${uiLabelMap.PartyCity}</b></td>
           <td><b>${uiLabelMap.PartyPostalCode}</b></td>
           <td><b>${uiLabelMap.PartyState}</b></td>
-          <td><b>${uiLabelMap.PartyCountry}</b></td>
+          <td><b>${uiLabelMap.CommonCountry}</b></td>
           <td><b>B/S</b></td>
         </tr>
       </thead>