updated Greek intro/index.wml

8 files changed, 359 insertions, 351 deletions

diff --git a/greek/CD/artwork/index.wml b/greek/CD/artwork/index.wml
index 1e84382877d..361f02be937 100644
--- a/greek/CD/artwork/index.wml
+++ b/greek/CD/artwork/index.wml
@@ -1,43 +1,23 @@
-#use wml::debian::cdimage title="Καλλιτεχνική δουλειά για τα CD του Debian" BARETITLE=true
-#use wml::debian::translation-check translation="1d3dc07e358a1ba49379e4dbe5779f641318bfff" maintainer="galaxico"
+#use wml::debian::cdimage title="Artwork for Debian CDs" BARETITLE=true
+#use wml::debian::translation-check translation="76d302b75ce2d826fedb2802e2c449986414c089" maintainer="galaxico"
 
-<p>Επίσημη καλλιτεχνική δουλειά για την τρέχουσα και πρόσφατες εκδόσεις μπορεί να είναι διαθέσιμη στη σελίδα του wiki
-<a href="https://wiki.debian.org/DebianArt/Themes">Θέματα</a>.
+<p>Official artwork for current and recent releases may be available on the
+<a href="https://wiki.debian.org/DebianArt/Themes">themes</a> wiki page.
 
-<p>Αν έχετε κάνει τις δικές σας εικόνες για καλύμματα των CD και θέλετε να τα μοιραστείτε μαζί μας, <a
+<p>If you have made your own images for CD covers and want to share
+them with us, <a
 href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;debian-cd&#64;lists.debian.org"
->παρακαλούμε πείτε το μας</a>! Το λογότυπο του Debian είναι επίσης <a
-href="$(HOME)/logos/">διαθέσιμο σε διάφορες μορφές</a>.</p>
+>please tell us</a>! The Debian logo is also <a
+href="$(HOME)/logos/">available in various forms</a>.</p>
 
-<p>Σημειώστε ότι τα εικονίδια/μικρογραφίες είναι απλά μια συλλογή των γραφικών που διατίθενται. Ακολουθήστε τους συνδέσμους για να δείτε όλα τα γραφικά.</p>
+<p>Note that the thumbnails are just a selection of the graphics
+on offer. Follow the links to see all graphics.</p>
 
 <ul>
-# ============================================================
-#
-#  <li><a href="http://www.onkelchentobi.de/cover.html">\
-#  http://www.onkelchentobi.de/cover.html</a><br />
-#
-#    <a href="http://www.onkelchentobi.de/cover/008.png.tar.gz"><img
-#    src="onkelchentobi.de-dvdcase.jpeg" alt="[DVD case]" /></a> 
-#
-#    <a href="http://www.onkelchentobi.de/label/004.png.tar.gz"><img
-#    src="onkelchentobi.de-dvd.jpeg" alt="[DVD label]" /></a> 
-#
-#  </li>
-# ============================================================
-
-  <li><a href="https://ulrich-hansen.de/debian/">https://ulrich-hansen.de/debian/</a>
-  (επεξεργάσιμα Gimp XCF + SVG):<br />
-
-  <a href="https://ulrich-hansen.de/debian/"><img src="ulrich-hansen.de-squeeze-cd.png" alt="[CD]"></a>
-  <a href="https://ulrich-hansen.de/debian/"><img src="ulrich-hansen.de-squeeze-dvd.png" alt="[DVD]"></a>
-  </li>
-
-# ============================================================
 
   <li><a href="http://debian.semistable.com/cdcover.pl">\
   http://debian.semistable.com/cdcover.pl</a>
-  (επεξεργάσιμα, δυναμικά παραγώμενα PostScript):<br />
+  (editable, dynamically generated PostScript):<br />
 
     <a href="http://debian.semistable.com/cdcover.pl"><img
     src="semistable.com-cdcover.jpeg" alt="[Cover]"></a>
@@ -47,49 +27,26 @@ href="$(HOME)/logos/">διαθέσιμο σε διάφορες μορφές</a>.
 
   <li><a href="http://briscoe-smith.org.uk/charles/debian-cd-label.html">\
   http://briscoe-smith.org.uk/charles/debian-cd-label.html</a>
-  (επεξεργάσιμο αρχείο PostScript):<br />
+  (editable PostScript file):<br />
 
     <a href="http://briscoe-smith.org.uk/charles/cd-label.ps"><img
     src="briscoe-smith.org.uk-cd-label.jpeg" alt="[Label]"></a>
   </li>
-# ============================================================
-
-  <li><url "http://odin.himinbi.org/covers/" /> 
-  (επεξεργάσιμα, δυναμικά παραγώμενα SVG):<br />
-
-    <a href="http://odin.himinbi.org/covers/"><img
-    src="odin.himinbi.org-cover.jpeg" alt="[cover]"></a>
-
-  </li>
-# ============================================================
 
   <li><url "http://www.nongnu.org/sdcdc/" /> 
-  (επεξεργάσιμα σενάρια κελύφους και Gimp Scheme):<br />
+  (editable shell and Gimp Scheme scripts):<br />
 
-    <a href="http://www.nongnu.org/sdcdc/sdcdc-cds-pixmaps.tar.gz"><img
+    <a href="https://www.nongnu.org/sdcdc/"><img
     src="autistici.org-cd-1-i386-en.jpeg" alt="[i386 covers]"></a>
 
   </li>
 
-# ============================================================
-#
-#  <li><url "http://www.schultz-net.dk/cdcovers.html" /><br />
-#
-#    <a href="http://www.schultz-net.dk/covers/debianlight/cd1.tar.gz"><img
-#    src="schultz-net.dk-debianlight.jpeg" alt="[cover]"></a>
-#
-#    <a href="http://www.schultz-net.dk/covers/debianfull/cd1.tar.gz"><img
-#    src="schultz-net.dk-debianfull.jpeg" alt="[cover]"></a>
-#
-#  </li>
-# ============================================================
-
-  <li><url "https://www.jonnyblair.co.uk/debian/" /><br />
+  <li><url "https://jonnyblair.co.uk/debian/" /><br />
 
-    <a href="https://www.jonnyblair.co.uk/img/illustrations/debian/woody_cover/disc01/woody01_front.jpg"><img
+    <a href="https://jonnyblair.co.uk/img/illustrations/debian/woody_cover/disc01/woody01_front.jpg"><img
     src="jonnyblair.co.uk-woody_front.jpeg" alt="[Front]"></a>
 
-    <a href="https://www.jonnyblair.co.uk/img/illustrations/debian/woody_cover/disc01/woody01_tray.png"><img
+    <a href="https://jonnyblair.co.uk/img/illustrations/debian/woody_cover/disc01/woody01_tray.png"><img
     src="jonnyblair.co.uk-woody_tray.jpeg" alt="[Tray]"></a>
   </li>
 # ============================================================
diff --git a/greek/CD/faq/index.wml b/greek/CD/faq/index.wml
index 2a19906e61a..5e373bf196b 100644
--- a/greek/CD/faq/index.wml
+++ b/greek/CD/faq/index.wml
@@ -1,7 +1,7 @@
-#use wml::debian::cdimage title="Frequently Asked Questions about Debian CDs" NOHEADER=true BARETITLE=true
+#use wml::debian::cdimage title="Frequently Asked Questions about Debian CD/DVD/USB images" NOHEADER=true BARETITLE=true
 #use wml::debian::toc
 #include "$(ENGLISHDIR)/releases/info"
-#use wml::debian::translation-check translation="cbc3024ee2ccf063c18596908de5cfbfd4cef19c" maintainer="galaxico"
+#use wml::debian::translation-check translation="0b5d69c288d6d73850c91ea30fce27cb2b7fb379" maintainer="galaxico"
 
 <define-tag toc-title-formatting endtag="required" whitespace="delete">
 <p><strong>%body</strong></p>
@@ -11,8 +11,6 @@
 
 <toc-display/>
 
-
-
 <toc-add-entry name="what-is">What is a <q>CD image</q> anyway?</toc-add-entry>
 
 <p>A CD image is the exact representation of the data on a CD in a
@@ -20,21 +18,92 @@ normal computer file, that can e.g. be transmitted over the
 Internet. CD burning programs can use the image files to make real
 CDs.</p>
 
-<p>For a correctly written CD, the <tt>.iso</tt> file must not appear
-on the CD when you access it! Instead, you should see a number of
-files and directories - in the case of a Debian CD, this includes a
+<p>In Debian, we use the term <q>CD image</q> as a common way to
+describe a range of things, many of which don't even fit on CD! The
+name is old, but it has stuck. We regularly build multiple different
+types of image:</p>
+
+<ul>
+  <li>Debian installer images in multiple sizes. These range from
+    small CD-sized <q>netinst</q> images for quick download up to
+    large complete sets of images designed for DVD, Blu-Ray (BD) or
+    Dual-Layer Blu-Ray (DLBD) media.</li>
+
+  <li>Debian live images - live systems designed to be run directly
+    from CD/DVD/USB without needing
+    installation. See <a href="#live-cd">below</a> for more
+    details.</li>
+
+</ul>
+
+<p>In many cases, these installer and live images can often be written
+directly to USB flash drives with no <b>CD</b> involved;
+see <a href="#write-usb">below</a>. Don't be put off by the name <q>CD
+image</q>!</p>
+
+<p>For a correctly written image, the <tt>.iso</tt> file must not
+appear on the media when you access it! Instead, you should see a
+number of files and directories - in the case of a Debian installer
+image, this includes a
 <q>dists</q> directory and a <q>README.html</q> file.</p>
 
-<p>The <tt>.iso</tt> format is roughly comparable to a <tt>.zip</tt>
-file: It contains other files and directories, and only these will
-appear on the final CD. Some archive programs allow you to <q>unpack</q>
+<p>The <tt>.iso</tt> format we use for our images is roughly
+comparable to a <tt>.zip</tt> file: It contains other files and
+directories, and only these will appear on the final CD/DVD/USB
+medium. Some archive programs allow you to <q>unpack</q>
 <tt>.iso</tt> files. Do not use this feature to create a CD from the
-unpacked files! The resulting CD will fail to boot because the
+unpacked files! The resulting medium will fail to boot because the
 <tt>.iso</tt> format includes special information related to booting
-from the CD, which is lost when you unpack the file. See below on how
-to correctly write a CD image under <a href="#record-unix">Linux</a>,
-<a href="#record-windows">Windows</a> or <a
-href="#record-mac">Mac OS</a>.</p>
+from the CD/DVD/USB, which is lost when you unpack the file. See below on how
+to correctly write a CD/DVD image under <a href="#record-unix">Linux</a>,
+<a href="#record-windows">Windows</a> or <a href="#record-mac">Mac
+OS</a>, or how to write an image to a <a href="#write-usb">USB flash
+drive</a>.</p>
+
+# ============================================================
+
+# This text is basically the same as what's in the Debian wiki at
+# https://wiki.debian.org/Firmware
+
+<toc-add-entry name="firmware">Debian installer tells me my hardware
+needs extra firmware to work. Where do I get that?</toc-add-entry>
+
+<p>Many devices require firmware to operate. Historically, firmware
+would be built into the device's ROM or Flash memory, but more and
+more often, a firmware image has to be loaded into the device by a
+device driver during device initialization.</p>
+
+<p>Some firmware images are free and open-source, and some of them are
+non-free, which means that you would need to add the non-free and
+contrib components to your APT sources.</p>
+
+<p>In some cases the installer detects the need for non-free firmware
+and prompts the user to make the firmware available to the installer
+to complete the installation. This can happen, for example, with
+wireless network cards which often require non-free firmware to
+function (see ipw2200 for an example).</p>
+
+<p>There are two ways to proceed here:</p>
+
+<ul>
+
+  <li>An easy method is to use an installer image that includes all
+    non-free firmware packages directly. See
+    <a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/">https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/</a>
+    for those.</li>
+
+  <li>You can also download a firmware archive for your platform and
+    unpack it into a directory named <q>firmware</q> in the root of a
+    removable storage device (USB/CD drive). You can find firmware
+    downloads for your Debian version at
+    <a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/">https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/</a>. When
+    the installer starts, it will automatically find the firmware
+    files in the directory on the removable storage and, if needed,
+    install the required firmware. This is documented in
+    the <a href="https://d-i.debian.org/doc/installation-guide/en.amd64/ch06s04.html">Debian
+    installer manual</a>.</li>
+
+</ul>
 
 # ============================================================
 
@@ -137,20 +206,18 @@ packages.</p>
 
 <p>Also, you only need the CD/DVD/BD images for your computer's
 architecture. The architecture is the type of hardware your computer
-uses. By far the most popular one is the Intel/AMD architecture, so
-most people will only want to get the images for <q>i386</q>. If your
-PC has a 64-bit AMD or Intel processor, you will most likely need the
-<q><a href="../../ports/amd64/">amd64</a></q> images (though
-<q>i386</q> is also fine), the <q><a
-href="../../ports/ia64/">ia64</a></q> images will <em>not</em>
-work.</p>
+uses. By far the most popular one is the 64-bit Intel/AMD PC
+architecture, so most people will only want to get the images
+for <q>amd64</q>. If your PC has an older 32-bit AMD or Intel
+processor, you will most likely need the
+<q><a href="../../ports/i386/">i386</a></q> images instead.</p>
 
 <p>Furthermore, in most cases it is not necessary to download all of
 the images for your architecture. The packages are sorted by
 popularity: The first CD/DVD/BD contains the installation system and
 the most popular packages. The second one contains slightly less
 popular ones, the third one even less popular ones, etc. You will
-probably only need the first couple of DVDs (or the first few CDs)
+probably only need the first couple of DVDs (or the first BD, etc.)
 unless you have very special requirements. (And in case you happen to
 need a package later on which is not on one of the CDs/DVDs/BDs you
 downloaded, you can always install that package directly from the
@@ -252,18 +319,6 @@ CDs. If you cannot find any links on this website, you can try
 
 # ============================================================
 
-<toc-add-entry name="dvd">Are DVD images of Debian
-available?</toc-add-entry>
-
-<p>Yes - Debian offers DVD images for the current stable
-release. Additionally, as far as we know, Debian is the only Linux
-distribution to
-offer weekly full-size DVD images for download! Because of their size, these
-images are <a href="../jigdo-cd/">distributed with
-jigdo</a>.</p>
-
-# ============================================================
-
 <toc-add-entry name="official">What's the difference between official
 and unofficial images?</toc-add-entry>
 
@@ -280,15 +335,15 @@ additional software packages which are not part of the Debian archive.</p>
 
 # ============================================================
 
-<toc-add-entry name="live-cd">Is a Debian <q>live CD</q>
+<toc-add-entry name="live-cd">Is a Debian <q>live image</q>
 available?</toc-add-entry>
 
-<p> Yes. A so-called <q>live CD</q>, or more precisely, a <q>live
-system</q>, is a complete system prepared for a DVD, USB key or other
-medium. You do not need to install anything on the hard drive.
-Instead you boot from the medium (DVD or USB key) and are able to
-start working on the machine right away. All programs run directly
-from the medium.</p>
+<p>Yes. A so-called <q>live image</q> (<q>live CD</q>), or more
+precisely, a <q>live system</q>, is a complete system prepared for a
+DVD, USB key or other medium. You do not need to install anything on
+the hard drive. Instead you boot from the medium (DVD or USB key) and
+are able to start working on the machine right away. All programs run
+directly from the medium.</p>
 
 <p>The <a href="$(HOME)/devel/debian-live/">Debian Live Project</a> produces
 <a href="../live/">live image files</a> for a variety of system types and
@@ -304,11 +359,7 @@ which disc should I boot?</toc-add-entry>
 <p>If your Debian disc fails to boot, first ensure that you have
 correctly written it to the medium - please <a href="#what-is">see the
 explanation above</a>. Additionally, please check whether your BIOS is
-set up to boot from your optical drive.</p>
-
-<p>If your system cannot boot from CD/DVD/BD at all, it is also
-possible to <a href="$(HOME)/distrib/netinst#verysmall">boot from a
-USB stick or from the network</a>.</p>
+set up to boot from your optical or USB drive.</p>
 
 # ============================================================
 
@@ -395,27 +446,25 @@ choices:</p>
 <toc-add-entry name="search-for-package">Which CD/DVD/BD image
 contains package XYZ?</toc-add-entry>
 
-<p>To find out which image contains a certain file, use the <a
-href="https://cdimage-search.debian.org">cdimage search tool</a>. It
-has knowledge of just about all the Debian CDs/DVDs/BDs produced by
-Debian since the Woody release, covering all the official releases
-(both older archived releases and the current stable release) and the
-current sets of daily and weekly testing builds. </p>
+<p>To find out which image contains a certain file, use
+the <a href="https://cdimage-search.debian.org">cdimage search
+tool</a>. It has knowledge of just about all the Debian CDs/DVDs/BDs
+produced by Debian since the 3.0 (Woody) release, covering all the
+official releases (both older archived releases and the current stable
+release) and the current sets of daily and weekly testing builds. </p>
 
 # ============================================================
 
 <toc-add-entry name="list-image-contents">Can I have a list of all the
 packages contained in an image?</toc-add-entry>
 
-<p>
-Yes.
-Look on <a
-href="https://cdimage.debian.org/cdimage/">cdimage.debian.org</a> for
-the corresponding <tt>.list.gz</tt> file - it will list all the
-packages and source files included in the image.
-For Debian Live images, you can find in the same directory as the
-image files some similarly named files suffixed with <tt>.packages</tt>.
-Download these and then search them for the desired package name.</p>
+<p> Yes. Look
+on <a href="https://cdimage.debian.org/cdimage/">cdimage.debian.org</a>
+for the corresponding <tt>.list.gz</tt> file - it will list all the
+packages and source files included in the image. For Debian Live
+images, you can find in the same directory as the image files some
+similarly named files suffixed with <tt>.packages</tt>. Download these
+and then search them for the desired package name.</p>
 
 # ============================================================
 
@@ -571,7 +620,7 @@ for CD optical media type:
 
 <p>For Linux, there are also the X programs
 <a href="https://www.gnome.org/projects/brasero/">Brasero</a>,
-<a href="http://k3b.plainblack.com/">K3B</a> and
+<a href="https://userbase.kde.org/K3b">K3B</a> and
 <a href="http://www.xcdroast.org/">X-CD-Roast</a>,
 to name a few. Note that they're all frontends to the previously
 mentioned low-level burning applications.</p>
@@ -587,7 +636,7 @@ mentioned low-level burning applications.</p>
   <i>Create Image</i>.</dd>
 
   <dt><strong><a id="k3b"
-  href="http://k3b.plainblack.com/">K3b</a></strong></dt>
+  href="https://userbase.kde.org/K3b">K3b</a></strong></dt>
 
   <dd>Select the menu entry <i>Tools - CD - Burn CD Image</i>. In the
   dialog that opens, enter the path to the image in the <i>Image to
@@ -614,6 +663,9 @@ displaying the image filename and click on <i>Add</i>, then click on
 <toc-add-entry name="record-windows">How do I write an ISO image under
 Windows?</toc-add-entry>
 
+<p>On recent versions of Windows, this can be done natively by 
+right-clicking the ISO and selecting "Burn image to disk (or similar)"</p>
+
 <p>This might be a little problem on older versions of Windows, as
 many Windows image-burning programs use their own formats for CD
 images. To burn the <tt>.iso</tt> images you will most likely have to
@@ -627,10 +679,10 @@ specific products:</p>
 <dl>
 
   <dt><strong><a name="imgburn"
-  href="http://www.imgburn.com/">ImgBurn</a></strong>
+  href="https://www.imgburn.com/">ImgBurn</a></strong>
   (Freeware)</dt>
   
-  <dd>There are <a href="http://www.imgburn.com/index.php?act=screenshots#isowrite">screenshots</a> of how to write an image to CD/DVD</dd>
+  <dd>There are <a href="https://www.imgburn.com/index.php?act=screenshots#isowrite">screenshots</a> of how to write an image to CD/DVD</dd>
 
   <dt><strong><a name="cdburnerxp"
   href="https://cdburnerxp.se/">CDBurnerXP Pro</a></strong>
@@ -639,8 +691,7 @@ specific products:</p>
   <dd>The process of writing an <tt>.iso</tt> image is described
     <a href="https://cdburnerxp.se">in the program's manual</a>.</dd>
 
-  <dt><strong><a NAME="adaptec" href="http://www.adaptec.com/">Adaptec</a>\
-  /<a href="https://www.roxio.com/">Roxio</a> Easy-CD Creator</strong></dt>
+  <dt><strong><a NAME="adaptec" href="https://www.roxio.com/">Roxio</a> Easy-CD Creator</strong></dt>
 
   <dd>From the <i>File</i> menu, choose <i>Create CD from
   image...</i>. Then select the <q>.iso</q> file type, and the correct
@@ -666,22 +717,8 @@ specific products:</p>
   and <i>Determine maximum speed</i>, plus check the <i>Finalize
   CD</i> option.</dd>
 
-  <dt><strong><a NAME="cdextreme">CD Extreme</a> from
-  <a href="http://www.storagebysony.com">Sony</a></strong></dt>
-
-  <dd>Choose <i>New Job...</i> from the <i>File</i> menu. Then
-  select <i>Global-Image</i> or <i>Other Image</i>. This opens up
-  the CD creation setup GUI, from there manually enter the path to
-  the .iso image or <i>browse...</i> using files of type <q>other</q>.
-  From the <i>Edit</i> menu, choose <i>Recoding Options</i>, in
-  the resulting <i>Disk Image Options</i> dialog,
-  choose:<br />&nbsp;&nbsp;&nbsp;<i>Recording Type: Disk at Once
-  (DAO) Closed</i><br />&nbsp;&nbsp;&nbsp;<i>Mode and Blocking: CD
-  Mode1 (Blocking 2048)-DVD</i><br />Do not check off
-  <q>Post-gap...</q>.</dd>
-
   <dt><strong><a NAME="resource-kit-tools"
-  href="https://www.microsoft.com/en-us/downloads/details.aspx">Microsoft
+  href="https://www.microsoft.com/en-us/download/details.aspx?id=17657">Microsoft
   Resource Kit Tools</a></strong></dt>
 
   <dd>The command-line Resource Kit Tools are provided by Microsoft
diff --git a/greek/CD/http-ftp/index.wml b/greek/CD/http-ftp/index.wml
index 04a6facecd1..2a83973c749 100644
--- a/greek/CD/http-ftp/index.wml
+++ b/greek/CD/http-ftp/index.wml
@@ -1,7 +1,7 @@
 #use wml::debian::cdimage title="Downloading Debian CD/DVD images via HTTP/FTP" BARETITLE=true
 #include "$(ENGLISHDIR)/releases/info"
 #include "$(ENGLISHDIR)/releases/images.data"
-#use wml::debian::translation-check translation="cbb09825e724fc539eb5cd8bdd9f3be2f6502d98" maintainer="galaxico"
+#use wml::debian::translation-check translation="f4fe84f1063f34ac4bfb75eb963e6fa71ba0e642" maintainer="galaxico"
 
 <div class="tip">
 <p><strong>Please do not download CD or DVD images with your web browser the way
@@ -10,17 +10,17 @@ aborts, most browsers do not allow you to resume from the point where it
 failed.</p>
 </div>
 
-<p>Instead, please use a tool that supports resuming. Under Unix,
-you can use <a href="http://aria2.sourceforge.net/">aria2</a>, <a href="http://dfast.sourceforge.net/">wxDownload Fast</a> or (on the command line)
-<q><tt>wget&nbsp;-c&nbsp;</tt><em>URL</em></q> or
-<q><tt>curl&nbsp;-C&nbsp;-&nbsp;-L&nbsp;-O&nbsp;</tt><em>URL</em></q>.
-Under Windows, you might want to try
-<a href="https://www.freedownloadmanager.org/">Free Download Manager</a>.
-Under Mac&nbsp;OS, have a look at
-<a href="http://code.google.com/p/cocoawget/">CocoaWget</a>.
-You can also look at a <a
+<p>Instead, please use a tool that supports resuming - typically
+described as a <q>download manager</q>. There are many browser plugins
+that do this job, or you might want to install a separate
+program. Under Linux/Unix, you can use <a
+href="http://aria2.sourceforge.net/">aria2</a>, <a
+href="http://dfast.sourceforge.net/">wxDownload Fast</a> or (on the
+command line) <q><tt>wget&nbsp;-c&nbsp;</tt><em>URL</em></q> or
+<q><tt>curl&nbsp;-C&nbsp;-&nbsp;-L&nbsp;-O&nbsp;</tt><em>URL</em></q>. There
+are many more options listed in a <a
 href="https://en.wikipedia.org/wiki/Comparison_of_download_managers">comparison
-of download managers</a> and choose a program that you like.</p>
+of download managers</a>.</p>
 
 <p>The following Debian images are available for
 download:</p>
@@ -29,6 +29,9 @@ download:</p>
 
   <li><a href="#stable">Official CD/DVD images of the <q>stable</q> release</a></li>
 
+  <li><a href="#firmware"><b>Unofficial</b> CD/DVD images for <q>stable</q> with
+  <b>non-free</b> firmware included</a></li>
+
   <li><a href="https://cdimage.debian.org/cdimage/weekly-builds/">Official
   CD/DVD images of the <q>testing</q> distribution (<em>regenerated
   weekly</em>)</a></li>
@@ -73,7 +76,7 @@ them.</p>
 <div class="item col50">
 <p><strong>CD</strong></p>
 
-<p>The following links point to image files which are up to 650&nbsp;MB
+<p>The following links point to image files which are up to 700&nbsp;MB
 in size, making them suitable for writing to normal CD-R(W) media:</p>
 
 <stable-full-cd-images />
@@ -81,7 +84,7 @@ in size, making them suitable for writing to normal CD-R(W) media:</p>
 <div class="item col50 lastcol">
 <p><strong>DVD</strong></p>
 
-<p>The following links point to image files which are up to 4.4&nbsp;GB
+<p>The following links point to image files which are up to 4.7&nbsp;GB
 in size, making them suitable for writing to normal DVD-R/DVD+R and
 similar media:</p>
 
@@ -105,6 +108,37 @@ walkthrough of the installation process. Other useful documentation includes:
 
 <hr />
 
+# Translators: the following paragraph exists (in this or a similar form) several times in webwml,
+# so please try to keep translations consistent. See:
+# ./CD/http-ftp/index.wml
+# ./CD/live/index.wml
+# ./CD/netinst/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ./releases/<release-codename>/debian-installer/index.wml
+# ./devel/debian-installer/index.wml
+# 
+<h2><a name="firmware">Unofficial CD/DVD images with non-free firmware included</a></h2>
+
+<div id="firmware_nonfree" class="important">
+<p>
+If any of the hardware in your system <strong>requires non-free firmware to be
+loaded</strong> with the device driver, you can use one of the
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/">\
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image
+including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the <a href="../../releases/stable/amd64/ch06s04">Installation Guide</a>.
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/">unofficial
+installation images for <q>stable</q> with firmware included</a>
+</p>
+</div>
+
+<hr />
+
 <h2><a name="mirrors">Registered mirrors of the <q>debian-cd</q> archive</a></h2>
 
 <p>Note that <strong>some mirrors are not up to date</strong> &mdash;
@@ -125,44 +159,3 @@ how to set up a CD image mirror</a>.</p>
 
 #use wml::debian::countries
 #include "$(ENGLISHDIR)/CD/http-ftp/cdimage_mirrors.list"
-
-
-<comment>
-<h2><a name="unofficial">Unofficial CD/DVD images of the <q>testing</q> and
-<q>unstable</q> releases</a></h2>
-
-<p>These images are not built and offered by Debian, but by <a
-href="http://www.fsn.hu/">fsn://HU</a>:</p>
-
-<ul>
-
-  <li>fsn://HU images for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/etch/">\
-  <q>testing</q> distribution</a> on CD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU images for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/etch-dvd/">\
-  <q>testing</q> distribution</a> on DVD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU images for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/sid/">\
-  <q>unstable</q> distribution</a> on CD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU images for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/sid-dvd/">\
-  <q>unstable</q> distribution</a> on DVD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-</ul>
-</comment>
diff --git a/greek/CD/jigdo-cd/index.wml b/greek/CD/jigdo-cd/index.wml
index dfce434d14b..71c44f84ca5 100644
--- a/greek/CD/jigdo-cd/index.wml
+++ b/greek/CD/jigdo-cd/index.wml
@@ -1,50 +1,55 @@
-#use wml::debian::cdimage title="Μεταφόρτωση εικόνων CD του Debian με jigdo" BARETITLE=true
+#use wml::debian::cdimage title="Downloading Debian CD images with jigdo" BARETITLE=true
 #use wml::debian::toc
 #include "$(ENGLISHDIR)/releases/info"
 #use wml::debian::installer
 #include "$(ENGLISHDIR)/releases/images.data"
 #include "$(ENGLISHDIR)/devel/debian-installer/images.data"
-#use wml::debian::translation-check translation="8babd822848d03302e59787191c298ae3f6ed1be" maintainer="galaxico"
+#use wml::debian::translation-check translation="a7e5f7cb49aa3db66a76fbe2aeb7c9a69f02ae0c" maintainer="galaxico"
 
-<p>Το Jigsaw Download, ή σε συντομία <a href="http://atterer.org/jigdo/">jigdo</a>, έχει σκοπό να αποτελεί τον κύριο τρόπο διανομής των εικόνων CD του Debian στο μέλλον. Currently, the system works, but is not yet very comfortable to use
-because the download manager application is not finished.</p>
+<p>Jigsaw Download, or short <a
+href="https://www.einval.com/~steve/software/jigdo/">jigdo</a>, is a
+bandwidth-friendly way of distributing Debian CD/DVD images.</p>
 
 <toc-display/>
 
-<toc-add-entry name="why">Why jigdo is better than a direct download</toc-add-entry>
+<toc-add-entry name="why">Why jigdo is better than a direct
+download</toc-add-entry>
 
-<p>Because it
-is faster! For various reasons, there are far fewer mirrors for CD images
-than there are for the "normal" Debian archive. Consequently, if you
-download from a CD image mirror, that mirror will not only be further away
-from you, it will also be overloaded, especially just after a release.</p>
+<p>Because it is faster! For various reasons, there are far fewer
+mirrors for CD/DVD images than there are for the "normal" Debian
+archive. Consequently, if you download from a CD image mirror, that
+mirror will not only be further away from you, it will also be
+overloaded, especially just after a release.</p>
 
 <p>Furthermore, some types of images are not available as full
 <tt>.iso</tt> downloads because there is not enough space on our
 servers to host them.</p>
 
-<p>Of course, a "normal" Debian mirror does not carry any CD images, so how
-can jigdo download them there? jigdo achieves this by downloading
-individually all the files that are on the CD. In the next step, all these
-files are assembled in one big file which
-is an exact copy of the CD image. However, all this happens
-behind the scenes - all that <em>you</em> need to do is tell the download
-tool the location of a "<tt>.jigdo</tt>" file to process.</p>
+<p>Of course, a "normal" Debian mirror does not carry any CD/DVD
+images, so how can jigdo download them there? jigdo achieves this by
+downloading individually all the files that are on the CD/DVD. In the
+next step, all these files are assembled in one big file which is an
+exact copy of the CD/DVD image. However, all this happens behind the
+scenes - all that <em>you</em> need to do is tell the download tool
+the location of a "<tt>.jigdo</tt>" file to process.</p>
 
-<p>More information is available from the
-<a href="http://atterer.org/jigdo/">jigdo homepage</a>. 
-Volunteers willing to help with jigdo development are always welcome!</p>
+<p>More information is available from the <a
+href="https://www.einval.com/~steve/software/jigdo/">jigdo
+homepage</a>.  Volunteers willing to help with jigdo development are
+always welcome!</p>
 
 <toc-add-entry name="how">How to download an image with jigdo</toc-add-entry>
 
 <ul>
 
-  <li>Download a package containing <tt>jigdo-lite</tt>, which is
-  available for GNU/Linux, Windows and Solaris from the
-  <a href="http://atterer.org/jigdo/">jigdo homepage</a>. For FreeBSD,
-  install from /usr/ports/net-p2p/jigdo or grab the package with <tt>pkg_add
-  -r jigdo</tt>.
-  </li>
+  <li>Download a package containing <tt>jigdo-lite</tt>. This is
+  available directly for installation in the Debian and Ubuntu
+  distributions in the <tt>jigdo-file</tt> package. For FreeBSD,
+  install from /usr/ports/net-p2p/jigdo or grab the package
+  with <tt>pkg_add -r jigdo</tt>. For other installation options
+  (binaries for Windows, source), check the
+  the <a href="https://www.einval.com/~steve/software/jigdo/">jigdo
+  homepage</a>. </li>
 
   <li>Run the <tt>jigdo-lite</tt> script. It will ask for the URL
   of a "<tt>.jigdo</tt>" file to process. (You can also supply
@@ -73,14 +78,14 @@ Volunteers willing to help with jigdo development are always welcome!</p>
 </ul>
 
 <p>For a detailed, step-by-step description of this process, have a
-look at the <a href="http://www.tldp.org/HOWTO/Debian-Jigdo/">Debian jigdo
-mini-HOWTO</a>. The HOWTO also explains jigdo's advanced features,
-such as upgrading an older version of a CD image to the current
-version (by downloading only what has changed, not the entire new
-image).</p>
-
-<p>Once you have downloaded the images and written them to CD, be sure
-to have a look at the <a
+look at the <a href="https://www.tldp.org/HOWTO/Debian-Jigdo/">Debian
+jigdo mini-HOWTO</a>. The HOWTO also explains jigdo's advanced
+features, such as upgrading an older version of a CD/DVD image to the
+current version (by downloading only what has changed, not the entire
+new image).</p>
+
+<p>Once you have downloaded the images and written them to CD/DVD, be
+sure to have a look at the <a
 href="$(HOME)/releases/stable/installmanual">detailed information
 about the installation process</a>.</p>
 
@@ -132,45 +137,6 @@ walkthrough of the installation process. Other useful documentation includes:
 </div>
 </div>
 
-<comment>
-<toc-add-entry name="unofficial">Unofficial images</toc-add-entry>
-
-<p>These images are not built and offered by Debian, but by <a
-href="http://www.fsn.hu/">fsn://HU</a>:</p>
-
-<ul>
-
-  <li>fsn://HU jigdo files for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/etch/jigdo/">\
-  "testing" distribution</a> on CD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU jigdo files for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/etch-dvd/jigdo/">\
-  "testing" distribution</a> on DVD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU jigdo files for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/sid/jigdo/">\
-  "unstable" distribution</a> on CD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU jigdo files for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/sid-dvd/jigdo/">\
-  "unstable" distribution</a> on DVD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-</ul>
-</comment>
-
 <hr />
 
 <toc-add-entry name="search">Search Contents of CD images</toc-add-entry>
@@ -245,7 +211,7 @@ are several possible things to try in this case:</p>
   files that are not yet present on your mirror.</li>
 
   <li>Retrieve the missing parts of the image using <tt><a
-  href="http://rsync.samba.org/">rsync</a></tt>. First, you need to
+  href="https://rsync.samba.org/">rsync</a></tt>. First, you need to
   find out the correct rsync URL of the image you are downloading:
   Choose a server that offers rsync access to the <a
   href="../mirroring/rsync-mirrors">stable</a> or <a
diff --git a/greek/CD/mirroring/index.wml b/greek/CD/mirroring/index.wml
index 676672a74fa..c8360252ee4 100644
--- a/greek/CD/mirroring/index.wml
+++ b/greek/CD/mirroring/index.wml
@@ -1,13 +1,16 @@
-#use wml::debian::cdimage title="Πώς να φιλοξενήσετε έναν καθρέφτη των εικόνων CD του Debian" BARETITLE=true
+#use wml::debian::cdimage title="Becoming a mirror for Debian CD images" BARETITLE=true
 #use wml::debian::toc
-#use wml::debian::translation-check translation="886eba8181a465004791c1e2f02e918777264491" maintainer="galaxico"
-
-<p>Για να φιλοξενήσετε έναν καθρέφτη των εικόνων CD του Debian, χρειάζεστε ένα σύστημα Linux ή Unix-οειδές με μια μόνιμη, αξιόπιστη σύνδεση στο Διαδίκτυο. Οι καθρέφτες των CD του Debian διατηρούν εικόνες <tt>.iso</tt> των CD και των DVD σε διάφορα μεγέθη, αρχεία <a
-href="http://atterer.org/jigdo/">jigdo</a> (<tt>.jigdo</tt> και
-<tt>.template</tt>), αρχεία <a
-href="https://en.wikipedia.org/wiki/BitTorrent">BitTorrent</a> 
-(<tt>.torrent</tt>) και αρχεία επαλήθευσης των εικόνων
-(<tt>SHA256SUMS*</tt>, <tt>SHA512SUMS*</tt> και άλλα).</p>
+#use wml::debian::translation-check translation="a2762a4686797f8bd714431c6bc466b37657847b" maintainer="galaxico"
+
+<p>To become a Debian CD Image mirror site, you need a Linux or
+Unix-like machine with a permanent, reliable connection to the
+Internet. Debian CD mirrors hold <tt>.iso</tt> images for CDs and DVDs
+of various sizes, files for <a
+href="https://www.einval.com/~steve/software/jigdo/">jigdo</a> (<tt>.jigdo</tt> and
+<tt>.template</tt>), <a
+href="https://en.wikipedia.org/wiki/BitTorrent">BitTorrent</a> files
+(<tt>.torrent</tt>) and verification files for the images
+(<tt>SHA512SUMS*</tt> and <tt>SHA256SUMS*</tt>).</p>
 
 <toc-display/>
 
@@ -35,9 +38,6 @@ files.</p>
     <a href="https://cdimage.debian.org/debian-cd/"
     ><tt>https://cdimage.debian.org/debian-cd/</tt></a><br>
 
-    <a href="ftp://cdimage.debian.org/debian-cd/"
-    ><tt>ftp://cdimage.debian.org/debian-cd/</tt></a><br>
-
     <tt>rsync://cdimage.debian.org/debian-cd/</tt>
 
   </li>
@@ -47,9 +47,6 @@ files.</p>
     <a href="https://cdimage.debian.org/cdimage/weekly-builds/"
     ><tt>https://cdimage.debian.org/cdimage/weekly-builds/</tt></a><br>
 
-    <a href="ftp://cdimage.debian.org/cdimage/weekly-builds/"
-    ><tt>ftp://cdimage.debian.org/cdimage/weekly-builds/</tt></a><br>
-
     <tt>rsync://cdimage.debian.org/cdimage/weekly-builds/</tt>
 
   </li>
@@ -59,27 +56,10 @@ files.</p>
     <a href="https://cdimage.debian.org/cdimage/daily-builds/"
     ><tt>https://cdimage.debian.org/cdimage/daily-builds/</tt></a><br>
 
-    <a href="ftp://cdimage.debian.org/cdimage/daily-builds/"
-    ><tt>ftp://cdimage.debian.org/cdimage/daily-builds/</tt></a><br>
-
     <tt>rsync://cdimage.debian.org/cdimage/daily-builds/</tt>
 
   </li>
 
-<!--
-  <li>Beta/unstable/testing images:<br>
-
-    <a href="https://cdimage.debian.org/pub/cdimage-testing/"
-    ><tt>https://cdimage.debian.org/pub/cdimage-testing/</tt></a><br>
-
-    <a href="ftp://cdimage.debian.org/pub/cdimage-testing/"
-    ><tt>ftp://cdimage.debian.org/pub/cdimage-testing/</tt></a><br>
-
-    <tt>rsync://cdimage.debian.org/cdimage-testing/</tt>
-
-  </li>
--->
-
 </ul>
 #______________________________________________________________________
 
@@ -98,7 +78,7 @@ corruption will go unnoticed.</p>
 <toc-add-entry name="rsync">Mirroring using rsync is
 acceptable</toc-add-entry>
 
-<p>The <a href="http://rsync.samba.org/"><kbd>rsync</kbd></a> program
+<p>The <a href="https://rsync.samba.org/"><kbd>rsync</kbd></a> program
 is a good solution for mirroring. It is less efficient than the other,
 Debian-specific mirroring solution below, but may be easier to set
 up. Furthermore, it ensures that all files are transferred correctly
@@ -122,7 +102,7 @@ really obligatory.</p>
 discouraged</toc-add-entry>
 
 <p>Recent versions of the <a
-href="http://atterer.org/jigdo/"><kbd>jigdo-lite</kbd></a> program
+href="https://www.einval.com/~steve/software/jigdo/"><kbd>jigdo-lite</kbd></a> program
 support batch downloading of multiple images. However, we do not
 recommend to use <kbd>jigdo-lite</kbd> to create Debian CD mirrors -
 use <kbd>jigdo-mirror</kbd> instead.</p>
@@ -132,25 +112,26 @@ use <kbd>jigdo-mirror</kbd> instead.</p>
 recommended</toc-add-entry>
 
 <p>Actually, this means: Mirror the <tt>.iso</tt> files using <a
-href="http://atterer.org/jigdo/"><kbd>jigdo-mirror</kbd></a>, then (if
+href="https://www.einval.com/~steve/software/jigdo/"><kbd>jigdo-mirror</kbd></a>, then (if
 you also want to mirror other types of files, e.g. <tt>.jigdo</tt> and
 <tt>.template</tt> files) run rsync over the directory to fetch the
 rest. The scripts on <a
 href="http://www.acc.umu.se/~maswan/debian-push/cdimage/">this
 page</a> might help when setting this up.</p>
 
-<p>A lot of people maintain "regular" Debian mirrors (<kbd>debian/</kbd>),
-or just have such a mirror nearby. This means that they already have the
-<tt>.deb</tt>s that are included in the CD images. The obvious
-question is -- why can't we use those same files in the CD images?</p>
+<p>A lot of people maintain "regular" Debian mirrors
+(<kbd>debian/</kbd>), or just have such a mirror nearby. This means
+that they already have the <tt>.deb</tt>s that are included in the
+CD/DVD images. The obvious question is -- why can't we use those same
+files in the CD/DVD images?</p>
 
 <p><kbd>jigdo-mirror</kbd> is a program that enables one to generate a
-Debian CD images using the files from a "normal" mirror, plus a few extra
-jigdo template files.</p>
+set of Debian CD/DVD images using the files from a "normal" mirror,
+plus a few extra jigdo template files.</p>
  
-<p>First off, you need the jigdo template files. See
-<a href="../jigdo-cd">the jigdo information page</a> for links.
-Fetch the files for each architecture you wish to build images for.</p>
+<p>Firstly, you need the jigdo template files. See <a
+href="../jigdo-cd">the jigdo information page</a> for links. Fetch the
+files for each architecture you wish to build images for.</p>
 
 <p>Create <kbd>~/.jigdo-mirror</kbd> file to configure the program.
 This is an example:</p>
@@ -234,9 +215,9 @@ included.</p>
   The full set of i386 images may still take too much space for you if
   it includes DVD and dual-layer DVD images. This excludes all
   <tt>.iso</tt> images except for the net-install images and the first
-  three i386 CDs.</li>
+  three i386 DVDs.</li>
 
-  <li><strong>Exclude all architectures except i386:</strong>
+  <li><strong>Exclude multiple architectures except i386:</strong>
   <kbd>--exclude=alpha/ --exclude=arm/ --exclude=hppa/ --exclude=hurd/
   --exclude=ia64/ --exclude=m68k/ --exclude=mips/ --exclude=mipsel/
   --exclude=powerpc/ --exclude=s390/ --exclude=sh/
@@ -244,7 +225,10 @@ included.</p>
 
   Only include the full set of files for i386, do not include any
   <tt>.jigdo</tt>, <tt>.iso</tt> etc files whatsoever for the other
-  architectures.</li>
+  architectures.<br>
+
+  <strong>Check the architecture list before mirroring - the list
+  changes and these examples may be out of date!</strong></li>
 
 </ul>
 #______________________________________________________________________
@@ -259,24 +243,30 @@ mirror:</p>
 <ul>
 
   <li><strong><tt>*-netinst.iso</tt></strong>: One image for each
-  architecture, up to 300&nbsp;MB</li>
+  architecture, up to 500&nbsp;MB</li>
 
   <li><strong><tt>*-dvd.iso</tt></strong> (single-layer DVDs):
-  Multiple images for i386 only, each up to 4482&nbsp;MB large. For
-  sarge, the accumulated size of the i386 images is about
-  9000&nbsp;MB.</li>
-
-  <li><strong><tt>*-dldvd.iso</tt></strong> (dual-layer DVDs): As
-  above, except that individual images are up to 8106&nbsp;MB
-  large. For sarge, no <tt>.iso</tt> images are available, only jigdo
-  files.</li>
-
-  <li><strong><tt>*.iso</tt></strong>: All remaining <tt>.iso</tt>
-  files which do not match one of the above patterns are CD
-  images. There are multiple images for each architecture, each up to
-  650&nbsp;MB large. The accumulated size of all images and
-  architectures equals the <a href="/mirror/size">size of a full
-  Debian mirror</a> (100&nbsp;GB as of this writing).</li>
+  Multiple images, each up to 4482&nbsp;MB large. For buster, there
+  are up to <strong>16</strong> DVD images per architecture. Debian
+  servers provide only a small subset of DVD images in .iso form for
+  direct download: 3 for amd64, 3 for i386 and 1 each for other
+  architectures. The remaining images are only provided in jigdo
+  form.</li>
+
+  <li><strong><tt>*-bd.iso</tt></strong> (single-layer Blu-Rays): As
+  above, except that individual images are up to 23&nbsp;GB in
+  size. These images are only available as jigdo files for a limited
+  set of architectures (amd64 and i386) and source.</li>
+
+  <li><strong><tt>*-dlbd.iso</tt></strong> (dual-layer Blu-Rays): As
+  above, except that individual images are up to 48&nbsp;GB in
+  size. These images are only available as jigdo files for a limited
+  set of architectures (amd64 and i386) and source.</li>
+
+  <li><strong><tt>*-STICK16GB*.iso</tt></strong> (16GB USB images): As
+  above, except that individual images are up to 16&nbsp;GB in
+  size. These images are only available as jigdo files for a limited
+  set of architectures (amd64 and i386).</li>
 
 </ul>
 #______________________________________________________________________
diff --git a/greek/CD/misc.wml b/greek/CD/misc.wml
index cecfdeb6bf7..2e4a5549db9 100644
--- a/greek/CD/misc.wml
+++ b/greek/CD/misc.wml
@@ -1,16 +1,16 @@
-#use wml::debian::cdimage title="Εικόνες CD του Debian - διάφορα ζητήματα" BARETITLE=true
-#use wml::debian::translation-check translation="064da998e8fb972077f1cd697cdea4034a9e4ac5" maintainer="galaxico"
+#use wml::debian::cdimage title="Debian CD images - miscellaneous items" BARETITLE=true
+#use wml::debian::translation-check translation="05e3a535fd42688838f38b58d986be8a81cde9c2" maintainer="galaxico"
 
-<p>Οι ακόλουθες σελίδες δεν είναι άμεσα προσβάσιμες μέσω της μπάρας του μενού στην κορυφή κάθε σελίδας:</p>
+<p>The following pages are not directly accessible via the menu
+bar at the top of each page:</p>
 
 <ul>
 
-  <li><a href="artwork/">Καλλιτεχνική δουλειά για τα καλύμματα των CD του Debian</a></li>
+  <li><a href="artwork/">Artwork for covers of Debian CDs</a></li>
 
-  <li><a href="mirroring/">Γίνετε ένας καθρέφτης των CD του Debian</a></li>
+  <li><a href="mirroring/">Becoming a Debian CD mirror</a></li>
 
-  <li><a href="mirroring/rsync-mirrors">Λίστα των καθρεφτών rsync για τα CD του Debian</a></li>
-
-  <li><a href="releases/">Πλήροφορίες της κυκλοφορίας της έκδοσης για τις εικόνες των CD</a></li>
+  <li><a href="mirroring/rsync-mirrors">List of rsync mirrors for
+  Debian CD images</a></li>
 
 </ul>
diff --git a/greek/CD/netinst/index.wml b/greek/CD/netinst/index.wml
index 84f332565d0..44720647897 100644
--- a/greek/CD/netinst/index.wml
+++ b/greek/CD/netinst/index.wml
@@ -1,12 +1,21 @@
-#use wml::debian::cdimage title="Δικτυακή εγκατάσταση από ένα μίνιμαλ CD"
+#use wml::debian::cdimage title="Network install from a minimal CD"
 #use wml::debian::release_info
 #use wml::debian::installer
 #include "$(ENGLISHDIR)/releases/images.data"
-#use wml::debian::translation-check translation="40eeef5c10b97819abf8467d7f2a8038a8729ff8" maintainer="galaxico"
+#use wml::debian::translation-check translation="cf13aff27aee3763a70db6bb4c8d2087bea5716e" maintainer="galaxico"
 
-<p>Ένα CD <q>διακτυακής εγκατάστασης</q> ή <q>netinst</q> είναι ένα μοναδικό CD που σας επιτρέπει να εγκαταστήσετε ολόκληρο το λειτουργικό σύστημα. Αυτό το μοναδικό CD περιέχει μόνο την ελάχιστη ποσότητα λογισμικού για να ξεκινήσετε την εγκατάσταση και να φέρετε τα υπόλοιπα πακέτα από το Διαδίκτυο.</p>
+<p>A <q>network install</q> or <q>netinst</q> CD is a single CD which enables
+you to install the entire operating system. This single CD contains
+just the minimal amount of software to start the installation and
+fetch the remaining packages over the Internet.</p>
 
-<p><strong>Τι είναι καλλίτερο για μένα &mdash; το μίνιμαλ εκκινήσιμο CD-ROM ή τα πλήρη CD;</strong> Εξαρτάται, αλλά νομίζουμε ότι σε πολλές περιπτώσεις το η εικόνα του μίνιμαλ CD είναι καλλίτερη &mdash; πρώτα απ' όλα, μεταφορτώνετε τα πακέτα που επιλέξατε για εγκατάσταση στο μηχάνημά σας, που σας γλιτώνει και χρόνο και δεδομένα στο διαδίκτυο. Από την άλλη, τα πλήρη CD είναι πιο κατάλληλα όταν κάνετε εγκατάσταση σε περισσότερα από ένα μηχανήματα, ή σε μηχανήματα χωρίς μια δωρεάν σύνδεση στο Διαδίκτυο.</p>
+<p><strong>What's better for me &mdash; the minimal bootable CD-ROM or the
+full CDs?</strong> It depends, but we think that in many cases the
+minimal CD image is better &mdash; above all, you only download the packages
+that you selected for installation on your machine, which saves both
+time and bandwidth. On the other hand, the full CDs are more suitable
+when installing on more than one machine, or on machines without a
+free Internet connection.</p>
 
 <p><strong>What types of network connections are supported
 during installation?</strong>
@@ -38,13 +47,13 @@ system.</p>
 
 <div class="line">
 <div class="item col50">
-<p><strong>netinst CD image (via <a href="$(HOME)/CD/torrent-cd">bittorrent</a>)</strong></p>
-	  <stable-netinst-torrent />
-</div>
-<div class="item col50 lastcol">
 <p><strong>netinst CD image (generally 150-300 MB, varies by architecture)</strong></p>
 	  <stable-netinst-images />
 </div>
+<div class="item col50 lastcol">
+<p><strong>netinst CD image (via <a href="$(HOME)/CD/torrent-cd">bittorrent</a>)</strong></p>
+	  <stable-netinst-torrent />
+</div>
 <div class="clear"></div>
 </div>
 
@@ -54,3 +63,32 @@ the <a href="../faq/">FAQ</a>.</p>
 <p>Once you have downloaded the images, be sure to have a look at the
 <a href="$(HOME)/releases/stable/installmanual">detailed
 information about the installation process</a>.</p>
+
+# Translators: the following paragraph exists (in this or a similar form) several times in webwml,
+# so please try to keep translations consistent. See:
+# ./CD/http-ftp/index.wml
+# ./CD/live/index.wml
+# ./CD/netinst/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ./releases/<release-codename>/debian-installer/index.wml
+# ./devel/debian-installer/index.wml
+# 
+<h2><a name="firmware">Unofficial netinst images with non-free firmware included</a></h2>
+
+<div id="firmware_nonfree" class="important">
+<p>
+If any of the hardware in your system <strong>requires non-free firmware to be
+loaded</strong> with the device driver, you can use one of the
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/">\
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image
+including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the <a href="../../releases/stable/amd64/ch06s04">Installation Guide</a>.
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/">unofficial
+installation images for <q>stable</q> with firmware included</a>
+</p>
+</div>
diff --git a/greek/CD/torrent-cd/index.wml b/greek/CD/torrent-cd/index.wml
index 2df2c6ce871..5782aecf5d4 100644
--- a/greek/CD/torrent-cd/index.wml
+++ b/greek/CD/torrent-cd/index.wml
@@ -4,7 +4,7 @@
 #use wml::debian::installer
 #include "$(ENGLISHDIR)/releases/images.data"
 #include "$(ENGLISHDIR)/devel/debian-installer/images.data"
-#use wml::debian::translation-check translation="e8bc071549727e1ed1d215013db8ccabd37bb3e0" maintainer="galaxico"
+#use wml::debian::translation-check translation="f917b9adf4a1c15cca8405e010043d380e4b1b83" maintainer="galaxico"
 
 <p><a href="https://en.wikipedia.org/wiki/BitTorrent">BitTorrent</a>
 is a peer to peer download system optimised for large numbers of
@@ -75,3 +75,30 @@ walkthrough of the installation process. Other useful documentation includes:
 If you can, please leave your client running after your download is complete,
 to help others download images faster!
 </p>
+
+# Translators: the following paragraph exists (in this or a similar form) several times in webwml,
+# so please try to keep translations consistent. See:
+# ./CD/http-ftp/index.wml
+# ./CD/live/index.wml
+# ./CD/netinst/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ./releases/<release-codename>/debian-installer/index.wml
+# ./devel/debian-installer/index.wml
+# 
+<div id="firmware_nonfree" class="important">
+<p>
+If any of the hardware in your system <strong>requires non-free firmware to be
+loaded</strong> with the device driver, you can use one of the
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/">\
+tarballs of common firmware packages</a> or download an <strong>unofficial</strong> image
+including these <strong>non-free</strong> firmwares. Instructions how to use the tarballs
+and general information about loading firmware during an installation can
+be found in the <a href="../../releases/stable/amd64/ch06s04">Installation Guide</a>.
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/">unofficial
+installation images for <q>stable</q> with firmware included</a>
+</p>
+</div>