svn commit: r904735 - in /ofbiz/trunk/applications/content: config/ContentUiLabels.xml widget/CommonScreens.xml widget/WebSiteScreens.xml

[buscob]

Author: buscob
Date: Sat Jan 30 08:49:59 2010
New Revision: 904735

URL: http://svn.apache.org/viewvc?rev=904735&view=rev
Log:
Merged multiple labels in one

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/content/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/widget/WebSiteScreens.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=904735&r1=904734&r2=904735&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Sat Jan 30 08:49:59 2010
@@ -605,6 +605,13 @@
         <value xml:lang="it">Creare un nuovo template CompDoc Root</value>
         <value xml:lang="zh">新建根合成文档模板</value>
     </property>
+    <property key="ContentCreateNewWebSite">
+        <value xml:lang="da">Opret ny Webside</value>
+        <value xml:lang="en">Create New WebSite</value>
+        <value xml:lang="fr">Créer un nouveau Site Web</value>
+        <value xml:lang="it">Nuovo sito web</value>
+        <value xml:lang="nl">Aanmaken nieuwe website</value>
+    </property>
     <property key="ContentDataBaseText">
         <value xml:lang="da">Database tekst</value>
         <value xml:lang="en">DataBase Text</value>

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=904735&r1=904734&r2=904735&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sat Jan 30 08:49:59 2010
@@ -334,7 +334,7 @@
                             <widgets>
                                 <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${webSite.siteName} [${webSite.webSiteId}]  ${${extraFunctionName}}"/>
                                 <container style="button-bar">
-                                    <link  text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.ContentWebSite}" target="EditWebSite" style="buttontext create"/>
+                                    <link  text="${uiLabelMap.ContentCreateNewWebSite}" target="EditWebSite" style="buttontext create"/>
                                 </container>
                                 <decorator-section-include name="body"/>
                             </widgets>

Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=904735&r1=904734&r2=904735&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sat Jan 30 08:49:59 2010
@@ -41,7 +41,7 @@
                             <widgets>
                                 <screenlet title="${uiLabelMap.PageTitleListWebSite}">
                                     <container style="button-bar">
-                                        <link  text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.ContentWebSite}" target="EditWebSite" style="buttontext create"/>
+                                        <link  text="${uiLabelMap.ContentCreateNewWebSite}" target="EditWebSite" style="buttontext create"/>
                                     </container>
                                     <include-form name="ListWebSites" location="component://content/webapp/content/website/WebSiteForms.xml"/>
                                 </screenlet>