You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2014/05/28 13:11:43 UTC

svn commit: r910223 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/no/about-downloads.html content/no/index.html

Author: buildbot
Date: Wed May 28 11:11:43 2014
New Revision: 910223

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/about-downloads.html
    websites/staging/ooo-site/trunk/content/no/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed May 28 11:11:43 2014
@@ -1 +1 @@
-1597894
+1597973

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed May 28 11:11:43 2014
@@ -1 +1 @@
-1597894
+1597973

Modified: websites/staging/ooo-site/trunk/content/no/about-downloads.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/no/about-downloads.html (original)
+++ websites/staging/ooo-site/trunk/content/no/about-downloads.html Wed May 28 11:11:43 2014
@@ -68,69 +68,8 @@ announce&nbsp;@&nbsp;no.openoffice.org</
      <em>Viktig endring i versjon 2.3: Hyperlenker følges ved å holde Ctrl-tasten nede mens du klikker på lenka. </em>
 	</p>
 
-     Endringer i <a href="http://development.openoffice.org/releases/3.3.0.html">versjon&nbsp;3.3.0</a></span>
+     Endringer i <a href="index.html">versjon&nbsp;4.1.0</a></span>
 
-      <table>
-        <tr>
-          <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> &ndash;
-		<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>
-          </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>
-	      </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>
-	      </li>
-	    </ul>
-	  </td>
-	</tr>
-      </table>
-
-     Endringer i <a href="http://development.openoffice.org/releases/3.2.0.html">versjon&nbsp;3.2.0</a></span>
-
-      <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> &ndash;
-                <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>
-	      </li>
-	    </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>
-            </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>
-	    </ul>
-	  </td>
-	</tr>
-      </table>
 
 <!--     <p>Hvis du vil laste ned Windows-versjonen med Java, gå <a href="http://download.openoffice.org/other.html">hit</a>
       og kryss av for «Include the Java JRE with this download».</p>-->
@@ -140,23 +79,6 @@ announce&nbsp;@&nbsp;no.openoffice.org</
   <div id="md5sums" style="display: none">
     <p>Ved å sjekke MD5-summen kan du være trygg på at nedlastinga har gått feilfritt. <a href="http://www.openoffice.org/dev_docs/using_md5sums.html">Les mer.</a></p>
 
-    <pre>
-    f42182f93735053b936482cc853de9da OOo_3.3.0_Linux_x86_install-rpm_nb.tar.gz
-    48aecfed9bc823491201f5f3d0058507 OOo_3.3.0_Linux_x86_install-deb_nb.tar.gz
-    0f62c5505520d5384ca82947ffbe4ab5 OOo_3.3.0_Linux_x86-64_install-rpm-wJRE_nb.tar.gz
-    36f46ef3886dc38b5f74be8bb41e269f OOo_3.3.0_Linux_x86-64_install-deb_nb.tar.gz
-    64e24cfd4aac5a4226c7533b560e8f99 OOo_3.3.0_MacOS_x86_install_nb.dmg
-    fabb89753c8f0404802463023899ca91 OOo_3.3.0_Win_x86_install_nb.exe
-    5d582653ce7b5127c364e8befcf11165 OOo_3.3.0_Win_x86_install-wJRE_nb.exe
-
-    ace144d21a59a22e4fbad9a7eb47aa67 OOo_3.2.0_Linux_x86_install-rpm_nn.tar.gz
-    ff81ad7d73f1127153b74c66d9da464c OOo_3.2.0_Linux_x86_install-deb_nn.tar.gz
-    e76bc64dbc7afff6cd722ffce76ddc78 OOo_3.2.0_Linux_x86-64_install-rpm-wJRE_nn.tar.gz
-    bd46bd6d44665f989af2b83a7e8d9173 OOo_3.2.0_Linux_x86-64_install-deb_nn.tar.gz
-    4b27eede15150c88311617909dbcb989 OOo_3.2.0_Win_x86_install_nn.exe
-    124aee1e8fec2c9ade7b53f92a7f0134 OOo_3.2.0_Win_x86_install_wJRE_nn.exe
-    </pre>
-
   </div>
 
     <p>Les mer om installasjon av RPM lenger nede på siden.</p>

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 Wed May 28 11:11:43 2014
@@ -57,7 +57,7 @@
 
       <h2>Om Apache OpenOffice</h2>
 
-      <p>OpenOffice.org er ein fri (open og gratis) kontorpakke
+      <p>OpenOffice er ein fri (open og gratis) kontorpakke
       &ndash; omsett til bokmål, nynorsk og mange andre språk.</p>
 
     </div> <!-- "omooo" -->
@@ -70,9 +70,9 @@
 
 
     <div id="nedlasting">
-     <h2 class="topploes">Last ned Apache OpenOffice.org 3.4.1 &mdash;
+     <h2 class="topploes">Last ned Apache OpenOffice 4.1.0 &mdash;
      <span class="mindre">
-     Endringer i <a href="http://www.openoffice.org/development/releases/3.4.1.html">versjon&nbsp;3.4.1</a></span>
+     Endringer i <a href="http://www.openoffice.org/development/releases/4.1.0.html">versjon&nbsp;4.1.0</a></span>
      </h2>
 
       <table>
@@ -80,24 +80,24 @@
           <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.4.1/Apache_OpenOffice_incubating_3.4.1_Win_x86_install_nb.exe/download">uten java</a><br />
+		<a href="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.0/binaries/nb/Apache_OpenOffice_4.1.0_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.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>
+		<a href="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.0/binaries/nb/Apache_OpenOffice_4.1.0_Linux_x86_install-rpm_nb.tar.gz/download">RPM</a> &ndash;
+		<a href="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.0/binaries/nb/Apache_OpenOffice_4.1.0_Linux_x86_install-deb_nb.tar.gz/download">DEB</a><br />
+	    <a href="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.0/binaries/nb/Apache_OpenOffice_4.1.0_Linux_x86-64_install-rpm_nb.tar.gz/download">64-bit, RPM</a>
+		<a href="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.0/binaries/nb/Apache_OpenOffice_4.1.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>Bokmål,&nbsp;MacOS&nbsp;X</strong><br>
-	        <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><strong>Bokmål,&nbsp;MacOS&nbsp;X &gt;= 10.7</strong><br>
+	        <a href="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.0/binaries/nb/Apache_OpenOffice_4.1.0_MacOS_x86-64_install_nb.dmg/download">For Intel-baserte maskiner</a>
 	      </li>
 	    </ul>
 	  </td>
@@ -107,43 +107,7 @@
 	  
 	  
 
-
     <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.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>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>
-          </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>
-	      </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>
-	      </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,