svn commit: r1023458 - in /ofbiz/trunk: framework/common/config/CommonUiLabels.xml specialpurpose/myportal/config/MyPortalUiLabels.xml

[buscob]

Author: buscob
Date: Sun Oct 17 11:11:52 2010
New Revision: 1023458

URL: http://svn.apache.org/viewvc?rev=1023458&view=rev
Log:
Moved/Merged portalPage related labels from MyPortal to Common.

Modified:
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1023458&r1=1023457&r2=1023458&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sun Oct 17 11:11:52 2010
@@ -9005,15 +9005,23 @@
         <value xml:lang="zh">由用户登录标识修改</value>
     </property>
     <property key="FormFieldTitle_originalPortalPageId">
-        <value xml:lang="en">Original Portal Page Id</value>
+        <value xml:lang="en">original page</value>
+        <value xml:lang="fr">Page d'orig.</value>        
         <value xml:lang="it">Codice pagina portale originale</value>
     </property>
     <property key="FormFieldTitle_parentPortalPageId">
-        <value xml:lang="en">Parent Portal Page Id</value>
-        <value xml:lang="it">Codice pagina portale padre</value>
+        <value xml:lang="en">Parent page</value>
+        <value xml:lang="fr">Page père</value>
+        <value xml:lang="it">Pagina portale padre</value>
+    </property>
+    <property key="FormFieldTitle_portalPageName">
+        <value xml:lang="en">Portal page name</value>
+        <value xml:lang="fr">Nom de page</value>
+        <value xml:lang="it">Nome pagina portale</value>
     </property>
     <property key="FormFieldTitle_ownerUserLoginId">
         <value xml:lang="en">Owner User Login ID</value>
+        <value xml:lang="fr">Propri.</value>
         <value xml:lang="it">Codice login proprietario</value>
     </property>
     <property key="FormFieldTitle_price">

Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=1023458&r1=1023457&r2=1023458&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Sun Oct 17 11:11:52 2010
@@ -19,26 +19,6 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="FormFieldTitle_originalPortalPageId">
-        <value xml:lang="en">original page</value>
-        <value xml:lang="fr">Page d'orig.</value>
-    </property>
-    <property key="FormFieldTitle_ownerUserLoginId">
-        <value xml:lang="en">Owner</value>
-        <value xml:lang="fr">Propri.</value>
-    </property>
-    <property key="FormFieldTitle_parentPortalPageId">
-        <value xml:lang="en">Parent page</value>
-        <value xml:lang="fr">Page père</value>
-    </property>
-    <property key="FormFieldTitle_portalPageName">
-        <value xml:lang="en">Portal page name</value>
-        <value xml:lang="fr">Nom de page</value>
-    </property>
-    <property key="FormFieldTitle_sequenceNum">
-        <value xml:lang="en">Seq.</value>
-        <value xml:lang="fr">Seq.</value>
-    </property>
     <property key="MyPortalAppBar">
         <value xml:lang="en">My Page App Bar</value>
         <value xml:lang="fr">Menu des applications</value>