From 600520e8c41e2ba0903b979e341074ec0a3c0a21 Mon Sep 17 00:00:00 2001
From: Johann Kois <jkois@FreeBSD.org>
Date: Wed, 12 Dec 2018 14:39:34 +0000
Subject: [PATCH] MFde:   Update german websites for 12.0-RELEASE

---
 de_DE.ISO8859-1/htdocs/index.xsl             |   8 +-
 de_DE.ISO8859-1/htdocs/releases/index.xml    |   8 +-
 de_DE.ISO8859-1/htdocs/security/security.xml |  50 +++---
 de_DE.ISO8859-1/htdocs/where.xml             | 159 +++++++++++++------
 de_DE.ISO8859-1/share/xml/navibar.l10n.ent   |   4 +-
 de_DE.ISO8859-1/share/xml/news.xml           |  21 ++-
 de_DE.ISO8859-1/share/xml/release.l10n.ent   |   2 +-
 7 files changed, 167 insertions(+), 85 deletions(-)
diff --git a/de_DE.ISO8859-1/htdocs/index.xsl b/de_DE.ISO8859-1/htdocs/index.xsl
index 2a5e075051..bbbc0eea35 100644
--- a/de_DE.ISO8859-1/htdocs/index.xsl
+++ b/de_DE.ISO8859-1/htdocs/index.xsl
@@ -6,7 +6,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: 52445
+     basiert auf: 52666
 -->
 
 <xsl:stylesheet version="1.0"
@@ -88,10 +88,10 @@
 				  <h2><a href="&base;/releases/">Unterstützte Versionen:</a></h2>
 				  <ul id="frontreleaseslist">
 					<li>
-					  Produktion:&nbsp;<a href="&u.rel.announce;">&rel.current;</a>
-				<?ignore
+					  Produktion:&nbsp;<a href="&u.rel.announce;">&rel.current;</a>,
 				<a
-				  href="&u.rel1.announce;">&rel1.current;</a>,
+				  href="&u.rel1.announce;">&rel1.current;</a>
+				<?ignore
 				<a
 				  href="&u.rel2.announce;">&rel2.current;</a></li>
 				?></li>
diff --git a/de_DE.ISO8859-1/htdocs/releases/index.xml b/de_DE.ISO8859-1/htdocs/releases/index.xml
index 98b58f14fa..5e145d2c14 100644
--- a/de_DE.ISO8859-1/htdocs/releases/index.xml
+++ b/de_DE.ISO8859-1/htdocs/releases/index.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY dedate "$FreeBSDde$">
-<!ENTITY reference "basiert auf: r52321">
+<!ENTITY reference "basiert auf: r52666">
 <!ENTITY title "Release Information">
 ]>
 
@@ -45,7 +45,7 @@
 
     <h3>Produktion</h3>
 
-    <p><b>Release &rel.current;</b> (Juni 2018) <!--(&rel.current.date;) -->
+    <p><b>Release &rel.current;</b> (Dezember 2018) <!--(&rel.current.date;) -->
       <em>
         <a href="&u.rel.announce;">Announcement</a> :
         <a href="&u.rel.notes;">Release Notes</a> :
@@ -56,10 +56,9 @@
 	<a href="&u.rel.signatures;">Checksums</a>
       </em></p>
 
-    <?ignore
     <h3>Produktion (alt)</h3>
 
-    <p><b>Release &rel1.current;</b> (Oktober 2017) <!--(&rel1.current.date;)-->
+    <p><b>Release &rel1.current;</b> (Juni 2018) <!--(&rel1.current.date;)-->
       <em>
 	<a href="&u.rel1.announce;">Announcement</a> :
 	<a href="&u.rel1.notes;">Release Notes</a> :
@@ -70,6 +69,7 @@
 	<a href="&u.rel1.signatures;">Checksums</a>
       </em></p>
 
+    <?ignore
     <h3>Legacy Release</h3>
       <p><b>Release &rel2.current;</b> (&rel2.current.date;)
 	<em>
diff --git a/de_DE.ISO8859-1/htdocs/security/security.xml b/de_DE.ISO8859-1/htdocs/security/security.xml
index 08dcaf4fd2..a2dbed9027 100644
--- a/de_DE.ISO8859-1/htdocs/security/security.xml
+++ b/de_DE.ISO8859-1/htdocs/security/security.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY dedate "$FreeBSDde$">
-<!ENTITY reference "basiert auf: r52328">
+<!ENTITY reference "basiert auf: r52666">
 <!ENTITY title "FreeBSD Sicherheit">
 <!ENTITY advisories.html.inc SYSTEM "advisories.html.inc">
 ]>
@@ -153,7 +153,21 @@
       <th>Typ</th>
       <th>Releasedatum</th>
       <th>Erwartetes EoL</th>
-    </tr>   
+    </tr>
+   <tr>
+      <td>stable/12</td>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>n/a</td>
+      <td>30. Juni 2020 (TBD)</td>
+    </tr>
+    <tr>
+      <td>releng/12.0</td>
+      <td>12.0-RELEASE</td>
+      <td>n/a</td>
+      <td>11. Dezember 2018</td>
+      <td>12.1-RELEASE + 3 Monate</td>
+    </tr>
     <tr>
       <td>stable/11</td>
       <td>n/a</td>
@@ -185,36 +199,22 @@
     und andererseits weiterhin zeitnahe Sicherheitsupdates für alle
     unterstützten Versionen bereitstellen zu können.</p>
 
-  <p>Unter dem neuen Supportmodell wird jede Hauptversion explizit für
+  <p>Unter dem aktuellen Supportmodell wird jede Hauptversion explizit für
     5 Jahre unterstützt, während jede Unterversion nur noch 3 Monate
     nach Erscheinen der folgenden Unterversion unterstützt wird.</p>
-
+ 
   <p>Diese Entscheidung wurde im Februar 2015 getroffen.  Die Gründe
     dafür können in der <a
     href="https://lists.freebsd.org/pipermail/freebsd-announce/2015-February/001624.html">
     offiziellen Ankündigung</a> nachgelesen werden.</p>
 
-  <p>Davor wurden Zweige entweder als <em>Normal</em> oder als
-    <em>Extended</em> eingestuft.  Diese Einstufung diente dazu,
-    die Lebenszeit des Zweiges zu bestimmen:</p>
+  <p>Bitte beachten Sie aber, dass das Core Team gemeinsam mit den
+    Engineering, Security und Port Manager Teams entschieden hat, dieses
+    Modell (beginnend mit <tt>stable/12</tt>) zu überprüfen.</p>
+
+  <p>Weitere Informationen dazu finden Sie in der <a
+    href="https://lists.freebsd.org/pipermail/freebsd-announce/2018-November/001854.html">
+    offiziellen Ankündigung</a> vom November 2018.</p>
 
-  <dl>
-    <dt>Normal</dt>
-    <dd>Releases aus einem -STABLE-Zweig werden für mindestens
-      12&nbsp;Monate nach Erscheinen des Releases gewartet.  Dieser
-      Zeitraum wird gegebenfalls verlängert, um sicherzustellen,
-      dass ein neues normales Release mindestens 3 Monate verfügbar
-      ist, bevor die Unterstützung für das alte normale
-      Release ausläuft.</dd>
-    <dt>Extended</dt>
-    <dd>Ausgewählte Releases (in der Regel jedes zweite Release
-      sowie zusätzlich das letzte Release eines -STABLE-Zweiges)
-      werden für mindestens 24&nbsp;Monate nach Erscheinen des
-      Releases gewartet.  Dieser Zeitraum wird gegebenfalls
-      verlängert, um sicherzustellen, dass ein neues erweitertes
-      Release mindestens 3 Monate verfügbar ist, bevor die
-      Unterstützung für das alte erweiterte Release
-      ausläuft.</dd>
-  </dl>
   </body>
 </html>
diff --git a/de_DE.ISO8859-1/htdocs/where.xml b/de_DE.ISO8859-1/htdocs/where.xml
index d43a35667f..415290fa3a 100644
--- a/de_DE.ISO8859-1/htdocs/where.xml
+++ b/de_DE.ISO8859-1/htdocs/where.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY dedate "$FreeBSDde$">
-<!ENTITY reference "basiert auf: r52445">
+<!ENTITY reference "basiert auf: r52666">
 <!ENTITY title "FreeBSD Bezugsquellen">
 <!ENTITY url.rel "https://download.FreeBSD.org/ftp/releases">
 <!ENTITY url.snapshot "https://download.FreeBSD.org/ftp/snapshots">
@@ -100,21 +100,24 @@
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-RPI2.img.xz">RPI2</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-BANANAPI.img.xz">BANANAPI</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-GENERICSD.img.xz">GENERICSD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-RPI2.img.xz">RPI2</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-PANDABOARD.img.xz">PANDABOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm-armv7-WANDBOARD.img.xz">WANDBOARD</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm64-aarch64-PINE64.img.xz">PINE64</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm64-aarch64-PINE64-LTS.img.xz">PINE64-LTS</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-arm64-aarch64-RPI3.img.xz">RPI3</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
-	      <li><a href="&base;/releases/index.html#current">Released</a>: Juli 2017 <!--&rel.current.date;--></li>
+	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel.current.date;</li>
 	      <li><a href="&u.rel.notes;">Release Notes</a></li>
 	      <li><a href="&u.rel.readme;">Readme</a></li>
 	      <li><a href="&u.rel.hardware;">Hardware Compatibility List</a></li>
@@ -128,7 +131,6 @@
     </table>
     <br />
 
-    <?ignore
     <a name="download-rel1"></a>
 
     <h1>&os; &rel1.current;-RELEASE</h1>
@@ -146,10 +148,10 @@
 	    <ul class="txtdownloadlist">
 	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel1.current;/">amd64</a></li>
 	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel1.current;/">i386</a></li>
-	      <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel1.current;/">ia64</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel1.current;/">powerpc</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel1.current;/">powerpc64</a></li>
 	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel1.current;/">sparc64</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel1.current;/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
@@ -157,21 +159,26 @@
 	      <li><a href="&url.rel;/VM-IMAGES/README.txt">README</a></li>
 	      <li><a href="&url.rel;/VM-IMAGES/&rel1.current;-RELEASE/amd64/Latest/">amd64</a></li>
 	      <li><a href="&url.rel;/VM-IMAGES/&rel1.current;-RELEASE/i386/Latest/">i386</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel1.current;-RELEASE/aarch64/Latest/">aarch64</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/arm/arm/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-GUMSTIX.img.xz">GUMSTIX</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
-	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-RPI2.img.xz">RPI2</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel1.current;/&os;-&rel1.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
-	      <li><a href="&base;/releases/index.html#current">Released</a>: Oktober 2017 <!-- &rel1.current.date; --></li>
+	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel1.current.date;</li>
 	      <li><a href="&u.rel1.notes;">Release Notes</a></li>
 	      <li><a href="&u.rel1.readme;">Readme</a></li>
 	      <li><a href="&u.rel1.hardware;">Hardware Compatibility List</a></li>
@@ -184,7 +191,6 @@
       </tbody>
     </table>
     <br />
-    ?>
 
     <?ignore
     <a name="download-rel2"></a>
@@ -229,7 +235,7 @@
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
-	      <li><a href="&base;/releases/index.html#current">Released</a>: April 2016</li>
+	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel2.current.date;</li>
 	      <li><a href="&u.rel2.notes;">Release Notes</a></li>
 	      <li><a href="&u.rel2.readme;">Readme</a></li>
 	      <li><a href="&u.rel2.hardware;">Hardware Compatibility List</a></li>
@@ -277,7 +283,7 @@
 	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel.head;/">i386</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.head;/">powerpc</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.head;/">powerpc64</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.head;/">arm</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpcspe/ISO-IMAGES/&rel.head;/">powerpcspe</a></li>
 	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.head;/">sparc64</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">armv6</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">armv7</a></li>
@@ -298,9 +304,10 @@
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBIEBOARD</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBIEBOARD2</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.head;/">GUMSTIX</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">GENERICSD</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">PANDABOARD</a></li>
 	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">PINE64</a></li>
+	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">PINE64-LTS</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">RPI-B</a></li>
 	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">RPI2</a></li>
 	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">RPI3</a></li>
@@ -310,7 +317,7 @@
 	  <td>
 	    <?ignore
 	    <ul class="txtdocslist">
-	       <li><a href="&base;/releases/13.0R/relnotes.html">Release Notes</a></li>
+	      <li><a href="&base;/releases/13.0R/relnotes.html">Release Notes</a></li>
 	    </ul>
 	    ?>&nbsp;
 	  </td>
@@ -337,9 +344,10 @@
 	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel.current;/">i386</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">powerpc</a></li>
 	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">powerpc64</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpcspe/ISO-IMAGES/&rel.current;/">powerpcspe</a></li>
 	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">sparc64</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.current;/">arm</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">armv6</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">armv7</a></li>
 	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.current;/">aarch64</a></li>
 	    </ul>
 	  </td>
@@ -352,16 +360,74 @@
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">BANANAPI</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">BEAGLEBONE</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBIEBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBIEBOARD2</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.current;/">GUMSTIX</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">PANDABOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">RPI2</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">BANANAPI</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">BEAGLEBONE</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">CUBIEBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">CUBIEBOARD2</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">CUBOX/HUMMINGBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">GENERICSD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">PANDABOARD</a></li>
+	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.current;/">PINE64</a></li>
+	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.current;/">PINE64-LTS</a></li>
 	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">RPI-B</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">WANDBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">RPI2</a></li>
+	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.current;/">RPI3</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.current;/">WANDBOARD</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdocslist">
+	      <li><a href="&base;/relnotes/&rel.current.major;-STABLE/relnotes/article.html">Release Notes</a></li>
+	    </ul>
+	  </td>
+	</tr>
+      </tbody>
+    </table>
+
+   <p>&nbsp;</p>
+
+   <h1>&os; &rel1.current;-STABLE</h1>
+
+    <table class="tblbasic tblwide tbldownload">
+      <tbody>
+	<tr>
+	  <th>Installations-Images</th>
+	  <th>Images für virtuelle Maschinen</th>
+	  <th>Images für SD-Karten</th>
+	  <th>Dokumentation</th>
+	</tr>
+	<tr>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel1.current;/">amd64</a></li>
+	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel1.current;/">i386</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel1.current;/">powerpc</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel1.current;/">powerpc64</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpcspe/ISO-IMAGES/&rel1.current;/">powerpcspe</a></li>
+	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel1.current;/">sparc64</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">armv6</a></li>
+	      <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel1.current;/">armv7</a></li>
+	      <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel1.current;/">aarch64</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel1.current;-STABLE/amd64/Latest/">amd64</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel1.current;-STABLE/i386/Latest/">i386</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel1.current;-STABLE/aarch64/Latest/">aarch64</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">BANANAPI</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">BEAGLEBONE</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">CUBIEBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">CUBIEBOARD2</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">CUBOX/HUMMINGBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">PANDABOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">RPI2</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">RPI-B</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">WANDBOARD</a></li>
 	    </ul>
 	  </td>
 	  <td>
@@ -388,41 +454,40 @@
 	<tr>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel1.current;/">amd64</a></li>
-	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel1.current;/">i386</a></li>
-	      <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&rel1.current;/">ia64</a></li>
-	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel1.current;/">powerpc</a></li>
-	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel1.current;/">powerpc64</a></li>
-	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel1.current;/">sparc64</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel1.current;/">arm</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">armv6</a></li>
+	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel2.current;/">amd64</a></li>
+	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel2.current;/">i386</a></li>
+	      <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&rel2.current;/">ia64</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">powerpc</a></li>
+	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">powerpc64</a></li>
+	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">sparc64</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">armv6</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/VM-IMAGES/&rel1.current;-STABLE/amd64/Latest/">amd64</a></li>
-	      <li><a href="&url.snapshot;/VM-IMAGES/&rel1.current;-STABLE/i386/Latest/">i386</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel2.current;-STABLE/amd64/Latest/">amd64</a></li>
+	      <li><a href="&url.snapshot;/VM-IMAGES/&rel2.current;-STABLE/i386/Latest/">i386</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">BEAGLEBONE</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">CUBOX/HUMMINGBOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel1.current;/">GUMSTIX</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">PANDABOARD</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">RPI-B</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel1.current;/">WANDBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">BEAGLEBONE</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">CUBOX/HUMMINGBOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">PANDABOARD</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">RPI-B</a></li>
+	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">WANDBOARD</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
-	      <li><a href="&base;/relnotes/&rel1.current.major;-STABLE/relnotes/article.html">Release Notes</a></li>
+	      <li><a href="&base;/relnotes/&rel2.current.major;-STABLE/relnotes/article.html">Release Notes</a></li>
 	    </ul>
 	  </td>
 	</tr>
       </tbody>
     </table>
     ?>
+
     <p>Falls Sie &os; über HTTP oder FTP herunterladen wollen, suchen
       Sie bitte in der Liste der <a
       href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html"><strong>Spiegelserver</strong></a>
diff --git a/de_DE.ISO8859-1/share/xml/navibar.l10n.ent b/de_DE.ISO8859-1/share/xml/navibar.l10n.ent
index 7bc320dc7c..5e82c840e3 100644
--- a/de_DE.ISO8859-1/share/xml/navibar.l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/navibar.l10n.ent
@@ -2,7 +2,7 @@
 <!--
   $FreeBSD$
   $FreeBSDde$
-  basiert auf: r52445
+  basiert auf: r52666
 -->
 
 <!ENTITY nav.about '
@@ -104,9 +104,9 @@
 	<ul>
 		<li>Produktiv-<br/>Version:
 		  <a href="&u.rel.announce;">&rel.current;</a></li>
-	<?ignore
 		<li>Produktiv-<br/>Version:
 		  <a href="&u.rel1.announce;">&rel1.current;</a></li>
+	<?ignore
 		<li>Produktiv-<br/>Version:
 		  <a href="&u.rel2.announce;">&rel2.current;</a></li>
 	?>
diff --git a/de_DE.ISO8859-1/share/xml/news.xml b/de_DE.ISO8859-1/share/xml/news.xml
index 907116bb66..3395db890c 100644
--- a/de_DE.ISO8859-1/share/xml/news.xml
+++ b/de_DE.ISO8859-1/share/xml/news.xml
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r52660
+     basiert auf: r52668
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -41,9 +41,26 @@
     <month>
       <name>12</name>
 
-      <day>
+     <day>
 	<name>11</name>
 
+	<event>
+	  <title>&os;&nbsp;12.0-RELEASE verfügbar</title>
+
+	  <p><a href="&enbase;/releases/12.0R/announce.html">FreeBSD
+	    12.0-RELEASE</a> ist ab sofort verfügbar.  Lesen Sie
+	    bitte die <a
+	    href="&enbase;/releases/12.0R/relnotes.html">Release
+	    Notes</a> sowie die <a
+	    href="&enbase;/releases/12.0R/errata.html">Release
+	    Errata</a>, bevor Sie mit der Installation beginnen,
+	    um sich über Änderungen und eventuelle Probleme mit 12.0
+	    zu informieren.  Weitere Informationen zu den
+	    verschiedenen FreeBSD-Versionen finden Sie auf der
+	    Seite <a href="&base;/releases/index.html">Release
+	    Information</a>.</p>
+	</event>
+
 	<event>
 	  <title>Cirrus CI unterstützt nun &os;</title>
 
diff --git a/de_DE.ISO8859-1/share/xml/release.l10n.ent b/de_DE.ISO8859-1/share/xml/release.l10n.ent
index 5746dbd453..a0a7fd9246 100644
--- a/de_DE.ISO8859-1/share/xml/release.l10n.ent
+++ b/de_DE.ISO8859-1/share/xml/release.l10n.ent
@@ -2,7 +2,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r52388
+     basiert auf: r52666
 -->
 
 <![%beta2.testing;[

Installations-Images	Images für virtuelle Maschinen	Images für SD-Karten	Dokumentation
+ + amd64 + i386 + powerpc + powerpc64 + powerpcspe + sparc64 + armv6 + armv7 + aarch64 + +	+ + amd64 + i386 + aarch64 + +	+ + BANANAPI + BEAGLEBONE + CUBIEBOARD + CUBIEBOARD2 + CUBOX/HUMMINGBOARD + PANDABOARD + RPI2 + RPI-B + WANDBOARD	@@ -388,41 +454,40 @@
- amd64 - i386 - ia64 - powerpc - powerpc64 - sparc64 - arm - armv6 + amd64 + i386 + ia64 + powerpc + powerpc64 + sparc64 + armv6	- amd64 - i386 + amd64 + i386	- BEAGLEBONE - CUBOX/HUMMINGBOARD - GUMSTIX - PANDABOARD - RPI-B - WANDBOARD + BEAGLEBONE + CUBOX/HUMMINGBOARD + PANDABOARD + RPI-B + WANDBOARD	- Release Notes + Release Notes