Author: buildbot
Date: Sun Feb  3 01:03:22 2013
New Revision: 849188

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/no/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Feb  3 01:03:22 2013
@@ -1 +1 @@
-1441845
+1441849

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Feb  3 01:03:22 2013
@@ -1 +1 @@
-1441845
+1441849

Modified: websites/staging/ooo-site/trunk/content/no/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/no/index.html (original)
+++ websites/staging/ooo-site/trunk/content/no/index.html Sun Feb  3 01:03:22 
2013
@@ -6,7 +6,6 @@
   <title>OpenOffice.org</title>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
   <link rel="stylesheet" type="text/css" href="no.css" />
-  <link rel="alternate" type="application/rss+xml" title="RSS 2.0" 
href="http://no.openoffice.org/no.rss"; />
 
 <script src="../scripts/entourage.js"></script>
 
@@ -58,64 +57,24 @@
 
     <div class="omooo">
 
-      <h2>Om OpenOffice.org</h2>
+      <h2>Om Apache OpenOffice</h2>
 
       <p>OpenOffice.org er ein fri (open og gratis) kontorpakke
       &ndash; omsett til bokmål, nynorsk og mange andre språk.</p>
 
-      <p>Dei norske omsetjingane er finansierte av stiftinga
-      <a href="translation.html">Åpne kontorprogram på norsk</a>,
-      som er eit samarbeid mellom fleire kommunar og fylkeskommunar,
-      Skolelinux og Norwegian Unix User Group. Me er avhengige av
-      <a href="sponsors.html">sponsorbidrag</a> for å kunna gjera
-      dette arbeidet.</p>
-
     </div> <!-- "omooo" -->
 
   </div> <!-- "graphicalpresentation" -->
 
   <div id="midten">
 
-    <h1>OpenOffice.org <br />&ndash; den frie kontorpakken </h1>
-
-    <!--
-        I "toppnytt" er det plass til ei lita, framheva nyhendesak.
-        Denne treng ikkje vera med.
-    -->
-
-    <!--
-       This is the site for OpenOffice.org, not LibreOffice !
-
-    <div id="toppnytt">
-      <p>En norsk pressemelding om det nyopprettede LibreOffice finner du 
-      nedenfor, under nyheter.
-      </p>
-    </div>
-    -->
+    <h1>Apache OpenOffice <br />&ndash; den frie kontorpakken </h1>
 
-<h2>Apache OpenOffice versjon 3.4</h2>
-       <p>
-               Siste versjon av OpenOffice er 3.4, men den er foreløpig ikke 
klar på norsk. Derfor finner du inntil videre kun versjon 3.3 til nedlasting 
på denne siden.
-
-       </p>
-       <p>
-               Vi er et lite team som jobber med å fullføre siste del av 
oversettelsen av versjon 3.4 til norsk, og hvis du ønsker å være med og 
bidra er du velkommen! 
-               Du finner mer informasjon <a 
href="http://openoffice.apache.org/translate.html";>her</a>. Du bør også melde 
deg på mailing-listen for oversettere ved å sende en 
-               tom e-post til <a 
href="mailto:[email protected]";>[email protected].</a>
-       </p>
-       <p>
-               Det finnes også andre oppgaver vi behøver hjelp med, som å 
oppdatere denne web-siden, være med og promotere bruk av OpenOffice i Norge.
-
-       </p>
-         <p>
-                 (Oslo, oktober 2012)
-         </p>
-       <hr>      
 
     <div id="nedlasting">
-     <h2 class="topploes">Last ned OpenOffice.org 3.3.0 &mdash;
+     <h2 class="topploes">Last ned Apache OpenOffice.org 3.4.1 &mdash;
      <span class="mindre">
-     Endringer i <a 
href="http://development.openoffice.org/releases/3.3.0.html";>versjon&nbsp;3.3.0</a></span>
+     Endringer i <a 
href="http://www.openoffice.org/development/releases/3.4.1.html";>versjon&nbsp;3.4.1</a></span>
      </h2>
 
       <table>
@@ -123,66 +82,71 @@
           <td>
            <ul style="list-style-image: url(ico-win.png)">
               <li><strong>Bokmål,&nbsp;Windows</strong><br>
-               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Win_x86_install_nb.exe/download";>uten
 java</a><br />
-               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Win_x86_install-wJRE_nb.exe/download";>med
 java</a>
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.4.1/Apache_OpenOffice_incubating_3.4.1_Win_x86_install_nb.exe/download";>uten
 java</a><br />
              </li>
             </ul>
           </td>
           <td>
             <ul style="list-style-image: url(ico-tux.png)">
               <li><strong>Bokmål,&nbsp;Linux</strong><br>
-               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Linux_x86_install-rpm_nb.tar.gz/download";>RPM</a>
 &ndash;
-               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Linux_x86_install-deb_nb.tar.gz/download";>DEB</a><br
 />
-               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Linux_x86-64_install-rpm-wJRE_nb.tar.gz/download";>64-bit,
 RPM</a> &ndash;
-               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Linux_x86-64_install-deb_nb.tar.gz/download";>64-bit,
 DEB</a>
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-rpm_nb.tar.gz/download";>RPM</a>
 &ndash;
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86_install-deb_nb.tar.gz/download";>DEB</a><br
 />
+           <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-rpm_nb.tar.gz/download";>64-bit,
 RPM</a>
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.4.1/Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-deb_nb.tar.gz/download";>64-bit,
 DEB</a>
              </li>
             </ul>
           </td>
          <td>
            <ul style="list-style-image: url(ico-osx.png)">
              <li><strong>Bokmål,&nbsp;MacOS&nbsp;X</strong><br>
-               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_MacOS_x86_install_nb.dmg/download";>For
 Intel-baserte maskiner</a>
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.4.1/Apache_OpenOffice_incubating_3.4.1_MacOS_x86_install_nb.dmg/download";>For
 Intel-baserte maskiner</a>
              </li>
            </ul>
          </td>
        </tr>
       </table>
+         
+         
+         
 
-     <h2 class="topploes">Last ned OpenOffice.org 3.2.0 &mdash;
+
+    <div id="nedlasting">
+     <h2 class="topploes">Last ned OpenOffice.org 3.3.0 &mdash;
      <span class="mindre">
-     Endringer i <a 
href="http://development.openoffice.org/releases/3.2.0.html";>versjon&nbsp;3.2.0</a></span>
+     Endringer i <a 
href="http://development.openoffice.org/releases/3.3.0.html";>versjon&nbsp;3.3.0</a></span>
      </h2>
 
       <table>
         <tr>
           <td>
-            <ul style="list-style-image: url(ico-win.png)">
-              <li><strong>Nynorsk,&nbsp;Windows</strong><br>
-                <a 
href="http://openoffice.mirrorbrain.org/files/localized/nn/3.2.0/OOo_3.2.0_Win_x86_install_nn.exe";>uten
 java</a><br />
-                <a 
href="http://openoffice.mirrorbrain.org/files/localized/nn/3.2.0/OOo_3.2.0_Win_x86_install-wJRE_nn.exe";>med
 java</a>
+           <ul style="list-style-image: url(ico-win.png)">
+              <li><strong>Bokmål,&nbsp;Windows</strong><br>
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Win_x86_install_nb.exe/download";>uten
 java</a><br />
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Win_x86_install-wJRE_nb.exe/download";>med
 java</a>
              </li>
-           </ul>
+            </ul>
           </td>
           <td>
             <ul style="list-style-image: url(ico-tux.png)">
-              <li><strong>Nynorsk,&nbsp;Linux</strong><br>
-               <a 
href="http://openoffice.mirrorbrain.org/files/localized/nn/3.2.0/OOo_3.2.0_Linux_x86_install-rpm_nn.tar.gz";>RPM</a>
 &ndash;
-               <a 
href="http://openoffice.mirrorbrain.org/files/localized/nn/3.2.0/OOo_3.2.0_Linux_x86_install-deb_nn.tar.gz";>DEB</a><br
 />
-               <a 
href="http://openoffice.mirrorbrain.org/files/localized/nn/3.2.0/OOo_3.2.0_Linux_x86-64_install-rpm-wJRE_nn.tar.gz";>64-bit,
 RPM</a> &ndash;
-               <a 
href="http://openoffice.mirrorbrain.org/files/localized/nn/3.2.0/OOo_3.2.0_Linux_x86-64_install-deb_nn.tar.gz";>64-bit,
 DEB</a>
+              <li><strong>Bokmål,&nbsp;Linux</strong><br>
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Linux_x86_install-rpm_nb.tar.gz/download";>RPM</a>
 &ndash;
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Linux_x86_install-deb_nb.tar.gz/download";>DEB</a><br
 />
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Linux_x86-64_install-rpm-wJRE_nb.tar.gz/download";>64-bit,
 RPM</a> &ndash;
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_Linux_x86-64_install-deb_nb.tar.gz/download";>64-bit,
 DEB</a>
              </li>
             </ul>
           </td>
          <td>
            <ul style="list-style-image: url(ico-osx.png)">
-             <li><strong>Nynorsk,&nbsp;MacOS&nbsp;X</strong><br>
-               For Intel-baserte maskiner<br />(n/a)
+             <li><strong>Bokmål,&nbsp;MacOS&nbsp;X</strong><br>
+               <a 
href="http://sourceforge.net/projects/openofficeorg.mirror/files/localized/nb/3.3.0/OOo_3.3.0_MacOS_x86_install_nb.dmg/download";>For
 Intel-baserte maskiner</a>
              </li>
            </ul>
          </td>
        </tr>
       </table>
 
+
       <p class="topploes">
 <strong>Java</strong> trengs for mer avanserte funksjoner og for databasen. 
Java kan installeres for seg eller sammen med OOo,
 som i pakken ovenfor.


Reply via email to