Author: thomas.heute(a)jboss.com Date: 2008-06-30 11:18:57 -0400 (Mon, 30 Jun 2008) New Revision: 11210 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_it.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml Log: Merging changes applied on 2.7 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-06-30 14:24:16 UTC (rev 11209) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-06-30 15:18:57 UTC (rev 11210) @@ -123,4 +123,11 @@ CMS_CLICK_HERE=click here CMS_SELECT_ACTION=Select Action -CMS_QUERYERROR=The query you entered is not valid>>>>>>> .merge-right.r11144 +CMS_QUERYERROR=The query you entered is not valid + +CMS_ADMIN_SET_READ_PERMISSIONS=Set Read Permissions +CMS_ADMIN_SET_WRITE_PERMISSIONS=Set Write Permissions +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. 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-06-30 14:24:16 UTC (rev 11209) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-06-30 15:18:57 UTC (rev 11210) @@ -33,7 +33,7 @@ TITLE_EDIT=Modifica File TITLE_CREATE=Creazione File TITLE_UPLOAD=Caricamento File -TITLE_SECURECONFIRM=Nodo sicuro +TITLE_SECURECONFIRM=Sicurezza sul Nodo CMS_SEARCH=Ricerca CMS_SEARCHNORESULT=Nessun risultato per questa ricerca @@ -51,19 +51,20 @@ CMS_FOLDER=Cartella CMS_FILE=File CMS_CREATE=Crea -CMS_CANCEL=annullamento +CMS_CANCEL=Annulla CMS_EDIT=Edita CMS_UPLOAD=Caricamento CMS_MODIFY=Modifica CMS_CREATEFOLDER= Crea Cartella CMS_CREATEFILE=Crea File CMS_UPLOADARCHIVE=Carica Archivio -CMS_UPLOADARCHIVE_ASYNC=Carica Archivio in modo asincrono +CMS_UPLOADARCHIVE_ASYNC=Processione asincrona CMS_BACKTOBROWSER=Torna al Navigatore delle Directory CMS_TRANSFER=Importa/Esporta CMS_EXPORTARCHIVE=Esporta Cartella -CMS_SECURE=Sicurezza +CMS_SECURE=Rendi sicuro CMS_PREVIEW=Anteprima +CMS_GO=Vai CMS_CREATEFILEINDIR=Crea File nella Directory CMS_FILENAME=Nome del File @@ -98,8 +99,8 @@ CMS_EMPTY_FOLDER=Questa cartella \u00e8 vuota . -CMS_ERROR_UPLOADARCHIVE_ASYNC=Si \u00e8 verificato un errore nell\'aggiornamento dell\'archivio. Riprova attivando la modalit\u00e0 asincrona -CMS_MSG_UPLOADARCHIVE_ASYNC=L\'archivio \u00e8 stato accettato. Le risorse appariranno nella tua cartella una volta terminato il processo +CMS_ERROR_UPLOADARCHIVE_ASYNC=Si \u00e8 verificato un errore nel processare l\'archivio. Riprova attivando il servizio di processione asincrona +CMS_MSG_UPLOADARCHIVE_ASYNC=Il tuo archivio sta per essere processato. Una volta terminato il processo le risorse appariranno nella tua cartella CMS_REQUIRED=Obbligatorio CMS_LINK_TO_RESOURCES=I link alle risorse all\'interno del portale devono essere assoluti. Per esempio: Un link a un\'immagine che si trova in in default/images/back.gif deve essere digitato esattamente come mostrato. Non iniziare mai il percorso con uno (/). Puoi verificare la correttezza del link cliccando sul bottone di anteprima dell1'editor @@ -119,4 +120,15 @@ 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 \ No newline at end of file +CMS_CLICK_HERE=clicca qui +CMS_SELECT_ACTION=Seleziona un\'azione + +CMS_QUERYERROR=The query you entered is not valid + +CMS_ADMIN_SET_READ_PERMISSIONS=Configura i permessi in lettura +CMS_ADMIN_SET_WRITE_PERMISSIONS=Configura i permessi in scrittura +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. Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-06-30 14:24:16 UTC (rev 11209) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-06-30 15:18:57 UTC (rev 11210) @@ -61,7 +61,7 @@ <td class="portlet-section-alternate" colspan="2"> <table> <tr> - <td colspan="2" class="portlet-section-header" align="center">Set Read Permissions</td> + <td colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_ADMIN_SET_READ_PERMISSIONS")}</td> </tr> <tr> <td> @@ -84,8 +84,8 @@ %> </select> </td> - <td>Select Roles that have access to this node.<br/> - (You may select multiple roles by using CTRL+click on the role names.) + <td>${n:i18n("CMS_ADMIN_SELECT_ROLES")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES")}) </td> </tr> <tr> @@ -109,8 +109,8 @@ %> </select> </td> - <td>Select Users that have access to this node.<br/> - (You may select multiple users by using CTRL+click on the user names.) + <td>${n:i18n("CMS_ADMIN_SELECT_USERS")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS")}) </td> </tr> </table> @@ -123,7 +123,7 @@ <td class="portlet-section-alternate" colspan="2"> <table> <tr> - <td colspan="2" class="portlet-section-header" align="center">Set Write Permissions</td> + <td colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_ADMIN_SET_WRITE_PERMISSIONS")}</td> </tr> <tr> <td> @@ -146,8 +146,8 @@ %> </select> </td> - <td>Select Roles that have access to this node.<br/> - (You may select multiple roles by using CTRL+click on the role names.) + <td>${n:i18n("CMS_ADMIN_SELECT_ROLES")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES")}) </td> </tr> <tr> @@ -171,8 +171,8 @@ %> </select> </td> - <td>Select Users that have access to this node.<br/> - (You may select multiple users by using CTRL+click on the user names.) + <td>${n:i18n("CMS_ADMIN_SELECT_USERS")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS")}) </td> </tr> </table> @@ -185,7 +185,7 @@ <td class="portlet-section-alternate" colspan="2"> <table> <tr> - <td colspan="2" class="portlet-section-header" align="center">Set Manage Permissions</td> + <td colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_ADMIN_SET_MANAGE_PERMISSIONS")}</td> </tr> <tr> <td> @@ -208,8 +208,8 @@ %> </select> </td> - <td>Select Roles that have access to this node.<br/> - (You may select multiple roles by using CTRL+click on the role names.) + <td>${n:i18n("CMS_ADMIN_SELECT_ROLES")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES")}) </td> </tr> <tr> @@ -233,8 +233,8 @@ %> </select> </td> - <td>Select Users that have access to this node.<br/> - (You may select multiple users by using CTRL+click on the user names.) + <td>${n:i18n("CMS_ADMIN_SELECT_USERS")}<br/> + (${n:i18n("CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS")}) </td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-06-30 14:24:16 UTC (rev 11209) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-06-30 15:18:57 UTC (rev 11210) @@ -331,6 +331,8 @@ <if-exists>keep</if-exists> <page> <page-name>TestWithAjax</page-name> + <display-name xml:lang="en">TestWithAjax</display-name> + <display-name xml:lang="it">TestConAjax</display-name> <properties> <property> <name>theme.dyna.partial_refresh_enabled</name>