[portal-commits] JBoss Portal SVN: r11846 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf and 3 other directories.

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Tue Sep 9 12:43:42 EDT 2008 

Author: chris.laprun at jboss.com
Date: 2008-09-09 12:43:42 -0400 (Tue, 09 Sep 2008)
New Revision: 11846

Modified:
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
   branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
   branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
   branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
- JBPORTAL-2119: Fixed duplicated localization keys

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties	2008-09-09 16:43:42 UTC (rev 11846)
@@ -32,7 +32,7 @@
 CURRENT_DISPLAY_NAMES=Current Display Names
 SAVE=Save
 MANAGE=Manage
-PORTALS=portals
+PORTALS_NO_CAP=portals
 PORTAL=portal
 SUB_PORTALS=sub-portals
 PAGES_WITHIN=pages within
@@ -52,7 +52,7 @@
 EVENT_LISTENER_BINDING=Event Listener Binding
 CHOOSE_ID_PORTALEVENTLISTENER=Choose the id of the PortalEventListener to bind to this
 SET_PERMISSIONS_FOR=Please set the permissions for the
-WINDOW=window
+WINDOW_NO_CAP=window
 WINDOW_THEME_PROPERTIES=Window theme properties
 INSTANCE_ID=Instance id
 INSTANCE_NAME=Instance name
@@ -60,7 +60,7 @@
 PREFERENCES=Preferences
 PORTLET_DETAILS=portlet details
 ASSOCIATED_PORTLET_NOT_AVAILABLE=The associated portlet is not available
-PREFERENCES=preferences
+PREFERENCES_NO_CAP=preferences
 SECURITY_SETTINGS=security settings
 MAKE_DEFAULT=Make Default
 MANAGE_WINDOWS_WITHIN=Manage windows within
@@ -157,7 +157,7 @@
 COMMON_CANCEL=Cancel
 COMMON_UPDATE=Update
 COMMON_ADD=Add
-COMMON_ADD_PROPERTY=Add Property
+COMMON_ADD_PROPERTY_BUTTON=Add Property
 COMMON_UP=Up
 COMMON_DOWN=Down
 COMMON_NEW_VALUE=New value

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties	2008-09-09 16:43:42 UTC (rev 11846)
@@ -52,7 +52,7 @@
 EVENT_LISTENER_BINDING=Event-Listener-Verkn\u00fcpfung
 CHOOSE_ID_PORTALEVENTLISTENER=W\u00e4hlen Sie die ID des zu verkn\u00fcpfenden PortalEventListener
 SET_PERMISSIONS_FOR=Bitte legen Sie die Berechtigungen fest f\u00fcr
-WINDOW=Fenster
+WINDOW_NO_CAP=Fenster
 WINDOW_THEME_PROPERTIES=Fenster-Design-Eigenschaften
 INSTANCE_ID=Instanz-ID
 INSTANCE_NAME=Instanz-Name
@@ -60,12 +60,12 @@
 PREFERENCES=Eigenschaften
 PORTLET_DETAILS=Portlet-Details
 ASSOCIATED_PORTLET_NOT_AVAILABLE=Das zugewiesene Portlet ist nicht verf\u00fcgbar
-PREFERENCES=Eigenschaften
+PREFERENCES_NO_CAP=Eigenschaften
 SECURITY_SETTINGS=Sicherheitseinstellungen
 MAKE_DEFAULT=Zum Standard machen
 MANAGE_WINDOWS_WITHIN=Enthaltene Fenster verwalten
 PORTAL_OBJECTS=Portal-Objekte
-PORTALS=Portale
+PORTALS_NO_CAP=Portale
 PORTLET_NAME=Portlet-Name
 DESCRIPTION=Beschreibung
 REMOTE=Remote
@@ -157,7 +157,7 @@
 COMMON_CANCEL=Abbrechen
 COMMON_UPDATE=Aktualisieren
 COMMON_ADD=Hinzuf\u00fcgen
-COMMON_ADD_PROPERTY=Eigenschaft hinzuf\u00fcgen
+COMMON_ADD_PROPERTY_BUTTON=Eigenschaft hinzuf\u00fcgen
 COMMON_UP=Nach oben
 COMMON_DOWN=Nach unten
 COMMON_NEW_VALUE=Neuer Wert

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties	2008-09-09 16:43:42 UTC (rev 11846)
@@ -23,7 +23,7 @@
 
 PORTLET_INSTANCES=Istanze di Portlet
 INSTANCE_DELETE=Cancella Istanza
-PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00F9 abilitate a visualizzarne il contenuto
+PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00f9 abilitate a visualizzarne il contenuto
 ARE_YOU_SURE_DELETE=Sei sicuro di voler cancellare quest\'istanza di Portlet ?
 DASHBOARD_THEME_PROPERTIES=Propriet\u00e0 del tema della Dashboard
 CONFIGURE_DASHBOARD_SETTINGS=Configurazione della Dashboard
@@ -32,7 +32,7 @@
 CURRENT_DISPLAY_NAMES=Nomi attualmente visualizzati
 SAVE=Salva
 MANAGE=Gestisci
-PORTALS=portali
+PORTALS_NO_CAP=portali
 PORTAL=portale
 SUB_PORTALS=sotto-portali
 PAGES_WITHIN=pagine dentro
@@ -53,7 +53,7 @@
 EVENT_LISTENER_BINDING=Ascoltatore di eventi
 CHOOSE_ID_PORTALEVENTLISTENER=Scegli l\'id del PortalEventListener per agganciarti a questo
 SET_PERMISSIONS_FOR=Configura i permessi per
-WINDOW=finestra
+WINDOW_NO_CAP=finestra
 WINDOW_THEME_PROPERTIES=Propriet\u00e0 del tema della Finestra
 INSTANCE_ID=Id di Istanza
 INSTANCE_NAME=Nome Istanza
@@ -155,7 +155,7 @@
 COMMON_CANCEL=Annulla
 COMMON_UPDATE=Aggiorna
 COMMON_ADD=Aggiungi
-COMMON_ADD_PROPERTY=Aggiungi Propriet\u00e0
+COMMON_ADD_PROPERTY_BUTTON=Aggiungi Propriet\u00e0
 COMMON_UP=Su
 COMMON_DOWN=Giu
 COMMON_NEW_VALUE=Nuovo valore

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml	2008-09-09 16:43:42 UTC (rev 11846)
@@ -59,7 +59,7 @@
                   </tbody>
                </table>
                <!-- ends layout of property form -->
-               <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY}"
+               <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY_BUTTON}"
                                 styleClass="portlet-form-button portlet-section-buttonrow"
                                 action="#{properties.action.updateProperty}"/></h:form>
 

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml	2008-09-09 16:43:42 UTC (rev 11846)
@@ -12,7 +12,7 @@
          <h3 class="sectionTitle tenpx-top-bottom">
             #{bundle.MANAGE} &#160;
             <c:choose>
-               <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when>
+               <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS_NO_CAP}</c:when>
                <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{bundle.PORTAL}</c:otherwise>
             </c:choose>
          </h3>

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml	2008-09-09 16:43:42 UTC (rev 11846)
@@ -8,7 +8,7 @@
       <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/>
       <ui:define name="content">
          <h3>#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
-            #{bundle.WINDOW}</h3>
+            #{bundle.WINDOW_NO_CAP}</h3>
          <ui:include src="common/editSecurity.xhtml"/>
       </ui:define>
    </ui:composition>

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml	2008-09-09 16:43:42 UTC (rev 11846)
@@ -111,7 +111,7 @@
          </li>
          <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
          <li class="selected">
-            <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES}
+            <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES_NO_CAP}
          </li>
       </ul>
    </h:form>

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml	2008-09-09 16:43:42 UTC (rev 11846)
@@ -118,7 +118,7 @@
          </li>
          <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
          <li class="selected">
-            <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.PREFERENCES}
+            <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.PREFERENCES_NO_CAP}
          </li>
       </ul>
    </h:form>

Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties	2008-09-09 16:43:42 UTC (rev 11846)
@@ -121,7 +121,6 @@
 CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window, or, in the case of binary content, outside of the portlet window altogether
 CMS_TO_MODIFY=To modify how this portlet behaves, please
 CMS_CLICK_HERE=click here
-CMS_SELECT_ACTION=Select Action
 
 CMS_QUERYERROR=The query you entered is not valid
 
@@ -130,8 +129,8 @@
 CMS_ADMIN_SET_MANAGE_PERMISSIONS=Set Manage Permissions
 CMS_ADMIN_SELECT_ROLES=Select Roles that have access to this node.
 CMS_ADMIN_SELECT_USERS=Select Users that have access to this node.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=You may select multiple roles by using CTRL+click on the role names.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=You may select multiple users by using CTRL+click on the usernames.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=You may select multiple roles by using CTRL+click (CMD+click on a Mac) on the role names.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=You may select multiple users by using CTRL+click (CMD+click on a Mac) on the usernames.
 
 CMS_ACCESS_DENIED=Access Denied
 CMS_ACCESS_DENIED_DESCRIPTION=You are not allowed to access this resource

Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties	2008-09-09 16:43:42 UTC (rev 11846)
@@ -114,14 +114,13 @@
 CMS_ERROR=Errore
 CMS_PENDING_APPROVAL_QUEUE=Coda in attesa di approvazione
 CMS_CONFIGURE_RESTRICTION=Configura le restrizioni di sicurezza sul nodo
-CMS_SELECT_ACTION=Seleziona l\'azione...
+CMS_SELECT_ACTION=Seleziona un\'azione...
 CMS_BROWSING=Navigazione
 CMS_CONTENT_NOT_FOUND=Non ci sono contenuti per il file selezionato
 CMS_INTRODUCTION=Introduzione
 CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra
 CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet,
 CMS_CLICK_HERE=clicca qui
-CMS_SELECT_ACTION=Seleziona un\'azione
 
 CMS_QUERYERROR=The query you entered is not valid
 
@@ -130,5 +129,5 @@
 CMS_ADMIN_SET_MANAGE_PERMISSIONS=Configura i permessi in modalit\u00e0 amministrativa
 CMS_ADMIN_SELECT_ROLES=Seleziona i ruoli che hanno accesso a questo nodo.
 CMS_ADMIN_SELECT_USERS=Seleziona gli utenti che hanno accesso a questo nodo.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=Puoi selezionare pi\u00F9 ruoli usando il CTRL+click sui nomi dei ruoli.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Puoi selezionare pi\u00F9 utenti usando il CTRL+click sui nomi degli utenti.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=Puoi selezionare pi\u00f9 ruoli usando il CTRL+click sui nomi dei ruoli.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Puoi selezionare pi\u00f9 utenti usando il CTRL+click sui nomi degli utenti.

Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp	2008-09-09 15:17:47 UTC (rev 11845)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp	2008-09-09 16:43:42 UTC (rev 11846)
@@ -3,10 +3,8 @@
 <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
 <%@ page isELIgnored="false" %>
 
-<%@ page import="org.jboss.portal.cms.model.Content,
-                 org.jboss.portal.cms.util.NodeUtil" %>
-<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
-<%@ page import="java.text.Format" %>
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants,
+                 java.text.Format" %>
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.Iterator" %>
@@ -109,7 +107,7 @@
    <div class="menu">
 
       <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
-         <option value="">${n:i18n("CMS_SELECT_ACTION")}...</option>
+         <option value="">${n:i18n("CMS_SELECT_ACTION")}</option>
          <%
             if (sType.equals("text/html") || sType.equals("text/plain"))
             {

More information about the portal-commits mailing list