You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ks...@apache.org on 2011/12/30 17:48:02 UTC

svn commit: r801312 - in /websites/production/ooo-site: ./ content/it/ content/it/informazioni/ content/it/supporto/ content/projects/

Author: kschenk
Date: Fri Dec 30 16:48:01 2011
New Revision: 801312

Log:
Publishing merge to ooo-site site by kschenk

Modified:
    websites/production/ooo-site/   (props changed)
    websites/production/ooo-site/content/it/index.html
    websites/production/ooo-site/content/it/informazioni/contatti.html
    websites/production/ooo-site/content/it/informazioni/index.html
    websites/production/ooo-site/content/it/supporto/index.html
    websites/production/ooo-site/content/projects/accepted.html
    websites/production/ooo-site/content/projects/incubator.html
    websites/production/ooo-site/content/projects/native-lang.html

Propchange: websites/production/ooo-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 30 16:48:01 2011
@@ -1 +1 @@
-/websites/staging/ooo-site/trunk:797592-801207
+/websites/staging/ooo-site/trunk:797592-801311

Modified: websites/production/ooo-site/content/it/index.html
==============================================================================
--- websites/production/ooo-site/content/it/index.html (original)
+++ websites/production/ooo-site/content/it/index.html Fri Dec 30 16:48:01 2011
@@ -4,7 +4,7 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
 
-  <title>Apache OpenOffice.org in Italiano - Sito ufficiale</title>
+  <title>Apache OpenOffice (OpenOffice.org) in Italiano - Sito ufficiale</title>
 
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -21,7 +21,7 @@
   </style>
   <link rel="stylesheet" type="text/css" href="http://www.openoffice.org/branding/css/print.css" media="print" />
   <meta name="keywords" content="OpenOffice.org, Open Office, OpenOffice, openoffice, StarOffice, Star Office, OOo, ooo, xml, open source, developer, UNO" />
-  <meta name="description" content="Apache OpenOffice.org: The Open Office Suite" />
+  <meta name="description" content="Apache OpenOffice: The Open Office Suite" />
   <style type="text/css" media="screen, projection">
 /*<![CDATA[*/
 <!--
@@ -96,10 +96,10 @@ utenti
 
 info generali</span></a> </li>
 
-  <li> <a href="contribuire/index.html" class="button" id="buttonnativelang" title="Collaborare ai progetti Apache OpenOffice.org"><span>collaborare</span></a>
+  <li> <a href="contribuire/index.html" class="button" id="buttonnativelang" title="Collaborare al progetto OpenOffice"><span>collaborare</span></a>
   </li>
 
-  <li> <a href="doc/index.html" class="button" id="buttonnew" title="Documentazione su Apache OpenOffice.org"><span>documentazione</span></a>
+  <li> <a href="doc/index.html" class="button" id="buttonnew" title="Documentazione su OpenOffice"><span>documentazione</span></a>
   </li>
 
   <li> <a href="supporto/index.html" class="button" id="buttonnativelang" title="Dove trovare supporto gratuito e professionale per OpenOffice.org "><span>supporto</span></a></li>
@@ -131,9 +131,9 @@ info generali</span></a> </li>
 
 </div>
 
-<h1> Benvenuti in Apache OpenOffice.org </h1>
+<h1> Benvenuti in OpenOffice </h1>
 
-<p> Apache OpenOffice.org &egrave; una&nbsp;<a href="informazioni/prodotto/writer.html">suite</a>
+<p> OpenOffice.org, ora <em>Apache OpenOffice (incubating)</em>, &egrave; una&nbsp;<a href="informazioni/prodotto/writer.html">suite</a>
 per ufficio completa, rilasciata con una licenza libera e Open Source
 che ne
 consente la distribuzione gratuita. Legge e scrive file nei formati
@@ -144,7 +144,7 @@ accessibilit&agrave; dei dati, nel forma
 ISO.
 Consente inoltre l'esportazione in formato PDF.<br />
 
-Apache OpenOffice.org &egrave; liberamente, gratuitamente e legalmente
+OpenOffice &egrave; liberamente, gratuitamente e legalmente
 utilizzabile in ogni
 contesto: pubblico, privato, professionale e aziendale.<br />
 

Modified: websites/production/ooo-site/content/it/informazioni/contatti.html
==============================================================================
--- websites/production/ooo-site/content/it/informazioni/contatti.html (original)
+++ websites/production/ooo-site/content/it/informazioni/contatti.html Fri Dec 30 16:48:01 2011
@@ -90,11 +90,11 @@
       <p><b>Attenzione! </b>gli indirizzi elencati su questa pagina <b>non </b>sono
 un help-desk tecnico gratuito per gli utenti della Suite. Il loro
 compito principale &egrave; di fornire un'informazione corretta e
-tempestiva su pache OpenOffice.org, il processo di sviluppo e il prodotto,
+tempestiva su Apache OpenOffice, il processo di sviluppo e il prodotto,
 agli utenti, sviluppatori, aziende ed esponenti della stampa che ne
 facessero richiesta, nonch&eacute; di indirizzare verso il giusto
 sotto-progetto o sezione tutti coloro che si trovassero spaesati di
-fronte alla vastit&agrave; della Comunit&agrave; Apache OpenOffice.org.</p>
+fronte alla vastit&agrave; della Comunit&agrave; OpenOffice.</p>
  
         <p>Il supporto pu&ograve; essere fornito da <a href="../supporto/professionale/">aziende terze</a> rispetto al progetto.</p>
       </td>

Modified: websites/production/ooo-site/content/it/informazioni/index.html
==============================================================================
--- websites/production/ooo-site/content/it/informazioni/index.html (original)
+++ websites/production/ooo-site/content/it/informazioni/index.html Fri Dec 30 16:48:01 2011
@@ -4,7 +4,7 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
     
-  <title>Apache OpenOffice.org in Italiano</title>
+  <title>Apache OpenOffice (OpenOffice.org) in Italiano</title>
 
   
   
@@ -74,7 +74,7 @@
 
 
 
-  <li>Come ottenere Apache OpenOffice.org:<br />
+  <li>Come ottenere Apache OpenOffice (OpenOffice.org):<br />
 
 
 
@@ -146,7 +146,7 @@ Le domande poste pi&ugrave; frequentemen
 
       <li><a href="/it/documentazione/">La
 Documentazione e i modelli</a> forniti dalla Comunit&agrave;
-Apache OpenOffice.org</li>
+OpenOffice</li>
 
 
 

Modified: websites/production/ooo-site/content/it/supporto/index.html
==============================================================================
--- websites/production/ooo-site/content/it/supporto/index.html (original)
+++ websites/production/ooo-site/content/it/supporto/index.html Fri Dec 30 16:48:01 2011
@@ -4,7 +4,7 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
 
-  <title>Supporto Apache OpenOffice.org</title>
+  <title>Supporto Apache OpenOffice (OpenOffice.org)</title>
 
 
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -75,23 +75,23 @@
 </h1>
 
 <h1 class="welcometitle">Benvenuti al Supporto di
-OpenOffice.org</h1>
+Apache OpenOffice (OpenOffice.org)</h1>
 
 <span class="modified">$Date: 2010/03/27 10:23:41 $</span>
 <span style="clear: both;">&nbsp;</span>
-<p> Benvenuti alla sezione di supporto di OpenOffice.org.
+<p> Benvenuti alla sezione di supporto di OpenOffice.
 Elencati qui ci sono i collegamenti a <a href="#fcs">supporto
 gratuito della </a>comunit&agrave;, <a href="#cst">supporto
 e formazione professionale</a>, <a href="#oob">Libri
-su OpenOffice.org</a>, e <a href="#gcr">risorse
+su OpenOffice</a>, e <a href="#gcr">risorse
 generali della </a>comunit&agrave;. </p>
 
 <p><strong>Le risorse sono elencate a titolo
 puramente informativo; non sono necessariamente collegate al
-progetto OpenOffice.org e non forniamo alcuna garanzia sui loro servizi.
+progetto OpenOffice e non forniamo alcuna garanzia sui loro servizi.
 </strong></p>
 
-<p>Se siete un nuovo utente di Apache OpenOffice.org, vi consigliamo vivamente
+<p>Se siete un nuovo utente di OpenOffice, vi consigliamo vivamente
 di
 leggere l'ultima versione della Guida Utente disponibile per la vostra
 versione: situata qui in <a href="/doc/index.html">italiano</a>
@@ -119,7 +119,7 @@ Modelli, guide, corsi ed altra documenta
 
         <li><span class="title">Mailing List Utenti</span>&nbsp;(<a href="mailto:ooo-utenti-it-subscribe@incubator.apache.org">Iscrizione</a>
 / <a href="http://openoffice.org/projects/it/lists/utenti/archive">
-Archivio</a>)<br />
+Archivio storico</a>)<br />
 
 Supporto gratuito della comunit&agrave;&nbsp;OpenOffice.org
 fornito da
@@ -149,7 +149,7 @@ Iscrizioni ed archivi delle liste italia
 
 Supporto tra utenti, con archivio disponibile tramite Google Gruppi</li>
 
-        <li><span class="title"><a href="http://ooo-forum.apache.org/it/forum/">Forum Apache in italiano</a></span><br />
+        <li><span class="title"><a href="http://user.services.openoffice.org/it/forum/">Forum in italiano</a></span><br />
 
 Domande e risposte tra utenti, brevi guide</li>
 
@@ -279,7 +279,7 @@ Microsystems, Inc.</a></span><br />
 <div class="support">
 <ul>
 
-  <li><span class="title"><a href="http://wiki.services.openoffice.org/wiki/It.openoffice.org">Apache OpenOffice.org
+  <li><span class="title"><a href="http://wiki.services.openoffice.org/wiki/It.openoffice.org">OpenOffice
 Wiki in italiano</a></span><br />
 
 Sezione italiana del wiki, utilizzato per sviluppo e contributi vari<span class="title"></span></li>

Modified: websites/production/ooo-site/content/projects/accepted.html
==============================================================================
--- websites/production/ooo-site/content/projects/accepted.html (original)
+++ websites/production/ooo-site/content/projects/accepted.html Fri Dec 30 16:48:01 2011
@@ -5,7 +5,7 @@
 
 
 <meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8" />
-<title>OpenOffice.org Accepted Projects</title>
+<title>Apache OpenOffice.org Accepted Projects</title>
 
 
 </head>
@@ -53,17 +53,17 @@
   
     
     
-  <p><strong>Categories: </strong><a href="accepted.html">Accepted Projects</a>, <a href="incubator.html">Incubator Projects</a>, <a href="native-lang.html">Native-Lang Projects</a></p>
+  <p><strong>Categories: </strong><a href="accepted.html">Focus Areas</a>, <a href="incubator.html">Incubator Areas</a>, <a href="native-lang.html">Native-Lang Confederation</a></p>
   <h1><br />
-   Teams of Apache OpenOffice (Legacy Projects of OpenOffice.org)</h1>
-  <p>The following Apache OpenOffice Teams provide core technical development as well as key user information. To learn how you can get involved in any of these areas of Apache OpenOffice,
+   Focus Areas of Apache OpenOffice (Legacy Projects of OpenOffice.org)</h1>
+  <p>The following Apache OpenOffice Focus Areas provide core technical development as well as key user information. To learn how you can get involved in any of these areas of Apache OpenOffice,
    please see <a href="http://incubator.apache.org/openofficeorg/get-involved.html">Getting Involved</a>. 
-   The best way to get started with participating in any of these teams is to review posts and subscribe to the Apache OpenOffice development mailing list described on the  <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">Mailing List</a> page.
+   The best way to get started with participating in any of these areas is to review posts and subscribe to the Apache OpenOffice development mailing list described on the  <a href="http://incubator.apache.org/openofficeorg/mailing-lists.html">Mailing List</a> page.
    If a previous OpenOffice.org project is not listed here, it may well be in the <a href="/projects/incubator.html">Incubator</a> or <a href="/projects/native-lang.html">Native-Lang</a> category.</p>
   <table cellpadding="4" cellspacing="2"  width="100%">
    <thead>
   <tr>
-    <th class="blue" width="20%">Project </th>
+    <th class="blue" width="20%">Focus Area </th>
     <th class="blue" width="10%">Short Name</th>
     <th class="blue" width="50%">Description</th>
     
@@ -216,9 +216,7 @@ The main goal of the User Experience Tea
 </table>
   <br />
    <br />
-   <font color="#cccccc">
-$Date: 2010/11/04 19:51:01 $ $Revision: 1.68 $
-</font>
+  
 
 
   </div>

Modified: websites/production/ooo-site/content/projects/incubator.html
==============================================================================
--- websites/production/ooo-site/content/projects/incubator.html (original)
+++ websites/production/ooo-site/content/projects/incubator.html Fri Dec 30 16:48:01 2011
@@ -52,18 +52,17 @@
   <div id="content">
   
     
+      
+    <p><strong>Categories:</strong> <a href="accepted.html">Focus Areas</a>, <a href="incubator.html">Incubator Areas</a>, <a href="native-lang.html">Native-Lang Confederation</a></p>
     
-  <div class="Acta1">
-    <dl>
-      <dt><strong>Categories:</strong> <a href="accepted.html">Accepted Projects</a>, <a href="incubator.html">Incubator Projects</a>, <a href="native-lang.html">Native-Lang Projects</a></dt>
-    </dl>
-    <h1>Incubator Projects of OpenOffice.org</h1>
-    <p><strong>Category Lead: <a href="mailto:louis@openoffice.org">Louis Suárez-Potts</a></strong></p>
-    <p>The Incubator category exists to provide a space for community members to test ideas. These ideas can be coding or not. Any member of OpenOffice.org is entitled to create an Incubator project. All you need is the evident support of the community. If you would like to propose a new Incubator project, please see the <a href="//about_us/protocols_proposing.html">Guidelines</a> on protocols for proposing new projects.</p>
+    <h1>Incubator Areas of OpenOffice.org</h1>
+    <p><strong>Incubator Contact: <a href="mailto:louis@openoffice.org">Louis Suárez-Potts</a></strong></p>
+    <p>The Incubator category exists to provide a space for community members to test ideas. These ideas can be coding or not. Any member of Apache OpenOfficeis entitled to propose a new Incubator area. All you need is the evident support of the community. 
+    If you would like to propose a new Incubator project, please <a href="mailto: ooo-dev-subscribe@incubator.apache.org">subscribe to the Apache OpenOffice Development List</a>. </p>
     <table border="0" cellpadding="2">
       <tbody>
         <tr>
-          <th class="blue">Project</th>
+          <th class="blue">Incubator Area</th>
           <th class="blue">Short Name</th>
           <th class="blue">Project Leads</th>
         </tr>
@@ -180,7 +179,7 @@
         </tr>
       </tbody>
     </table>
-  </div>
+
 
 
   </div>

Modified: websites/production/ooo-site/content/projects/native-lang.html
==============================================================================
--- websites/production/ooo-site/content/projects/native-lang.html (original)
+++ websites/production/ooo-site/content/projects/native-lang.html Fri Dec 30 16:48:01 2011
@@ -56,7 +56,7 @@
   
     
     
-  <p><strong>Categories: </strong><a href="accepted.html">Accepted Projects </a>, <a href="incubator.html">Incubator Projects</a>, <a href="native-lang.html">Native-Lang Projects</a></p>
+  <p><strong>Categories: </strong><a href="accepted.html">Focus Areas </a>, <a href="incubator.html">Incubator Areas</a>, <a href="native-lang.html">Native-Lang Confederation</a></p>
 
    <ul>