summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/de/hardware.po16
-rw-r--r--po/de/install-methods.po230
-rw-r--r--po/de/installation-howto.po104
-rw-r--r--po/de/preparing.po34
-rw-r--r--po/de/preseed.po75
-rw-r--r--po/de/random-bits.po23
-rw-r--r--po/de/welcome.po56
-rw-r--r--po/it/boot-installer.po50
-rw-r--r--po/it/install-methods.po40
-rw-r--r--po/it/installation-howto.po32
-rw-r--r--po/it/preparing.po8
-rw-r--r--po/it/preseed.po8
-rw-r--r--po/it/using-d-i.po50
-rw-r--r--po/it/welcome.po6
-rw-r--r--po/pt/boot-installer.po271
-rw-r--r--po/pt/welcome.po52
16 files changed, 276 insertions, 779 deletions
diff --git a/po/de/hardware.po b/po/de/hardware.po
index 8e3ac092f..1b7cafa7c 100644
--- a/po/de/hardware.po
+++ b/po/de/hardware.po
@@ -3396,19 +3396,14 @@ msgstr "CD-ROM/DVD-ROM/BD-ROM"
#. Tag: para
#: hardware.xml:2109
#, no-c-format
-#| msgid "CD-ROM based installation is supported for most architectures."
msgid "Installation from optical disc is supported for most architectures."
msgstr ""
-"Eine Installation von optischen Datenträgern wird für die meisten"
-" Architekturen "
-"unterstützt."
+"Eine Installation von optischen Datenträgern wird für die meisten "
+"Architekturen unterstützt."
#. Tag: para
#: hardware.xml:2113
#, no-c-format
-#| msgid ""
-#| "On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are "
-#| "FireWire devices that are supported by the ohci1394 and sbp2 drivers."
msgid ""
"On PCs SATA, IDE/ATAPI, USB and SCSI optical drives are supported, as are "
"FireWire devices that are supported by the ohci1394 and sbp2 drivers."
@@ -3425,13 +3420,6 @@ msgstr "USB-Memory-Stick"
#. Tag: para
#: hardware.xml:2132
#, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media is the standard way of installing a new "
-#| "operating system on them."
msgid ""
"USB flash disks a.k.a. USB memory sticks have become a commonly used and "
"cheap storage device. Most modern computer systems also allow booting the &d-"
diff --git a/po/de/install-methods.po b/po/de/install-methods.po
index 6a517146c..b90e85fc6 100644
--- a/po/de/install-methods.po
+++ b/po/de/install-methods.po
@@ -25,27 +25,12 @@ msgstr "Systeminstallations-Medien beschaffen"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-#| msgid "Official &debian-gnu; CD/DVD-ROM Sets"
msgid "Official &debian-gnu; installation images"
msgstr "Offizielle &debian-gnu;-Installations-Images"
#. Tag: para
#: install-methods.xml:13
#, no-c-format
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official "
-#| "&debian; CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink "
-#| "url=\"&url-debian-cd-vendors;\">CD vendors page</ulink>). You may also "
-#| "download the CD/DVD-ROM images from a &debian; mirror and make your own "
-#| "set, if you have a fast network connection and a CD/DVD burner (see the "
-#| "<ulink url=\"&url-debian-cd;\">Debian CD page</ulink> and <ulink url="
-#| "\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> for detailed instructions). "
-#| "If you have a &debian; CD/DVD set and CDs/DVDs are bootable on your "
-#| "machine<phrase arch=\"x86\">, which is the case on all modern PCs</"
-#| "phrase>, you can skip right to <xref linkend=\"boot-installer\"/>. Much "
-#| "effort has been expended to ensure the most-used files are on the first "
-#| "CDs and DVDs, so that a basic desktop installation can be done with only "
-#| "the first DVD or - to a limited extent - even with only the first CD."
msgid ""
"By far the easiest way to install &debian-gnu; is from a set of official "
"&debian; installation images. You can buy a set of CDs/DVDs from a vendor "
@@ -63,28 +48,22 @@ msgid ""
"CD image."
msgstr ""
"Die bei weitem einfachste Methode, &debian-gnu; zu installieren, ist von "
-"einem Satz offizieller &debian-gnu;-Installations-Images. Sie können die"
-" CDs/DVDs"
-"bei einem Händler kaufen (siehe die <ulink url=\"&url-debian-cd-vendors;"
-"\">Verkäufer von Debian CDs</ulink>-Seite). Oder &ndash; wenn Sie eine"
-" schnelle "
-"Netzwerkverbindung und einen CD/DVD-Brenner haben &ndash; Sie laden sich die "
-"Images von einem &debian;-Spiegel-Server herunter und brennen die Disks"
-" selber, "
-"(lesen Sie die <ulink url=\"&url-debian-cd;\">Debian GNU/Linux "
+"einem Satz offizieller &debian-gnu;-Installations-Images. Sie können die CDs/"
+"DVDsbei einem Händler kaufen (siehe die <ulink url=\"&url-debian-cd-vendors;"
+"\">Verkäufer von Debian CDs</ulink>-Seite). Oder &ndash; wenn Sie eine "
+"schnelle Netzwerkverbindung und einen CD/DVD-Brenner haben &ndash; Sie laden "
+"sich die Images von einem &debian;-Spiegel-Server herunter und brennen die "
+"Disks selber, (lesen Sie die <ulink url=\"&url-debian-cd;\">Debian GNU/Linux "
"auf CD</ulink>-Seite sowie die <ulink url=\"&url-debian-cd-faq;\">Häufig "
"gestellten Fragen (FAQ) über Debian-CDs</ulink> bezüglich weiterer Details). "
"Wenn Sie solche &debian;-Installationsmedien haben und Ihr Rechner davon "
"booten kann<phrase arch=\"x86\">, was auf allen modernen PCs der Fall ist</"
"phrase>, können Sie direkt zu <xref linkend=\"boot-installer\"/> springen. "
-"Es wurde ein großer Aufwand betrieben, um sicherzustellen, dass die "
-"meist-verwendeten Dateien auf den ersten Images eines Satzes enthalten sind,"
-" so dass "
-"eine Standard-Desktop-Installation mit nur dem ersten DVD-Image &ndash; oder"
-" in "
-"einem gewissen Ausmaß sogar nur dem ersten CD-Image &ndash; durchgeführt"
-" werden "
-"kann."
+"Es wurde ein großer Aufwand betrieben, um sicherzustellen, dass die meist-"
+"verwendeten Dateien auf den ersten Images eines Satzes enthalten sind, so "
+"dass eine Standard-Desktop-Installation mit nur dem ersten DVD-Image &ndash; "
+"oder in einem gewissen Ausmaß sogar nur dem ersten CD-Image &ndash; "
+"durchgeführt werden kann."
#. Tag: para
#: install-methods.xml:30
@@ -105,13 +84,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:38
#, no-c-format
-#| msgid ""
-#| "Also, keep in mind: if the CDs/DVDs you are using don't contain some "
-#| "packages you need, you can always install those packages afterwards from "
-#| "your running new Debian system (after the installation has finished). If "
-#| "you need to know on which CD/DVD to find a specific package, visit <ulink "
-#| "url=\"https://cdimage-search.debian.org/\">https://cdimage-search.debian."
-#| "org/</ulink>."
msgid ""
"Also, keep in mind: if the installation media you are using don't contain "
"some packages you need, you can always install those packages afterwards "
@@ -120,30 +92,16 @@ msgid ""
"visit <ulink url=\"https://cdimage-search.debian.org/\">https://cdimage-"
"search.debian.org/</ulink>."
msgstr ""
-"Bedenken Sie auch: wenn die Installationsmedien, die Sie verwenden, einige"
-" besondere "
-"Pakete nicht enthalten, die Sie benötigen, können Sie diese auch nach "
-"Abschluß der Installation aus dem laufenden neuen Debian-System heraus "
-"nachinstallieren. Falls Sie wissen möchten, in welchem Installations-Image"
-" sich ein "
-"spezielles Paket befindet, besuchen Sie <ulink url=\"https://cdimage-search."
-"debian.org/\">https://cdimage-search.debian.org/</ulink>."
+"Bedenken Sie auch: wenn die Installationsmedien, die Sie verwenden, einige "
+"besondere Pakete nicht enthalten, die Sie benötigen, können Sie diese auch "
+"nach Abschluß der Installation aus dem laufenden neuen Debian-System heraus "
+"nachinstallieren. Falls Sie wissen möchten, in welchem Installations-Image "
+"sich ein spezielles Paket befindet, besuchen Sie <ulink url=\"https://"
+"cdimage-search.debian.org/\">https://cdimage-search.debian.org/</ulink>."
#. Tag: para
#: install-methods.xml:46
#, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
-#| "relevant on very old PC systems)</phrase>, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase arch=\"s390\">VM reader,</"
-#| "phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase "
-#| "condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the &debian; network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
msgid ""
"If your machine doesn't support booting from optical media<phrase arch="
"\"x86\"> (only relevant on very old PC systems)</phrase>, but you do have a "
@@ -158,29 +116,23 @@ msgid ""
"for those files in the same directories and subdirectories on your "
"installation media."
msgstr ""
-"Wenn Ihr Rechner nicht von optischen Medien booten kann<phrase arch=\"x86\">"
-" (nur relevant "
-"bei sehr alten PC-Systemen)</phrase>, Sie aber trotzdem einen Satz &debian;-"
-"CDs/DVDs haben, können Sie eine alternative Strategie verfolgen, wie zum"
-" Beispiel "
-"<phrase arch=\"s390\">VM reader, </phrase><phrase condition=\"bootable-disk"
-"\">Festplatte, </phrase><phrase condition=\"bootable-usb\">USB-Stick, </"
-"phrase><phrase condition=\"supports-tftp\">Netzwerk-Boot, </phrase> oder Sie "
-"laden den Kernel manuell von der Disk, um den Installer zu starten. Die "
-"Dateien, die Sie benötigen, um auf alternative Art zu booten, sind ebenfalls "
-"auf der Disk. Das &debian;-Archiv im Netz und die Verzeichnisstruktur auf den"
-" optischen "
-"Installationsmedien "
-"sind identisch. Wenn also hier Pfade zu Dateien im Archiv angegeben "
-"werden, können Sie diese Dateien auch im gleichen Verzeichnis/"
-"Unterverzeichnis auf der Disk finden."
+"Wenn Ihr Rechner nicht von optischen Medien booten kann<phrase arch=\"x86\"> "
+"(nur relevant bei sehr alten PC-Systemen)</phrase>, Sie aber trotzdem einen "
+"Satz &debian;-CDs/DVDs haben, können Sie eine alternative Strategie "
+"verfolgen, wie zum Beispiel <phrase arch=\"s390\">VM reader, </"
+"phrase><phrase condition=\"bootable-disk\">Festplatte, </phrase><phrase "
+"condition=\"bootable-usb\">USB-Stick, </phrase><phrase condition=\"supports-"
+"tftp\">Netzwerk-Boot, </phrase> oder Sie laden den Kernel manuell von der "
+"Disk, um den Installer zu starten. Die Dateien, die Sie benötigen, um auf "
+"alternative Art zu booten, sind ebenfalls auf der Disk. Das &debian;-Archiv "
+"im Netz und die Verzeichnisstruktur auf den optischen Installationsmedien "
+"sind identisch. Wenn also hier Pfade zu Dateien im Archiv angegeben werden, "
+"können Sie diese Dateien auch im gleichen Verzeichnis/Unterverzeichnis auf "
+"der Disk finden."
#. Tag: para
#: install-methods.xml:67
#, no-c-format
-#| msgid ""
-#| "Once the installer is booted, it will be able to obtain all the other "
-#| "files it needs from the CD."
msgid ""
"Once the installer is booted, it will be able to obtain all the other files "
"it needs from the disc."
@@ -191,13 +143,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:72
#, no-c-format
-#| msgid ""
-#| "If you don't have a CD set, then you will need to download the installer "
-#| "system files and place them on the <phrase arch=\"s390\">VM minidisk</"
-#| "phrase> <phrase condition=\"bootable-disk\">hard disk or</phrase> <phrase "
-#| "condition=\"bootable-usb\">usb stick or</phrase> <phrase condition="
-#| "\"supports-tftp\">a connected computer</phrase> so they can be used to "
-#| "boot the installer."
msgid ""
"If you don't have an installation media set, then you will need to download "
"the installer system files and place them on the <phrase arch=\"s390\">VM "
@@ -206,13 +151,12 @@ msgid ""
"\"supports-tftp\">a connected computer</phrase> so they can be used to boot "
"the installer."
msgstr ""
-"Wenn Sie kein Installationsmedium haben, müssen Sie die"
-" Installer-Systemdateien "
-"herunterladen und speichern, z.B. auf <phrase arch=\"s390\">VM Minidisk,</"
-"phrase> <phrase condition=\"bootable-disk\">Festplatte,</phrase> <phrase "
-"condition=\"bootable-usb\">USB-Stick,</phrase> <phrase condition=\"supports-"
-"tftp\">einem per Netzwerk angebundenen Computer,</phrase> so dass der "
-"Installer sie nutzen kann."
+"Wenn Sie kein Installationsmedium haben, müssen Sie die Installer-"
+"Systemdateien herunterladen und speichern, z.B. auf <phrase arch=\"s390\">VM "
+"Minidisk,</phrase> <phrase condition=\"bootable-disk\">Festplatte,</phrase> "
+"<phrase condition=\"bootable-usb\">USB-Stick,</phrase> <phrase condition="
+"\"supports-tftp\">einem per Netzwerk angebundenen Computer,</phrase> so dass "
+"der Installer sie nutzen kann."
#. Tag: title
#: install-methods.xml:96
@@ -441,19 +385,12 @@ msgstr ""
#. Tag: title
#: install-methods.xml:263
#, no-c-format
-#| msgid "Preparing a USB stick using a hybrid CD or DVD image"
msgid "Preparing a USB stick using a hybrid CD/DVD image"
msgstr "Einen USB-Stick vorbereiten mit einem Hybrid-CD/DVD-Image"
#. Tag: para
#: install-methods.xml:264
#, no-c-format
-#| msgid ""
-#| "Debian CD and DVD images can now be written directly to a USB stick, "
-#| "which is a very easy way to make a bootable USB stick. Simply choose a CD "
-#| "or DVD image (such as the netinst, CD-1, DVD-1, or netboot) that will fit "
-#| "on your USB stick. See <xref linkend=\"official-cdrom\"/> to get a CD or "
-#| "DVD image."
msgid ""
"Debian installation images can now be written directly to a USB stick, which "
"is a very easy way to make a bootable USB stick. Simply choose an image "
@@ -462,10 +399,10 @@ msgid ""
msgstr ""
"Debian Installations-Images können jetzt direkt auf einen USB-Stick "
"geschrieben werden, was ein sehr einfacher Weg ist, einen bootfähigen USB-"
-"Stick zu erstellen. Wählen Sie einfach ein Image, das auf Ihren "
-"Stick passt (z.B. das netinst-, CD-, DVD-1- oder netboot-Image). Auf <xref "
-"linkend=\"official-cdrom\"/> finden Sie Informationen darüber, wie Sie sich "
-"die Images besorgen können."
+"Stick zu erstellen. Wählen Sie einfach ein Image, das auf Ihren Stick passt "
+"(z.B. das netinst-, CD-, DVD-1- oder netboot-Image). Auf <xref linkend="
+"\"official-cdrom\"/> finden Sie Informationen darüber, wie Sie sich die "
+"Images besorgen können."
#. Tag: para
#: install-methods.xml:272
@@ -484,18 +421,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:279
#, no-c-format
-#| msgid ""
-#| "The CD or DVD image you choose should be written directly to the USB "
-#| "stick, overwriting its current contents. For example, when using an "
-#| "existing GNU/Linux system, the CD or DVD image file can be written to a "
-#| "USB stick as follows, after having made sure that the stick is unmounted: "
-#| "<informalexample><screen>\n"
-#| "<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /"
-#| "dev/<replaceable>sdX</replaceable></userinput>\n"
-#| "<prompt>#</prompt> <userinput>sync</userinput>\n"
-#| "</screen></informalexample> Information about how to do this on other "
-#| "operating systems can be found in the <ulink url=\"&url-debian-cd-faq-"
-#| "write-usb;\">Debian CD FAQ</ulink>."
msgid ""
"The installation image you choose should be written directly to the USB "
"stick, overwriting its current contents. For example, when using an existing "
@@ -537,20 +462,15 @@ msgstr ""
#. Tag: para
#: install-methods.xml:297
#, no-c-format
-#| msgid ""
-#| "Simply writing the CD or DVD image to USB like this should work fine for "
-#| "most users. The other options below are more complex, mainly for people "
-#| "with specialised needs."
msgid ""
"Simply writing the installation image to USB like this should work fine for "
"most users. The other options below are more complex, mainly for people with "
"specialised needs."
msgstr ""
-"Einfach das Installations-Image wie hier beschrieben auf USB zu schreiben"
-" sollte "
-"für die meisten Benutzer funktionieren. Die anderen unten erwähnten Optionen "
-"sind komplexer und hauptsächlich für Leute mit speziellen Bedürfnissen "
-"gedacht."
+"Einfach das Installations-Image wie hier beschrieben auf USB zu schreiben "
+"sollte für die meisten Benutzer funktionieren. Die anderen unten erwähnten "
+"Optionen sind komplexer und hauptsächlich für Leute mit speziellen "
+"Bedürfnissen gedacht."
#. Tag: para
#: install-methods.xml:305
@@ -618,11 +538,6 @@ msgstr "Dateien manuell auf den USB-Stick kopieren"
#. Tag: para
#: install-methods.xml:335
#, no-c-format
-#| msgid ""
-#| "An alternative way to set up your USB stick is to manually copy the "
-#| "installer files, and also a CD image to it. Note that the USB stick "
-#| "should be at least 1 GB in size (smaller setups are possible if you "
-#| "follow <xref linkend=\"usb-copy-flexible\"/>)."
msgid ""
"An alternative way to set up your USB stick is to manually copy the "
"installer files, and also an installation image to it. Note that the USB "
@@ -630,11 +545,10 @@ msgid ""
"follow <xref linkend=\"usb-copy-flexible\"/>)."
msgstr ""
"Ein alternativer Weg zur Einrichtung des USB-Sticks ist das manuelle "
-"Kopieren der Installer-Dateien und eines Installations-Images auf den Stick."
-" Beachten "
-"Sie, dass der USB-Stick idealerweise mindestens 1 GB groß sein sollte "
-"(kleinere Setups sind möglich, wenn Sie gemäß <xref linkend=\"usb-copy-"
-"flexible\"/> vorgehen)."
+"Kopieren der Installer-Dateien und eines Installations-Images auf den Stick. "
+"Beachten Sie, dass der USB-Stick idealerweise mindestens 1 GB groß sein "
+"sollte (kleinere Setups sind möglich, wenn Sie gemäß <xref linkend=\"usb-"
+"copy-flexible\"/> vorgehen)."
#. Tag: para
#: install-methods.xml:342
@@ -706,15 +620,6 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
#. Tag: para
#: install-methods.xml:373
#, no-c-format
-#| msgid ""
-#| "After that, mount the USB memory stick <phrase arch="
-#| "\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</"
-#| "userinput>),</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
-#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
-#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a &debian; ISO "
-#| "image (netinst or full CD) to it. Unmount the stick (<userinput>umount /"
-#| "mnt</userinput>) and you are done."
msgid ""
"After that, mount the USB memory stick <phrase arch="
"\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</"
@@ -731,9 +636,9 @@ msgstr ""
"<replaceable>sdX2</replaceable> /mnt</userinput>)</phrase>, der jetzt ein "
"<phrase arch=\"x86\">FAT-Dateisystem</phrase><phrase arch=\"powerpc\">HFS-"
"Dateisystem</phrase> enthält, und kopieren Sie ein &debian; ISO-Image "
-"(Netinst oder eine Komplett-CD/DVD) dorthin. Lösen Sie die"
-" Laufwerkseinbindung "
-"des Sticks (<userinput>umount /mnt</userinput>) &ndash; das war's."
+"(Netinst oder eine Komplett-CD/DVD) dorthin. Lösen Sie die "
+"Laufwerkseinbindung des Sticks (<userinput>umount /mnt</userinput>) &ndash; "
+"das war's."
#. Tag: title
#: install-methods.xml:390
@@ -923,14 +828,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:505
#, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy "
-#| "the ISO file of a &debian; ISO image<footnote> <para> You can use either "
-#| "a netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be "
-#| "sure to select one that fits. Note that the <quote>netboot <filename>mini."
-#| "iso</filename></quote> image is not usable for this purpose. </para> </"
-#| "footnote> onto the stick. When you are done, unmount the USB memory stick "
-#| "(<userinput>umount /mnt</userinput>)."
msgid ""
"If you used an <filename>hd-media</filename> image, you should now copy the "
"ISO file of a &debian; ISO image<footnote> <para> You can use either a "
@@ -942,13 +839,12 @@ msgid ""
msgstr ""
"Wenn Sie ein <filename>hd-media</filename>-Image benutzt haben, sollten Sie "
"jetzt noch die ISO-Datei eines &debian;-ISO-Images<footnote> <para> Sie "
-"können dafür ein Netinst- oder ein Komplett-CD/DVD-Image verwenden (siehe <"
-"xref "
-"linkend=\"official-cdrom\"/>). Stellen Sie sicher, dass das Image Ihrer Wahl "
-"auf den Stick passt. Beachten Sie, dass das <quote>netboot <filename>mini."
-"iso</filename></quote>-Image für diesen Zweck nicht geeignet ist. </para> </"
-"footnote> auf den Stick kopieren. Danach lösen Sie die Einbindung der "
-"Partition wieder (<userinput>umount /mnt</userinput>)."
+"können dafür ein Netinst- oder ein Komplett-CD/DVD-Image verwenden (siehe "
+"<xref linkend=\"official-cdrom\"/>). Stellen Sie sicher, dass das Image "
+"Ihrer Wahl auf den Stick passt. Beachten Sie, dass das <quote>netboot "
+"<filename>mini.iso</filename></quote>-Image für diesen Zweck nicht geeignet "
+"ist. </para> </footnote> auf den Stick kopieren. Danach lösen Sie die "
+"Einbindung der Partition wieder (<userinput>umount /mnt</userinput>)."
#. Tag: para
#: install-methods.xml:529
@@ -1148,10 +1044,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:650
#, no-c-format
-#| msgid ""
-#| "A full, <quote>pure network</quote> installation can be achieved using "
-#| "this technique. This avoids all hassles of removable media, like finding "
-#| "and burning CD images."
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
"technique. This avoids all hassles of removable media, like finding and "
@@ -1285,16 +1177,12 @@ msgstr ""
#. Tag: para
#: install-methods.xml:726
#, no-c-format
-#| msgid ""
-#| "Copy the following directories from a &debian; CD image to <filename>c:"
-#| "\\</filename>."
msgid ""
"Copy the following directories from a &debian; installation image to "
"<filename>c:\\</filename>."
msgstr ""
-"Kopieren Sie die folgenden Verzeichnisse von einem &debian;"
-" Installations-Image nach "
-"<filename>c:\\</filename>:"
+"Kopieren Sie die folgenden Verzeichnisse von einem &debian; Installations-"
+"Image nach <filename>c:\\</filename>:"
#. Tag: para
#: install-methods.xml:731
diff --git a/po/de/installation-howto.po b/po/de/installation-howto.po
index 0e1a9077a..8be406768 100644
--- a/po/de/installation-howto.po
+++ b/po/de/installation-howto.po
@@ -74,12 +74,6 @@ msgstr "Den Installer booten"
#. Tag: para
#: installation-howto.xml:37
#, no-c-format
-#| msgid ""
-#| "<phrase condition=\"unofficial-build\"> For some quick links to CD "
-#| "images, check out the <ulink url=\"&url-d-i;\"> &d-i; home page</ulink>. "
-#| "</phrase> The debian-cd team provides builds of CD images using &d-i; on "
-#| "the <ulink url=\"&url-debian-cd;\">Debian CD page</ulink>. For more "
-#| "information on where to get CDs, see <xref linkend=\"official-cdrom\"/>."
msgid ""
"<phrase condition=\"unofficial-build\"> For some quick links to installation "
"images, check out the <ulink url=\"&url-d-i;\"> &d-i; home page</ulink>. </"
@@ -91,32 +85,24 @@ msgstr ""
"<phrase condition=\"unofficial-build\">Direkte Verweise zu den Installations-"
"Images finden Sie auf der <ulink url=\"&url-d-i;\"> &d-i;-Homepage</ulink>. "
"</phrase> Das &debian;-CD-Team stellt Ausgaben der Images, die den &d-i; "
-"nutzen, auf der <ulink url=\"&url-debian-cd;\">Debian auf CD/DVD</ulink"
-">-Seite "
-"zur Verfügung. Weitere Informationen, wo Sie Installations-Image bekommen"
-" können, "
-"gibt es hier: <xref linkend=\"official-cdrom\"/>."
+"nutzen, auf der <ulink url=\"&url-debian-cd;\">Debian auf CD/DVD</ulink>-"
+"Seite zur Verfügung. Weitere Informationen, wo Sie Installations-Image "
+"bekommen können, gibt es hier: <xref linkend=\"official-cdrom\"/>."
#. Tag: para
#: installation-howto.xml:47
#, no-c-format
-#| msgid ""
-#| "Some installation methods require other images than CD images. <phrase "
-#| "condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
-#| "page</ulink> has links to other images. </phrase> <xref linkend=\"where-"
-#| "files\"/> explains how to find images on &debian; mirrors."
msgid ""
"Some installation methods require other images than those for optical media. "
"<phrase condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; "
"home page</ulink> has links to other images. </phrase> <xref linkend=\"where-"
"files\"/> explains how to find images on &debian; mirrors."
msgstr ""
-"Einige Installationsmethoden erfordern andere Images als die für optische"
-" Medien. "
-"<phrase condition=\"unofficial-build\"> Auf der <ulink url=\"&url-d-i;\">&d-"
-"i;-Homepage</ulink> gibt es Links zu anderen Images. </phrase> <xref linkend="
-"\"where-files\"/> gibt Infos, wo man Images auf den &debian;-Spiegel-Servern "
-"findet."
+"Einige Installationsmethoden erfordern andere Images als die für optische "
+"Medien. <phrase condition=\"unofficial-build\"> Auf der <ulink url=\"&url-d-"
+"i;\">&d-i;-Homepage</ulink> gibt es Links zu anderen Images. </phrase> <xref "
+"linkend=\"where-files\"/> gibt Infos, wo man Images auf den &debian;-Spiegel-"
+"Servern findet."
#. Tag: para
#: installation-howto.xml:57
@@ -137,15 +123,6 @@ msgstr "Optische Disks (CD/DVD)"
#. Tag: para
#: installation-howto.xml:67
#, no-c-format
-#| msgid ""
-#| "The netinst CD image is a popular image which can be used to install "
-#| "&releasename; with the &d-i;. This image is intended to boot from CD and "
-#| "install additional packages over a network; hence the name "
-#| "<quote>netinst</quote>. The image has the software components needed to "
-#| "run the installer and the base packages to provide a minimal "
-#| "&releasename; system. If you'd rather, you can get a full size CD image "
-#| "which will not need the network to install. You only need the first CD of "
-#| "the set."
msgid ""
"The netinst CD image is a popular image which can be used to install "
"&releasename; with the &d-i;. This installation method is intended to boot "
@@ -157,27 +134,17 @@ msgid ""
msgstr ""
"Das Netinst-CD-Image ist ein beliebtes Image, mit dem &releasename-cap; "
"mittels dem &d-i; installiert werden kann. Bei dieser Methode wird vom "
-"Installationsmedium gebootet "
-"und zusätzliche Pakete werden über das Netzwerk installiert, daher auch der"
-" Name "
-"<quote>netinst</quote> (Netzwerkinstallation). Es enthält die Komponenten, "
-"die zum Betrieb des Installers nötig sind, sowie die Basispakete, um ein "
-"minimales &releasename-cap;-System bereitzustellen. Wenn Sie möchten, können "
-"Sie auch ein Komplett-CD/DVD-Image bekommen, das für die Installation"
-" überhaupt "
-"kein Netzwerk benötigt. Sie benötigen nur das erste Image aus solch einem"
-" Satz."
+"Installationsmedium gebootet und zusätzliche Pakete werden über das Netzwerk "
+"installiert, daher auch der Name <quote>netinst</quote> "
+"(Netzwerkinstallation). Es enthält die Komponenten, die zum Betrieb des "
+"Installers nötig sind, sowie die Basispakete, um ein minimales &releasename-"
+"cap;-System bereitzustellen. Wenn Sie möchten, können Sie auch ein Komplett-"
+"CD/DVD-Image bekommen, das für die Installation überhaupt kein Netzwerk "
+"benötigt. Sie benötigen nur das erste Image aus solch einem Satz."
#. Tag: para
#: installation-howto.xml:77
#, no-c-format
-#| msgid ""
-#| "Download whichever type you prefer and burn it to a CD. <phrase arch="
-#| "\"any-x86\">To boot the CD, you may need to change your BIOS "
-#| "configuration, as explained in <xref linkend=\"bios-setup\"/>.</phrase> "
-#| "<phrase arch=\"powerpc\"> To boot a PowerMac from CD, press the "
-#| "<keycap>c</keycap> key while booting. See <xref linkend=\"boot-cd\"/> for "
-#| "other ways to boot from CD. </phrase>"
msgid ""
"Download whichever type you prefer and burn it to an optical disc. <phrase "
"arch=\"any-x86\">To boot the disc, you may need to change your BIOS "
@@ -186,15 +153,13 @@ msgid ""
"keycap> key while booting. See <xref linkend=\"boot-cd\"/> for other ways to "
"boot from CD. </phrase>"
msgstr ""
-"Laden Sie das Image herunter, das Sie bevorzugen, und brennen Sie es auf"
-" einen "
-"optischen Datenträger. "
-"<phrase arch=\"any-x86\">Um davon zu booten, müssen Sie unter Umständen die "
-"BIOS-Einstellungen ändern, wie in <xref linkend=\"bios-setup\"/> beschrieben."
-"</phrase> <phrase arch=\"powerpc\">Um einen PowerMac von CD zu starten, "
-"drücken Sie während des Boot-Vorgangs die Taste <keycap>c</keycap>. Lesen "
-"Sie <xref linkend=\"boot-cd\"/>, um Infos zu erhalten, wie Sie sonst noch "
-"von CD booten können.</phrase>"
+"Laden Sie das Image herunter, das Sie bevorzugen, und brennen Sie es auf "
+"einen optischen Datenträger. <phrase arch=\"any-x86\">Um davon zu booten, "
+"müssen Sie unter Umständen die BIOS-Einstellungen ändern, wie in <xref "
+"linkend=\"bios-setup\"/> beschrieben.</phrase> <phrase arch=\"powerpc\">Um "
+"einen PowerMac von CD zu starten, drücken Sie während des Boot-Vorgangs die "
+"Taste <keycap>c</keycap>. Lesen Sie <xref linkend=\"boot-cd\"/>, um Infos zu "
+"erhalten, wie Sie sonst noch von CD booten können.</phrase>"
#. Tag: title
#: installation-howto.xml:91
@@ -217,12 +182,6 @@ msgstr ""
#. Tag: para
#: installation-howto.xml:98
#, no-c-format
-#| msgid ""
-#| "The easiest way to prepare your USB memory stick is to download any "
-#| "Debian CD or DVD image that will fit on it, and write the CD image "
-#| "directly to the memory stick. Of course this will destroy anything "
-#| "already on the memory stick. This works because Debian CD images are "
-#| "\"isohybrid\" images that can boot both from CD and from USB drives."
msgid ""
"The easiest way to prepare your USB memory stick is to download any Debian "
"CD or DVD image that will fit on it, and write the image directly to the "
@@ -350,15 +309,6 @@ msgstr "Von Festplatte starten"
#. Tag: para
#: installation-howto.xml:162
#, no-c-format
-#| msgid ""
-#| "It's possible to boot the installer using no removable media, but just an "
-#| "existing hard disk, which can have a different OS on it. Download "
-#| "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-#| "filename>, and a &debian; CD image to the top-level directory of the hard "
-#| "disk. Make sure that the CD image has a filename ending in <literal>.iso</"
-#| "literal>. Now it's just a matter of booting linux with the initrd. "
-#| "<phrase arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to "
-#| "do it. </phrase>"
msgid ""
"It's possible to boot the installer using no removable media, but just an "
"existing hard disk, which can have a different OS on it. Download "
@@ -373,10 +323,9 @@ msgstr ""
"Wechselmedium nutzen, sondern einfach eine vorhandene Festplatte, die sogar "
"ein anderes Betriebssystem enthalten kann. Laden Sie <filename>hd-media/"
"initrd.gz</filename>, <filename>hd-media/vmlinuz</filename> und ein &debian;-"
-"CD/DVD-Image in das Wurzelverzeichnis der Festplatte. Stellen Sie sicher,"
-" dass "
-"der Dateiname des Images auf <literal>.iso</literal> endet. Jetzt ist es "
-"lediglich erforderlich, Linux mit der initrd zu starten. <phrase arch="
+"CD/DVD-Image in das Wurzelverzeichnis der Festplatte. Stellen Sie sicher, "
+"dass der Dateiname des Images auf <literal>.iso</literal> endet. Jetzt ist "
+"es lediglich erforderlich, Linux mit der initrd zu starten. <phrase arch="
"\"x86\"> <xref linkend=\"boot-initrd\"/> beschreibt einen Weg, wie dies "
"funktioniert. </phrase>"
@@ -428,9 +377,6 @@ msgstr ""
#. Tag: para
#: installation-howto.xml:199
#, no-c-format
-#| msgid ""
-#| "Now sit back while debian-installer detects some of your hardware, and "
-#| "loads the rest of itself from CD, USB, etc."
msgid ""
"Now sit back while debian-installer detects some of your hardware, and loads "
"the rest of the installation image."
diff --git a/po/de/preparing.po b/po/de/preparing.po
index 671cea0fd..057aca64e 100644
--- a/po/de/preparing.po
+++ b/po/de/preparing.po
@@ -1860,20 +1860,6 @@ msgstr ""
#. Tag: para
#: preparing.xml:1184
#, no-c-format
-#| msgid ""
-#| "Unfortunately some computers contain buggy BIOS versions. Booting &d-i; "
-#| "from a USB stick might not work even if there is an appropriate option in "
-#| "the BIOS setup menu and the stick is selected as the primary boot device. "
-#| "On some of these systems using a USB stick as boot medium is impossible; "
-#| "others can be tricked into booting from the stick by changing the device "
-#| "type in the BIOS setup from the default <quote>USB harddisk</quote> or "
-#| "<quote>USB stick</quote> to <quote>USB ZIP</quote> or <quote>USB CDROM</"
-#| "quote>. <phrase condition=\"isohybrid-supported\"> In particular if you "
-#| "use an isohybrid CD/DVD image on a USB stick (see <xref linkend=\"usb-"
-#| "copy-isohybrid\"/>), changing the device type to <quote>USB CDROM</quote> "
-#| "helps on some BIOSes which will not boot from a USB stick in USB harddisk "
-#| "mode.</phrase> You may need to configure your BIOS to enable <quote>USB "
-#| "legacy support</quote>."
msgid ""
"Unfortunately some computers contain buggy BIOS versions. Booting &d-i; from "
"a USB stick might not work even if there is an appropriate option in the "
@@ -1897,14 +1883,13 @@ msgstr ""
"es unter Umständen möglich, indem der Gerätetyp im BIOS-Setup von dem "
"Standardwert <quote>USB harddisk</quote> oder <quote>USB stick</quote> in "
"<quote>USB ZIP</quote> oder <quote>USB CDROM</quote> geändert wird. <phrase "
-"condition=\"isohybrid-supported\">Speziell wenn Sie ein"
-" isohybrid-Installations-"
-"Image auf einem USB-Stick verwenden (siehe <xref linkend=\"usb-copy-isohybrid"
-"\"/>), kann das Ändern des Gerätetyps in <quote>USB CDROM</quote> bei "
-"einigen BIOS-Versionen helfen, die von einem USB-Stick im <quote>USB "
-"harddisk</quote>-Modus nicht booten würden.</phrase> Sie müssen eventuell "
-"Ihre BIOS-Konfiguration noch anpassen, um <quote>USB legacy support</quote> "
-"zu aktivieren."
+"condition=\"isohybrid-supported\">Speziell wenn Sie ein isohybrid-"
+"Installations-Image auf einem USB-Stick verwenden (siehe <xref linkend=\"usb-"
+"copy-isohybrid\"/>), kann das Ändern des Gerätetyps in <quote>USB CDROM</"
+"quote> bei einigen BIOS-Versionen helfen, die von einem USB-Stick im "
+"<quote>USB harddisk</quote>-Modus nicht booten würden.</phrase> Sie müssen "
+"eventuell Ihre BIOS-Konfiguration noch anpassen, um <quote>USB legacy "
+"support</quote> zu aktivieren."
#. Tag: para
#: preparing.xml:1200
@@ -2680,11 +2665,6 @@ msgstr ""
#. Tag: para
#: preparing.xml:1651
#, no-c-format
-#| msgid ""
-#| "The installation server needs to copy the exact directory structure from "
-#| "any &debian-gnu; mirror, but only the S/390 and architecture-independent "
-#| "files are required. You can also copy the contents of all installation "
-#| "CDs into such a directory tree."
msgid ""
"The installation server needs to copy the exact directory structure from any "
"&debian-gnu; mirror, but only the S/390 and architecture-independent files "
diff --git a/po/de/preseed.po b/po/de/preseed.po
index c9001d6cc..99453442e 100644
--- a/po/de/preseed.po
+++ b/po/de/preseed.po
@@ -141,7 +141,6 @@ msgstr "network"
#. Tag: entry
#: preseed.xml:76
#, no-c-format
-#| msgid "CD/DVD"
msgid "CD/DVD/USB"
msgstr "CD/DVD/USB"
@@ -197,16 +196,6 @@ msgstr "generisch"
#. Tag: para
#: preseed.xml:107
#, no-c-format
-#| msgid ""
-#| "An important difference between the preseeding methods is the point at "
-#| "which the preconfiguration file is loaded and processed. For initrd "
-#| "preseeding this is right at the start of the installation, before the "
-#| "first question is even asked. Preseeding from the kernel command line "
-#| "happens just after. It is thus possible to override configuration set in "
-#| "the initrd by editing the kernel command line (either in the bootloader "
-#| "configuration or manually at boot time for bootloaders that allow it). "
-#| "For file preseeding this is after the CD or CD image has been loaded. For "
-#| "network preseeding it is only after the network has been configured."
msgid ""
"An important difference between the preseeding methods is the point at which "
"the preconfiguration file is loaded and processed. For initrd preseeding "
@@ -226,9 +215,8 @@ msgstr ""
"initrd festgesetzte Konfiguration über die Kernel-Befehlszeile wieder zu "
"überschreiben (entweder über die Konfiguration des Bootloaders oder händisch "
"beim Booten, falls der Bootloader dies erlaubt). Beim Voreinstellen über "
-"eine Voreinstellungsdatei (file) wird sie geladen, nachdem das"
-" Installations-Image "
-"geladen wurde. Beim Voreinstellen per Netzwerk kann die Datei erst "
+"eine Voreinstellungsdatei (file) wird sie geladen, nachdem das Installations-"
+"Image geladen wurde. Beim Voreinstellen per Netzwerk kann die Datei erst "
"geladen werden, nachdem das Netzwerk konfiguriert wurde."
#. Tag: para
@@ -299,15 +287,6 @@ msgstr "Voreinstellung nutzen"
#. Tag: para
#: preseed.xml:218
#, no-c-format
-#| msgid ""
-#| "You will first need to create a preconfiguration file and place it in the "
-#| "location from where you want to use it. Creating the preconfiguration "
-#| "file is covered later in this appendix. Putting it in the correct "
-#| "location is fairly straightforward for network preseeding or if you want "
-#| "to read the file off a usb-stick. If you want to include the file on a CD "
-#| "or DVD, you will have to remaster the ISO image. How to get the "
-#| "preconfiguration file included in the initrd is outside the scope of this "
-#| "document; please consult the developers' documentation for &d-i;."
msgid ""
"You will first need to create a preconfiguration file and place it in the "
"location from where you want to use it. Creating the preconfiguration file "
@@ -322,9 +301,8 @@ msgstr ""
"ablegen, wo Sie sie benutzen wollen. Die Erstellung der Datei wird später in "
"diesem Kapitel behandelt. Sie am richtigen Ort zu platzieren, ist recht "
"unkompliziert, wenn Sie die Voreinstellung per Netzwerk oder USB-Stick "
-"nutzen möchten. Falls Sie aber die Datei in einem Installations-Image"
-" integrieren "
-"möchten, müssen Sie das ISO-Image remastern (neu erstellen). Und "
+"nutzen möchten. Falls Sie aber die Datei in einem Installations-Image "
+"integrieren möchten, müssen Sie das ISO-Image remastern (neu erstellen). Und "
"schließlich: wie Sie die Voreinstellungsdatei in die initrd integrieren "
"können, ist nicht Thema dieses Dokuments; konsultieren Sie die "
"Entwicklerdokumentation des &d-i;."
@@ -426,24 +404,6 @@ msgstr ""
#. Tag: screen
#: preseed.xml:277
#, no-c-format
-#| msgid ""
-#| "Boot parameters to specify:\n"
-#| "- if you're netbooting:\n"
-#| " preseed/url=http://host/path/to/preseed.cfg\n"
-#| " preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
-#| "- or\n"
-#| " preseed/url=tftp://host/path/to/preseed.cfg\n"
-#| " preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
-#| "\n"
-#| "- if you're booting a remastered CD:\n"
-#| " preseed/file=/cdrom/preseed.cfg\n"
-#| " preseed/file/checksum=5da499872becccfeda2c4872f9171c3d\n"
-#| "\n"
-#| "- if you're installing from USB media (put the preconfiguration file in "
-#| "the\n"
-#| " toplevel directory of the USB stick):\n"
-#| " preseed/file=/hd-media/preseed.cfg\n"
-#| " preseed/file/checksum=5da499872becccfeda2c4872f9171c3d"
msgid ""
"Boot parameters to specify:\n"
"- if you're netbooting:\n"
@@ -1678,12 +1638,6 @@ msgstr "Netzwerkkonfiguration"
#. Tag: para
#: preseed.xml:787
#, no-c-format
-#| msgid ""
-#| "Of course, preseeding the network configuration won't work if you're "
-#| "loading your preconfiguration file from the network. But it's great when "
-#| "you're booting from CD or USB stick. If you are loading preconfiguration "
-#| "files from the network, you can pass network config parameters by using "
-#| "kernel boot parameters."
msgid ""
"Of course, preseeding the network configuration won't work if you're loading "
"your preconfiguration file from the network. But it's great when you're "
@@ -1693,9 +1647,8 @@ msgid ""
msgstr ""
"Die Voreinstellung der Netzwerkkonfiguration funktioniert natürlich nicht, "
"wenn Sie Ihre Voreinstellungsdatei vom Netzwerk laden, aber es ist toll, "
-"wenn Sie von einem optischen Datenträger oder USB-Stick booten. Sie können"
-" jedoch auch "
-"Netzwerkkonfigurations-Parameter automatisieren, wenn Sie die "
+"wenn Sie von einem optischen Datenträger oder USB-Stick booten. Sie können "
+"jedoch auch Netzwerkkonfigurations-Parameter automatisieren, wenn Sie die "
"Voreinstellungsdatei per Netzwerk laden, und zwar per Kernel-Parameter."
#. Tag: para
@@ -2938,22 +2891,6 @@ msgstr ""
#. Tag: screen
#: preseed.xml:1114
#, no-c-format
-#| msgid ""
-#| "#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
-#| "\n"
-#| "# Individual additional packages to install\n"
-#| "#d-i pkgsel/include string openssh-server build-essential\n"
-#| "# Whether to upgrade packages after debootstrap.\n"
-#| "# Allowed values: none, safe-upgrade, full-upgrade\n"
-#| "#d-i pkgsel/upgrade select none\n"
-#| "\n"
-#| "# Some versions of the installer can report back on what software you "
-#| "have\n"
-#| "# installed, and what software you use. The default is not to report "
-#| "back,\n"
-#| "# but sending reports helps the project determine what software is most\n"
-#| "# popular and include it on CDs.\n"
-#| "#popularity-contest popularity-contest/participate boolean false"
msgid ""
"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
"\n"
diff --git a/po/de/random-bits.po b/po/de/random-bits.po
index 87002dad4..2f7d7351a 100644
--- a/po/de/random-bits.po
+++ b/po/de/random-bits.po
@@ -381,11 +381,6 @@ msgstr ""
#. Tag: para
#: random-bits.xml:188
#, no-c-format
-#| msgid ""
-#| "By default the installer will install the GNOME desktop environment, but "
-#| "alternative desktop environments can be selected either by using one of "
-#| "the special CD images, or by specifying the desired desktop environment "
-#| "when the installer is booted (see <xref linkend=\"pkgsel\"/>)."
msgid ""
"By default the installer will install the GNOME desktop environment, but "
"alternative desktop environments can be selected either by using one of the "
@@ -394,10 +389,9 @@ msgid ""
msgstr ""
"Standardmäßig wird der Installer die GNOME-Arbeitsplatzumgebung "
"installieren, aber es können auch alternative Umgebungen ausgewählt werden: "
-"entweder durch Verwendung eines der speziellen Installations-Images oder"
-" indem "
-"während der Installation die gewünschte "
-"Arbeitsplatzumgebung festgelegt wird (siehe <xref linkend=\"pkgsel\"/>)."
+"entweder durch Verwendung eines der speziellen Installations-Images oder "
+"indem während der Installation die gewünschte Arbeitsplatzumgebung "
+"festgelegt wird (siehe <xref linkend=\"pkgsel\"/>)."
#. Tag: para
#: random-bits.xml:195
@@ -944,18 +938,14 @@ msgstr ""
#. Tag: para
#: random-bits.xml:444
#, no-c-format
-#| msgid ""
-#| "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
-#| "filename>, you could substitute a file URL instead of the http URL: "
-#| "<userinput>file:/cdrom/debian/</userinput>"
msgid ""
"If you have a &releasename; &debian-gnu; installation image mounted at "
"<filename>/cdrom</filename>, you could substitute a file URL instead of the "
"http URL: <userinput>file:/cdrom/debian/</userinput>"
msgstr ""
-"Wenn Sie ein &debian-gnu; &releasename-cap; Installations-Image in <filename>/"
-"cdrom</filename> eingebunden haben, können Sie statt der http-URL auch eine "
-"file-URL angeben: <userinput>file:/cdrom/debian/</userinput>."
+"Wenn Sie ein &debian-gnu; &releasename-cap; Installations-Image in "
+"<filename>/cdrom</filename> eingebunden haben, können Sie statt der http-URL "
+"auch eine file-URL angeben: <userinput>file:/cdrom/debian/</userinput>."
#. Tag: para
#: random-bits.xml:450
@@ -2011,7 +2001,6 @@ msgstr ""
#. Tag: guimenuitem
#: random-bits.xml:930
#, no-c-format
-#| msgid "Load installer components from CD"
msgid "Load installer components from installation media"
msgstr "Installer-Komponenten vom Installationsmedium laden"
diff --git a/po/de/welcome.po b/po/de/welcome.po
index 3c554fd5c..48e94ee03 100644
--- a/po/de/welcome.po
+++ b/po/de/welcome.po
@@ -710,12 +710,6 @@ msgstr "Woher bekomme ich &debian;?"
#. Tag: para
#: welcome.xml:424
#, no-c-format
-#| msgid ""
-#| "For information on how to download &debian-gnu; from the Internet or from "
-#| "whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
-#| "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-#| "debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
-#| "official &debian; mirrors, so you can easily find the nearest one."
msgid ""
"For information on how to download &debian-gnu; from the Internet or from "
"whom official &debian; installation media can be purchased, see the <ulink "
@@ -724,11 +718,11 @@ msgid ""
"set of official &debian; mirrors, so you can easily find the nearest one."
msgstr ""
"Wie Sie &debian-gnu; aus dem Internet herunterladen oder wo Sie offizielle "
-"&debian; Installationsmedien kaufen können, lesen Sie auf der Webseite <ulink"
-" url=\"&url-"
-"debian-distrib;\">\"Debian besorgen\"</ulink>. Anhand der vollständigen "
-"<ulink url=\"&url-debian-mirrors;\">Liste von Debian-Spiegel-Servern</ulink> "
-"können Sie leicht den Server finden, der Ihrem Standort am nächsten ist."
+"&debian; Installationsmedien kaufen können, lesen Sie auf der Webseite "
+"<ulink url=\"&url-debian-distrib;\">\"Debian besorgen\"</ulink>. Anhand der "
+"vollständigen <ulink url=\"&url-debian-mirrors;\">Liste von Debian-Spiegel-"
+"Servern</ulink> können Sie leicht den Server finden, der Ihrem Standort am "
+"nächsten ist."
#. Tag: para
#: welcome.xml:433
@@ -866,15 +860,6 @@ msgstr ""
#. Tag: para
#: welcome.xml:519
#, no-c-format
-#| msgid ""
-#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
-#| ">. This involves choosing your language, configuring peripheral driver "
-#| "modules, configuring your network connection, so that remaining "
-#| "installation files can be obtained directly from a &debian; server (if "
-#| "you are not installing from a CD/DVD set), partitioning your hard drives "
-#| "and installation of a base system, then selection and installation of "
-#| "tasks. (Some background about setting up the partitions for your &debian; "
-#| "system is explained in <xref linkend=\"partitioning\"/>.)"
msgid ""
"Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
"This involves choosing your language, configuring peripheral driver modules, "
@@ -889,12 +874,11 @@ msgstr ""
">. Das beinhaltet die Auswahl Ihrer Sprache, die Konfiguration von "
"Treibermodulen für die Peripherie, die Konfiguration der Netzwerkverbindung "
"(so dass noch benötigte Installationsdateien von einem &debian;-Server "
-"heruntergeladen werden können, sofern Sie nicht von CD/DVD-Images"
-" installieren), "
-"die Partitionierung der Festplatten und die Installation eines Basissystems. "
-"(Einige Hintergrundinformationen über das Einrichten der Partitionen für Ihr "
-"&debian;-System werden in <xref linkend=\"partitioning\"/> gegeben.) Danach "
-"die Auswahl und Installation von Programmgruppen."
+"heruntergeladen werden können, sofern Sie nicht von CD/DVD-Images "
+"installieren), die Partitionierung der Festplatten und die Installation "
+"eines Basissystems. (Einige Hintergrundinformationen über das Einrichten der "
+"Partitionen für Ihr &debian;-System werden in <xref linkend=\"partitioning\"/"
+"> gegeben.) Danach die Auswahl und Installation von Programmgruppen."
#. Tag: para
#: welcome.xml:532
@@ -1002,14 +986,6 @@ msgstr ""
#. Tag: para
#: welcome.xml:601
#, no-c-format
-#| msgid ""
-#| "Calling software <emphasis>free</emphasis> doesn't mean that the software "
-#| "isn't copyrighted, and it doesn't mean that CDs/DVDs containing that "
-#| "software must be distributed at no charge. Free software, in part, means "
-#| "that the licenses of individual programs do not require you to pay for "
-#| "the privilege of distributing or using those programs. Free software also "
-#| "means that not only may anyone extend, adapt, and modify the software, "
-#| "but that they may distribute the results of their work as well."
msgid ""
"Calling software <emphasis>free</emphasis> doesn't mean that the software "
"isn't copyrighted, and it doesn't mean that installation media containing "
@@ -1021,12 +997,12 @@ msgid ""
msgstr ""
"Software <emphasis>frei</emphasis> zu nennen heißt nicht, dass die Software "
"nicht urheberrechtlich geschützt ist, und es heißt auch nicht, dass die "
-"Installationsmedien, die diese Software enthalten, gratis verbreitet werden"
-" müssen. Freie "
-"Software heißt einmal, dass für die Verbreitung oder Verwendung dieser "
-"Programme der Lizenz nach nichts bezahlt werden muss. Freie Software "
-"bedeutet ebenfalls, dass jeder die Software erweitern, adaptieren und "
-"verändern sowie auch die Ergebnisse seiner Arbeit verbreiten darf."
+"Installationsmedien, die diese Software enthalten, gratis verbreitet werden "
+"müssen. Freie Software heißt einmal, dass für die Verbreitung oder "
+"Verwendung dieser Programme der Lizenz nach nichts bezahlt werden muss. "
+"Freie Software bedeutet ebenfalls, dass jeder die Software erweitern, "
+"adaptieren und verändern sowie auch die Ergebnisse seiner Arbeit verbreiten "
+"darf."
#. Tag: para
#: welcome.xml:612
diff --git a/po/it/boot-installer.po b/po/it/boot-installer.po
index 9438b6e12..aedeee602 100644
--- a/po/it/boot-installer.po
+++ b/po/it/boot-installer.po
@@ -873,10 +873,10 @@ msgid ""
"next chapter."
msgstr ""
"Se già si dispone di un set di dischi ottici e se la propria macchina "
-"supporta l'avvio da questi, fantastico! Si può semplicemente <phrase "
-"arch=\"x86\"> configurare il sistema affinché avvii da un disco ottico "
-"come descritto in <xref linkend=\"boot-dev-select-x86\"/>, </phrase> "
-"inserire il disco, riavviare e procedere con il prossimo capitolo."
+"supporta l'avvio da questi, fantastico! Si può semplicemente <phrase arch="
+"\"x86\"> configurare il sistema affinché avvii da un disco ottico come "
+"descritto in <xref linkend=\"boot-dev-select-x86\"/>, </phrase> inserire il "
+"disco, riavviare e procedere con il prossimo capitolo."
#. Tag: para
#: boot-installer.xml:589 boot-installer.xml:1045 boot-installer.xml:1988
@@ -1556,15 +1556,14 @@ msgid ""
"still be used from the boot prompt which is shown after selecting the "
"<quote>Help</quote> option in the boot menu."
msgstr ""
-"L'Installatore grafico è disponibile in tutte le immagini di CD/DVD e con "
-"il metodo d'installazione da disco fisso. Per avviare l'installatore "
-"grafico è sufficiente scegliere la voce corrispondente nel menu di avvio. "
-"Le modalità esperto e di ripristino dell'installatore grafico si trovano "
-"nel menu <quote>Opzioni avanzate</quote>. È comunque ancora possibile usare "
-"i vecchi metodi di avvio <userinput>installgui</userinput>, "
-"<userinput>expertgui</userinput> e <userinput>rescuegui</userinput> dal "
-"prompt di avvio che appare dopo aver selezionato <quote>Aiuto</quote> nel "
-"menu di avvio."
+"L'Installatore grafico è disponibile in tutte le immagini di CD/DVD e con il "
+"metodo d'installazione da disco fisso. Per avviare l'installatore grafico è "
+"sufficiente scegliere la voce corrispondente nel menu di avvio. Le modalità "
+"esperto e di ripristino dell'installatore grafico si trovano nel menu "
+"<quote>Opzioni avanzate</quote>. È comunque ancora possibile usare i vecchi "
+"metodi di avvio <userinput>installgui</userinput>, <userinput>expertgui</"
+"userinput> e <userinput>rescuegui</userinput> dal prompt di avvio che appare "
+"dopo aver selezionato <quote>Aiuto</quote> nel menu di avvio."
#. Tag: para
#: boot-installer.xml:975
@@ -3631,7 +3630,8 @@ msgstr ""
"e in alcuni casi può essere addirittura inopportuna, per esempio quando il "
"lettore non è in grado di richiudere il carrello da solo e l'utente non può "
"farlo manualmente perché non è fisicamente presente. Molti dei lettori "
-"sottili con caricatore a slot non possono ricaricare automaticamente il supporto."
+"sottili con caricatore a slot non possono ricaricare automaticamente il "
+"supporto."
#. Tag: para
#: boot-installer.xml:2658
@@ -4112,8 +4112,8 @@ msgid ""
"If you cannot get the installation working from optical disc, try one of the "
"other installation methods that are available."
msgstr ""
-"Se non si riesce ad avviare l'installazione dal disco ottico, provare con uno "
-"degli altri metodi d'installazione disponibili."
+"Se non si riesce ad avviare l'installazione dal disco ottico, provare con "
+"uno degli altri metodi d'installazione disponibili."
#. Tag: title
#: boot-installer.xml:2945
@@ -4190,9 +4190,9 @@ msgstr ""
"a20391b12f7ff22ef705cee4059c6b92 <replaceable>debian-testing-i386-netinst."
"iso</replaceable>\n"
"</screen></informalexample> Successivamente, verificare anche la checksum "
-"MD5 del disco masterizzato. Il comando seguente dovrebbe funzionare, "
-"facendo uso della dimensione dell'immagine per leggere il numero corretto di "
-"byte dal disco."
+"MD5 del disco masterizzato. Il comando seguente dovrebbe funzionare, facendo "
+"uso della dimensione dell'immagine per leggere il numero corretto di byte "
+"dal disco."
#. Tag: screen
#: boot-installer.xml:3002
@@ -4233,10 +4233,10 @@ msgstr ""
"riconosciuto, può essere utile provare più volte. Se si dispone di più "
"lettori ottici provare a mettere il disco in un altro lettore. Se non "
"funziona oppure se il disco è riconosciuto ma si verificano degli errori in "
-"lettura provare quanto suggerito in seguito. Per seguire questi "
-"suggerimenti è necessaria una conoscenza minima di &arch-kernel;. Prima di "
-"eseguire qualsiasi comando passare alla seconda console virtuale (VT2) e "
-"attivare una shell."
+"lettura provare quanto suggerito in seguito. Per seguire questi suggerimenti "
+"è necessaria una conoscenza minima di &arch-kernel;. Prima di eseguire "
+"qualsiasi comando passare alla seconda console virtuale (VT2) e attivare una "
+"shell."
#. Tag: para
#: boot-installer.xml:3019
@@ -4306,8 +4306,8 @@ msgid ""
"</screen></informalexample> Check if there are any error messages after that "
"command."
msgstr ""
-"Usare il comando <command>mount</command> per verificare che il disco "
-"ottico sia già stato montato; altrimenti provare a montarlo manualmente: "
+"Usare il comando <command>mount</command> per verificare che il disco ottico "
+"sia già stato montato; altrimenti provare a montarlo manualmente: "
"<informalexample><screen>\n"
"$ mount /dev/<replaceable>hdc</replaceable> /cdrom\n"
"</screen></informalexample> Controllare se si verificano degli errori dopo "
diff --git a/po/it/install-methods.po b/po/it/install-methods.po
index f2d05ac85..a18710fab 100644
--- a/po/it/install-methods.po
+++ b/po/it/install-methods.po
@@ -50,19 +50,19 @@ msgid ""
msgstr ""
"Da sempre il modo più semplice per installare &debian-gnu; è usare un set "
"ufficiale &debian; di immagini per l'installazione. Si può comprare un set "
-"da uno dei rivenditori (consultare la <ulink url=\"&url-debian-cd-"
-"vendors;\">pagina dei rivenditori di CD</ulink>). Se si dispone di una "
-"connessione veloce alla rete e di un masterizzatore È possibile anche "
-"scaricare le immagini di CD/DVD da uno dei mirror &debian; e creare il "
-"proprio set (consultare le istruzioni nella <ulink url=\"&url-debian-"
-"cd;\">pagina dei CD Debian</ulink> e le <ulink url=\"&url-debian-cd-"
-"faq;\">Debian CD FAQ</ulink>). Se si possiede un set di CD/DVD &debian; e "
-"se è possibile avviare la propria macchina da CD/DVD<phrase arch=\"x86\">, "
-"di sicuro sui PC moderni</phrase>, si può passare direttamente a <xref "
-"linkend=\"boot-installer\"/>; è stato fatto un lavoro molto accurato per "
-"assicurare che i file necessari alla maggioranza degli utenti si trovino "
-"sui primi CD e DVD, quindi l'installazione di un ambiente desktop di base "
-"può essere fatta con solo il primo DVD oppure persino solo con il primo CD."
+"da uno dei rivenditori (consultare la <ulink url=\"&url-debian-cd-vendors;"
+"\">pagina dei rivenditori di CD</ulink>). Se si dispone di una connessione "
+"veloce alla rete e di un masterizzatore È possibile anche scaricare le "
+"immagini di CD/DVD da uno dei mirror &debian; e creare il proprio set "
+"(consultare le istruzioni nella <ulink url=\"&url-debian-cd;\">pagina dei CD "
+"Debian</ulink> e le <ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</"
+"ulink>). Se si possiede un set di CD/DVD &debian; e se è possibile avviare "
+"la propria macchina da CD/DVD<phrase arch=\"x86\">, di sicuro sui PC "
+"moderni</phrase>, si può passare direttamente a <xref linkend=\"boot-"
+"installer\"/>; è stato fatto un lavoro molto accurato per assicurare che i "
+"file necessari alla maggioranza degli utenti si trovino sui primi CD e DVD, "
+"quindi l'installazione di un ambiente desktop di base può essere fatta con "
+"solo il primo DVD oppure persino solo con il primo CD."
#. Tag: para
#: install-methods.xml:30
@@ -96,8 +96,8 @@ msgstr ""
"pacchetti in seguito quando il nuovo sistema sarà attivo (una volta "
"completata l'installazione). Chi ha bisogno di conoscere su quale immagine "
"per l'installazione può trovare uno specifico pacchetto può visitare <ulink "
-"url=\"https://cdimage-search.debian.org/\">https://cdimage-"
-"search.debian.org/</ulink>."
+"url=\"https://cdimage-search.debian.org/\">https://cdimage-search.debian.org/"
+"</ulink>."
#. Tag: para
#: install-methods.xml:46
@@ -122,8 +122,8 @@ msgstr ""
"arch=\"s390\">VM-reader,</phrase> <phrase condition=\"bootable-disk\">disco "
"fisso,</phrase> <phrase condition=\"bootable-usb\">chiavetta USB,</phrase> "
"<phrase condition=\"supports-tftp\">avvio da rete,</phrase> oppure caricare "
-"manualmente il kernel dal disco per avviare il sistema di installazione. "
-"Sul disco ci sono anche i file necessari per l'avvio da altri supporti. La "
+"manualmente il kernel dal disco per avviare il sistema di installazione. Sul "
+"disco ci sono anche i file necessari per l'avvio da altri supporti. La "
"struttura dell'archivio &debian; in rete e quella delle cartelle sul disco "
"sono identiche, quindi i percorsi a specifici file necessari per l'avvio "
"forniti di seguito sono cercati all'interno della stessa directory o "
@@ -153,9 +153,9 @@ msgstr ""
"Se non si possiede un set di supporti per l'installazione allora è "
"necessario scaricare i file dell'installatore e copiarli su <phrase arch="
"\"s390\">minidisco per VM,</phrase> <phrase condition=\"bootable-disk\">un "
-"disco fisso,</phrase> <phrase condition=\"bootable-usb\">una chiavetta "
-"USB,</phrase> <phrase condition=\"supports-tftp\">un computer in rete,</"
-"phrase> in modo da essere usati per avviare l'installatore."
+"disco fisso,</phrase> <phrase condition=\"bootable-usb\">una chiavetta USB,</"
+"phrase> <phrase condition=\"supports-tftp\">un computer in rete,</phrase> in "
+"modo da essere usati per avviare l'installatore."
#. Tag: title
#: install-methods.xml:96
diff --git a/po/it/installation-howto.po b/po/it/installation-howto.po
index 08c612055..91de21572 100644
--- a/po/it/installation-howto.po
+++ b/po/it/installation-howto.po
@@ -85,10 +85,10 @@ msgstr ""
"<phrase condition=\"unofficial-build\"> Per alcuni veloci collegamenti alle "
"immagini per l'installazione, vedere la <ulink url=\"&url-d-i;\">pagina del "
"&d-i;</ulink>. </phrase> Il team debian-cd si occupa della creazione delle "
-"immagini per l'installazione con &d-i; e le distribuisce sulla pagina "
-"<ulink url=\"&url-debian-cd;\">Debian CD/DVD</ulink>. Per ulteriori "
-"informazioni su dove procurarsi le immagini per l'installazione consultare "
-"<xref linkend=\"official-cdrom\"/>."
+"immagini per l'installazione con &d-i; e le distribuisce sulla pagina <ulink "
+"url=\"&url-debian-cd;\">Debian CD/DVD</ulink>. Per ulteriori informazioni su "
+"dove procurarsi le immagini per l'installazione consultare <xref linkend="
+"\"official-cdrom\"/>."
#. Tag: para
#: installation-howto.xml:47
@@ -102,8 +102,8 @@ msgstr ""
"Alcuni metodi d'installazione richiedono altre immagini oltre a quelle dei "
"supporti ottici. <phrase condition=\"unofficial-build\"> Nella <ulink url="
"\"&url-d-i;\">pagina del &d-i;</ulink> ci sono i collegamenti anche per "
-"altre immagini. </phrase> In <xref linkend=\"where-files\"/> è spiegato "
-"come trovare le immagini sui mirror &debian;."
+"altre immagini. </phrase> In <xref linkend=\"where-files\"/> è spiegato come "
+"trovare le immagini sui mirror &debian;."
#. Tag: para
#: installation-howto.xml:57
@@ -134,8 +134,8 @@ msgid ""
"need the network to install. You only need the first image of such set."
msgstr ""
"L'immagine di CD per l'installazione da rete (netinst) può essere usata per "
-"installare &releasename; con il &d-i;. Questo metodo d'installazione è "
-"stato creato per fare l'avvio dall'immagine per poi installare i pacchetti "
+"installare &releasename; con il &d-i;. Questo metodo d'installazione è stato "
+"creato per fare l'avvio dall'immagine per poi installare i pacchetti "
"aggiuntivi dalla rete, da qui il nome <quote>installazione da rete</quote>. "
"L'immagine contiene le componenti software necessarie per eseguire "
"l'installatore e i pacchetti di base per creare un sistema &releasename; "
@@ -155,12 +155,12 @@ msgid ""
"boot from CD. </phrase>"
msgstr ""
"Scaricare il tipo che si preferisce e masterizzare l'immagine su un disco "
-"ottico. <phrase arch=\"any-x86\"> Per fare l'avvio dal disco potrebbe "
-"essere necessario modificare la configurazione del BIOS del proprio "
-"computer come spiegato in <xref linkend=\"bios-setup\"/>. </phrase> <phrase "
-"arch=\"powerpc\"> Per fare l'avvio da CD con un PowerMac premere il tasto "
-"<keycap>c</keycap> durante l'avvio, in <xref linkend=\"boot-cd\"/> sono "
-"descritti altri metodi per fare l'avvio da CD. </phrase>"
+"ottico. <phrase arch=\"any-x86\"> Per fare l'avvio dal disco potrebbe essere "
+"necessario modificare la configurazione del BIOS del proprio computer come "
+"spiegato in <xref linkend=\"bios-setup\"/>. </phrase> <phrase arch=\"powerpc"
+"\"> Per fare l'avvio da CD con un PowerMac premere il tasto <keycap>c</"
+"keycap> durante l'avvio, in <xref linkend=\"boot-cd\"/> sono descritti altri "
+"metodi per fare l'avvio da CD. </phrase>"
#. Tag: title
#: installation-howto.xml:91
@@ -324,8 +324,8 @@ msgstr ""
"vmlinuz</filename> e una immagine dei CD/DVD &debian; nella directory "
"principale del disco fisso, assicurarsi che il nome del file con l'immagine "
"abbia estensione <literal>.iso</literal>. Adesso si deve solamente avviare "
-"Linux con initrd. <phrase arch=\"x86\"> In <xref linkend=\"boot-initrd\"/> "
-"è spiegato come farlo. </phrase>"
+"Linux con initrd. <phrase arch=\"x86\"> In <xref linkend=\"boot-initrd\"/> è "
+"spiegato come farlo. </phrase>"
#. Tag: title
#: installation-howto.xml:179
diff --git a/po/it/preparing.po b/po/it/preparing.po
index e809b1c95..fe229202e 100644
--- a/po/it/preparing.po
+++ b/po/it/preparing.po
@@ -1845,10 +1845,10 @@ msgstr ""
"<quote>USB CDROM</quote>. <phrase condition=\"isohybrid-supported\"> In "
"particolare, chi usa un'immagine per l'installazione iso-ibride su una "
"chiavetta USB (vedere <xref linkend=\"usb-copy-isohybrid\"/>), la modifica "
-"del tipo di dispositivo in <quote>USB CDROM</quote> aiuta su alcuni BIOS "
-"che non avviano da una chiavetta USB in modalità disco USB.</phrase> "
-"Potrebbe essere necessario configurare il BIOS per attivare il <quote>USB "
-"legacy support</quote>."
+"del tipo di dispositivo in <quote>USB CDROM</quote> aiuta su alcuni BIOS che "
+"non avviano da una chiavetta USB in modalità disco USB.</phrase> Potrebbe "
+"essere necessario configurare il BIOS per attivare il <quote>USB legacy "
+"support</quote>."
#. Tag: para
#: preparing.xml:1200
diff --git a/po/it/preseed.po b/po/it/preseed.po
index ff9ffb7e6..d3eb5a6c9 100644
--- a/po/it/preseed.po
+++ b/po/it/preseed.po
@@ -216,8 +216,8 @@ msgstr ""
"modificando la riga di comando del kernel (nella configurazione del "
"bootloader oppure manualmente al momento dell'avvio se il bootloader lo "
"permette). Con la preconfigurazione tramite file avviene dopo che è stata "
-"caricata l'immagine per l'installazione. Infine la preconfigurazione da "
-"rete ha effetti solo dopo la configurazione della rete."
+"caricata l'immagine per l'installazione. Infine la preconfigurazione da rete "
+"ha effetti solo dopo la configurazione della rete."
#. Tag: para
#: preseed.xml:119
@@ -1639,8 +1639,8 @@ msgstr ""
"funzionare se si sta caricando il file di preconfigurazione dalla rete! "
"Invece funziona se si sta avviando da disco ottico o da chiavetta USB. È "
"anche possibile passare i parametri di configurazione della rete sui "
-"parametri del kernel, se si stanno caricando file di preconfigurazione "
-"dalla rete."
+"parametri del kernel, se si stanno caricando file di preconfigurazione dalla "
+"rete."
#. Tag: para
#: preseed.xml:795
diff --git a/po/it/using-d-i.po b/po/it/using-d-i.po
index 4598440c8..b72bbfbc8 100644
--- a/po/it/using-d-i.po
+++ b/po/it/using-d-i.po
@@ -519,8 +519,7 @@ msgid ""
"herself that the installation image was not corrupted."
msgstr ""
"Verifica l'integrità di un supporto per l'installazione. In questo modo "
-"l'utente può assicurarsi che l'immagine per l'installazione non sia "
-"corrotto."
+"l'utente può assicurarsi che l'immagine per l'installazione non sia corrotto."
#. Tag: term
#: using-d-i.xml:273
@@ -3899,9 +3898,8 @@ msgstr ""
"si sta tentando di installare. </para> </footnote>. Si possono usare anche "
"altre interfacce per la gestione dei pacchetti come <command>aptitude</"
"command> e <command>synaptic</command>. Queste interfacce sono quelle "
-"consigliate ai nuovi utenti poiché integrano alcune caratteristiche "
-"(ricerca dei pacchetti e verifica dello stato) in un'interfaccia utente "
-"gradevole."
+"consigliate ai nuovi utenti poiché integrano alcune caratteristiche (ricerca "
+"dei pacchetti e verifica dello stato) in un'interfaccia utente gradevole."
#. Tag: para
#: using-d-i.xml:2314
@@ -3968,10 +3966,10 @@ msgid ""
"the installer can use the packages included on them."
msgstr ""
"Si si installa da una immagine di CD o un DVD che fa parte di un set, "
-"l'installatore richiede se si vuole eseguire l'analisi di altri supporti "
-"per l'installazione. Se si dispone di altri supporti, è consigliabile "
-"effettuare l'analisi per permettere all'installatore di usare anche i "
-"pacchetti su questi supporti."
+"l'installatore richiede se si vuole eseguire l'analisi di altri supporti per "
+"l'installazione. Se si dispone di altri supporti, è consigliabile effettuare "
+"l'analisi per permettere all'installatore di usare anche i pacchetti su "
+"questi supporti."
#. Tag: para
#: using-d-i.xml:2350
@@ -3997,8 +3995,8 @@ msgid ""
"last images of a set."
msgstr ""
"I pacchetti sono inseriti nelle immagini dei CD e DVD in base alla loro "
-"popolarità. Questo vuol dire che la maggior parte degli utenti usano solo "
-"la prima immagine di un set e che solo pochissime persone usano i pacchetti "
+"popolarità. Questo vuol dire che la maggior parte degli utenti usano solo la "
+"prima immagine di un set e che solo pochissime persone usano i pacchetti "
"presenti nell'ultima immagine del set."
#. Tag: para
@@ -4065,10 +4063,10 @@ msgid ""
"is best <emphasis>not</emphasis> to select the <literal>desktop</literal> "
"task in the next step of the installation."
msgstr ""
-"Se per l'installazione <emphasis>non</emphasis> si utilizza l'immagine di "
-"un CD/DVD completa, si raccomanda di usare un mirror di rete altrimenti si "
-"conclude l'installazione con un sistema minimale. Tuttavia, se si dispone "
-"di una connessione a Internet limitata, è consigliabile <emphasis>non</"
+"Se per l'installazione <emphasis>non</emphasis> si utilizza l'immagine di un "
+"CD/DVD completa, si raccomanda di usare un mirror di rete altrimenti si "
+"conclude l'installazione con un sistema minimale. Tuttavia, se si dispone di "
+"una connessione a Internet limitata, è consigliabile <emphasis>non</"
"emphasis> scegliere il task <literal>desktop</literal> nella prossima fase "
"dell'installazione."
@@ -4117,9 +4115,9 @@ msgid ""
msgstr ""
"Un vantaggio dell'aggiunta di un mirror è che gli aggiornamenti, rilasciati "
"dopo la creazione del set di immagini dei CD/DVD e inclusi in uno dei "
-"rilasci minori, diventano disponibili per l'installazione, quindi si "
-"allunga la vita del proprio set di CD/DVD senza compromettere la sicurezza "
-"o la stabilità del sistema installato."
+"rilasci minori, diventano disponibili per l'installazione, quindi si allunga "
+"la vita del proprio set di CD/DVD senza compromettere la sicurezza o la "
+"stabilità del sistema installato."
#. Tag: para
#: using-d-i.xml:2429
@@ -4134,8 +4132,8 @@ msgstr ""
"In breve: la scelta di un mirror di rete è generalmente una buona idea, "
"tranne quando non si dispone di una buona connessione a Internet. Se la "
"versione attuale di un pacchetto è disponibile sul supporto per "
-"l'installazione, l'installatore usa sempre questo supporto. L'ammontare "
-"dei dati da scaricare quando si seleziona un mirror dipende da"
+"l'installazione, l'installatore usa sempre questo supporto. L'ammontare dei "
+"dati da scaricare quando si seleziona un mirror dipende da"
#. Tag: para
#: using-d-i.xml:2438
@@ -5778,17 +5776,17 @@ msgid ""
"medium. The recommended file system to use is FAT as that is most certain to "
"be supported during the early stages of the installation."
msgstr ""
-"Le immagini ufficiali per l'installazione non contengono il firmware "
-"non-free. Il metodo più comune per caricare il firmware non-free è da un "
+"Le immagini ufficiali per l'installazione non contengono il firmware non-"
+"free. Il metodo più comune per caricare il firmware non-free è da un "
"supporto removibile come una chiavetta USB. In alternativa è possibile "
"trovare in <ulink url=\"&url-firmware-cds;\"></ulink> le immagini dei "
"supporti per l'installazione non ufficiali contenenti il firmware non-free. "
"Per preparare una chiavetta USB (o un qualsiasi altro supporto come una "
"partizione del disco fisso) occorre copiare i file o i pacchetti con il "
-"firmware nella directory principale o in una directory con nome "
-"<filename>/firmware</filename> del filesystem sul supporto. Si raccomanda "
-"l'uso di un filesystem FAT dato che è quello supportato sino dalle prime "
-"fasi dell'installazione."
+"firmware nella directory principale o in una directory con nome <filename>/"
+"firmware</filename> del filesystem sul supporto. Si raccomanda l'uso di un "
+"filesystem FAT dato che è quello supportato sino dalle prime fasi "
+"dell'installazione."
#. Tag: para
#: using-d-i.xml:3500
diff --git a/po/it/welcome.po b/po/it/welcome.po
index 531393503..14ab20f99 100644
--- a/po/it/welcome.po
+++ b/po/it/welcome.po
@@ -700,9 +700,9 @@ msgid ""
"set of official &debian; mirrors, so you can easily find the nearest one."
msgstr ""
"Per informazioni su come scaricare &debian-gnu; da Internet o dove possono "
-"essere acquistati i supporti ufficiali &debian;, si guardi <ulink url="
-"\"&url-debian-distrib;\">la pagina web dei distributori</ulink>. La <ulink "
-"url=\"&url-debian-mirrors;\">lista dei mirror di &debian;</ulink> contiene "
+"essere acquistati i supporti ufficiali &debian;, si guardi <ulink url=\"&url-"
+"debian-distrib;\">la pagina web dei distributori</ulink>. La <ulink url="
+"\"&url-debian-mirrors;\">lista dei mirror di &debian;</ulink> contiene "
"l'insieme completo dei mirror ufficiali di &debian;, così è possibile "
"trovare facilmente quello più vicino."
diff --git a/po/pt/boot-installer.po b/po/pt/boot-installer.po
index 418ef5066..9670a1214 100644
--- a/po/pt/boot-installer.po
+++ b/po/pt/boot-installer.po
@@ -220,11 +220,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:116
#, no-c-format
-#| msgid ""
-#| "Prepare a standard arm64 CD image on a USB stick. Insert it in one of the "
-#| "USB ports on the back. Plug a serial cable into the upper 9-pin serial "
-#| "port on the back. If you need networking (netboot image) plug the "
-#| "ethernet cable into the socket on the front of the machine."
msgid ""
"Prepare a standard arm64 CD/DVD image on a USB stick. Insert it in one of "
"the USB ports on the back. Plug a serial cable into the upper 9-pin serial "
@@ -854,18 +849,12 @@ msgstr "Arrancar a partir de 'pen' USB"
#. Tag: title
#: boot-installer.xml:573
#, no-c-format
-#| msgid "Booting from a Hard Disk"
msgid "Booting from optical disc (CD/DVD)"
msgstr "Arrancar a partir de um disco óptico (CD/DVD)"
#. Tag: para
#: boot-installer.xml:579 boot-installer.xml:1035 boot-installer.xml:1978
#, no-c-format
-#| msgid ""
-#| "If you have a CD set, and if your machine supports booting directly off "
-#| "the CD, great! Simply <phrase arch=\"x86\"> configure your system for "
-#| "booting off a CD as described in <xref linkend=\"boot-dev-select-x86\"/>, "
-#| "</phrase> insert your CD, reboot, and proceed to the next chapter."
msgid ""
"If you have a set of optical discs, and your machine supports booting "
"directly off those, great! Simply <phrase arch=\"x86\"> configure your "
@@ -873,21 +862,15 @@ msgid ""
"dev-select-x86\"/>, </phrase> insert the disc, reboot, and proceed to the "
"next chapter."
msgstr ""
-"Se tiver um conjunto de discos ópticos e se a sua máquina suportar o arranque "
-"diretamente a partir deles, fantástico! Simplesmente <phrase arch=\"x86\"> "
-"configure o seu sistema para arrancar a partir de um disco óptico conforme "
-"é descrito na <xref linkend=\"boot-dev-select-x86\"/>, </phrase> insira o "
-"disco, reinicie, e proceda para o próximo capítulo."
+"Se tiver um conjunto de discos ópticos e se a sua máquina suportar o "
+"arranque diretamente a partir deles, fantástico! Simplesmente <phrase arch="
+"\"x86\"> configure o seu sistema para arrancar a partir de um disco óptico "
+"conforme é descrito na <xref linkend=\"boot-dev-select-x86\"/>, </phrase> "
+"insira o disco, reinicie, e proceda para o próximo capítulo."
#. Tag: para
#: boot-installer.xml:589 boot-installer.xml:1045 boot-installer.xml:1988
#, no-c-format
-#| msgid ""
-#| "Note that certain CD drives may require special drivers, and thus be "
-#| "inaccessible in the early installation stages. If it turns out the "
-#| "standard way of booting off a CD doesn't work for your hardware, revisit "
-#| "this chapter and read about alternate kernels and installation methods "
-#| "which may work for you."
msgid ""
"Note that certain optical drives may require special drivers, and thus be "
"inaccessible in the early installation stages. If it turns out the standard "
@@ -905,12 +888,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:597 boot-installer.xml:1053 boot-installer.xml:1996
#, no-c-format
-#| msgid ""
-#| "Even if you cannot boot from CD-ROM, you can probably install the "
-#| "&debian; system components and any packages you want from CD-ROM. Simply "
-#| "boot using a different medium and when it's time to install the operating "
-#| "system, base system, and any additional packages, point the installation "
-#| "system at the CD-ROM drive."
msgid ""
"Even if you cannot boot from optical disc, you can probably install the "
"&debian; system components and any packages you want from such disc. Simply "
@@ -918,12 +895,12 @@ msgid ""
"system, base system, and any additional packages, point the installation "
"system at the optical drive."
msgstr ""
-"Mesmo que não consiga arrancar a partir do disco óptico, provavelmente poderá "
-"instalar os componentes do sistema &debian; e quaisquer pacotes que deseje a "
-"partir desse disco. Simplesmente arranque utilizando um meio diferente e "
-"quando for altura de instalar o sistema operativo, sistema base, e quaisquer "
-"pacotes adicionais, aponte o sistema de instalação para o leitor do disco "
-"óptico."
+"Mesmo que não consiga arrancar a partir do disco óptico, provavelmente "
+"poderá instalar os componentes do sistema &debian; e quaisquer pacotes que "
+"deseje a partir desse disco. Simplesmente arranque utilizando um meio "
+"diferente e quando for altura de instalar o sistema operativo, sistema base, "
+"e quaisquer pacotes adicionais, aponte o sistema de instalação para o leitor "
+"do disco óptico."
#. Tag: para
#: boot-installer.xml:605 boot-installer.xml:1061 boot-installer.xml:2004
@@ -949,19 +926,14 @@ msgstr "A tentar iniciar o instalador a partir do Windows, você pode"
#. Tag: para
#: boot-installer.xml:621
#, no-c-format
-#| msgid ""
-#| "obtain CD-ROM/DVD-ROM<phrase condition=\"bootable-usb\"> or USB memory "
-#| "stick</phrase> installation media as described in <xref linkend="
-#| "\"official-cdrom\"/><phrase condition=\"bootable-usb\"> respective <xref "
-#| "linkend=\"boot-usb-files\"/></phrase> or"
msgid ""
"obtain installation media as described in <xref linkend=\"official-cdrom\"/"
"><phrase condition=\"bootable-usb\"> or <xref linkend=\"boot-usb-files\"/></"
"phrase> or"
msgstr ""
-"obtenha o meio de instalação conforme descrito em <xref "
-"linkend=\"official-cdrom\"/><phrase condition=\"bootable-usb\"> ou <xref "
-"linkend=\"boot-usb-files\"/></phrase> ou"
+"obtenha o meio de instalação conforme descrito em <xref linkend=\"official-"
+"cdrom\"/><phrase condition=\"bootable-usb\"> ou <xref linkend=\"boot-usb-"
+"files\"/></phrase> ou"
#. Tag: para
#: boot-installer.xml:628
@@ -971,19 +943,13 @@ msgid ""
"\"&win32-loader-exe;\">tools/win32-loader/stable/win32-loader.exe</ulink> on "
"the &debian; mirrors."
msgstr ""
-"descarregue o executável de Windows que está disponível nos mirrors "
-"&debian; como <ulink url=\"&win32-loader-exe;\">tools/win32-loader/stable/"
-"win32-loader.exe</ulink>."
+"descarregue o executável de Windows que está disponível nos mirrors &debian; "
+"como <ulink url=\"&win32-loader-exe;\">tools/win32-loader/stable/win32-"
+"loader.exe</ulink>."
#. Tag: para
#: boot-installer.xml:637
#, no-c-format
-#| msgid ""
-#| "If you use an installation CD or DVD, a pre-installation program should "
-#| "be launched automatically when you insert the disc. In case Windows does "
-#| "not start it automatically, or if you are using a USB memory stick, you "
-#| "can run it manually by accessing the device and executing <command>setup."
-#| "exe</command>."
msgid ""
"If you use optical installation media, a pre-installation program should be "
"launched automatically when you insert the disc. In case Windows does not "
@@ -994,8 +960,8 @@ msgstr ""
"Se utilizar um meio de disco óptico, deve ser lançado automaticamente um "
"programa de pré-instalação ao inserir o disco. No caso do Windows não o "
"iniciar automaticamente, ou se estiver a utilizar uma pen de memória USB, "
-"pode corrê-lo manualmente acedendo ao dispositivo e executando <command>"
-"setup.exe</command>."
+"pode corrê-lo manualmente acedendo ao dispositivo e executando "
+"<command>setup.exe</command>."
#. Tag: para
#: boot-installer.xml:645
@@ -1106,13 +1072,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:707
#, no-c-format
-#| msgid ""
-#| "Alternatively, if you intend to keep an existing partition on the hard "
-#| "drive unchanged during the install, you can download the <filename>hd-"
-#| "media/initrd.gz</filename> file and its kernel, as well as copy a CD (or "
-#| "DVD) iso to the drive (make sure the file is named ending in <literal>."
-#| "iso</literal>). The installer can then boot from the drive and install "
-#| "from the CD/DVD image, without needing the network."
msgid ""
"Alternatively, if you intend to keep an existing partition on the hard drive "
"unchanged during the install, you can download the <filename>hd-media/initrd."
@@ -1580,15 +1539,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:964
#, no-c-format
-#| msgid ""
-#| "The graphical installer is available with all CD images and with the hd-"
-#| "media installation method. To boot the graphical installer simply select "
-#| "the relevant option from the boot menu. Expert and rescue mode for the "
-#| "graphical installer can be selected from the <quote>Advanced options</"
-#| "quote> menu. The previously used boot methods <userinput>installgui</"
-#| "userinput>, <userinput>expertgui</userinput> and <userinput>rescuegui</"
-#| "userinput> can still be used from the boot prompt which is shown after "
-#| "selecting the <quote>Help</quote> option in the boot menu."
msgid ""
"The graphical installer is available with all CD/DVD images and with the hd-"
"media installation method. To boot the graphical installer simply select the "
@@ -3652,13 +3602,6 @@ msgstr "cdrom-detect/eject"
#. Tag: para
#: boot-installer.xml:2649
#, no-c-format
-#| msgid ""
-#| "By default, before rebooting, &d-i; automatically ejects the optical "
-#| "media used during the installation. This can be unnecessary if the system "
-#| "does not automatically boot off the CD. In some cases it may even be "
-#| "undesirable, for example if the optical drive cannot reinsert the media "
-#| "itself and the user is not there to do it manually. Many slot loading, "
-#| "slim-line, and caddy style drives cannot reload media automatically."
msgid ""
"By default, before rebooting, &d-i; automatically ejects the optical media "
"used during the installation. This can be unnecessary if the system does not "
@@ -4081,20 +4024,15 @@ msgstr "Fiabilidade de meios ópticos"
#. Tag: para
#: boot-installer.xml:2898
#, no-c-format
-#| msgid ""
-#| "Sometimes, especially with older CD-ROM drives, the installer may fail to "
-#| "boot from a CD-ROM. The installer may also &mdash; even after booting "
-#| "successfully from CD-ROM &mdash; fail to recognize the CD-ROM or return "
-#| "errors while reading from it during the installation."
msgid ""
"Sometimes, especially with older drives, the installer may fail to boot from "
"an optical disc. The installer may also &mdash; even after booting "
"successfully from such disc &mdash; fail to recognize the disc or return "
"errors while reading from it during the installation."
msgstr ""
-"Por vezes, especialmente em leitores mais antigos, o instalador pode "
-"falhar o arranque a partir do disco óptico. O instalador pode também &mdash; "
-"mesmo após ter arrancado com sucesso a partir de tal disco &mdash; falhar o "
+"Por vezes, especialmente em leitores mais antigos, o instalador pode falhar "
+"o arranque a partir do disco óptico. O instalador pode também &mdash; mesmo "
+"após ter arrancado com sucesso a partir de tal disco &mdash; falhar o "
"reconhecimento do disco ou durante a instalação retornar erros ao ler a "
"partir deste."
@@ -4119,9 +4057,6 @@ msgstr "Existem duas coisas muito simples que deve tentar primeiro."
#. Tag: para
#: boot-installer.xml:2916
#, no-c-format
-#| msgid ""
-#| "If the CD-ROM does not boot, check that it was inserted correctly and "
-#| "that it is not dirty."
msgid ""
"If the disc does not boot, check that it was inserted correctly and that it "
"is not dirty."
@@ -4132,43 +4067,32 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:2922
#, no-c-format
-#| msgid ""
-#| "If the installer fails to recognize a CD-ROM, try just running the option "
-#| "<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </"
-#| "menuchoice> a second time. Some DMA related issues with very old CD-ROM "
-#| "drives are known to be resolved in this way."
msgid ""
"If the installer fails to recognize the disc, try just running the option "
"<menuchoice> <guimenuitem>Detect and mount installation media</guimenuitem> "
"</menuchoice> a second time. Some DMA related issues with very old CD-ROM "
"drives are known to be resolved in this way."
msgstr ""
-"Se o instalador falhar o reconhecimento do disco, tente apenas correr a opção "
-"<menuchoice> <guimenuitem>Detetar e montar o meio de instalação</guimenuitem> "
-"</menuchoice> uma segunda vez. É conhecido que alguns problemas relacionados "
-"com DMA em leitores de CD-ROM muito antigos se resolvem desta forma."
+"Se o instalador falhar o reconhecimento do disco, tente apenas correr a "
+"opção <menuchoice> <guimenuitem>Detetar e montar o meio de instalação</"
+"guimenuitem> </menuchoice> uma segunda vez. É conhecido que alguns problemas "
+"relacionados com DMA em leitores de CD-ROM muito antigos se resolvem desta "
+"forma."
#. Tag: para
#: boot-installer.xml:2932
#, no-c-format
-#| msgid ""
-#| "If this does not work, then try the suggestions in the subsections below. "
-#| "Most, but not all, suggestions discussed there are valid for both CD-ROM "
-#| "and DVD, but we'll use the term CD-ROM for simplicity."
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
"Most, but not all, suggestions discussed there are valid for CD-ROM and DVD."
msgstr ""
"Se isto não funcionar, então tente as sugestões nas subsecções abaixo. A "
-"maioria, mas não todas, das sugestões discutidas são válidas quer para "
-"CD-ROM quer para DVD."
+"maioria, mas não todas, das sugestões discutidas são válidas quer para CD-"
+"ROM quer para DVD."
#. Tag: para
#: boot-installer.xml:2937
#, no-c-format
-#| msgid ""
-#| "If you cannot get the installation working from CD-ROM, try one of the "
-#| "other installation methods that are available."
msgid ""
"If you cannot get the installation working from optical disc, try one of the "
"other installation methods that are available."
@@ -4211,39 +4135,25 @@ msgstr "Como investigar e talvez resolver problemas"
#. Tag: para
#: boot-installer.xml:2977
#, no-c-format
-#| msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgid "If the optical disc fails to boot, try the suggestions listed below."
-msgstr "Se o disco óptico falhar o arranque, tente as sugestões listadas abaixo."
+msgstr ""
+"Se o disco óptico falhar o arranque, tente as sugestões listadas abaixo."
#. Tag: para
#: boot-installer.xml:2982
#, no-c-format
-#| msgid ""
-#| "Check that your BIOS actually supports booting from CD-ROM (only an issue "
-#| "for very old systems) and that CD booting is enabled in the BIOS."
msgid ""
"Check that your BIOS actually supports booting from optical disc (only an "
"issue for very old systems) and that booting from such media is enabled in "
"the BIOS."
msgstr ""
"Verifique se a sua BIOS na realidade suporta arrancar a partir de discos "
-"ópticos (apenas problemático para sistemas muito antigos) e que o arranque "
-"a partir desse meio está ativado na BIOS."
+"ópticos (apenas problemático para sistemas muito antigos) e que o arranque a "
+"partir desse meio está ativado na BIOS."
#. Tag: para
#: boot-installer.xml:2989
#, no-c-format
-#| msgid ""
-#| "If you downloaded an iso image, check that the md5sum of that image "
-#| "matches the one listed for the image in the <filename>MD5SUMS</filename> "
-#| "file that should be present in the same location as where you downloaded "
-#| "the image from. <informalexample><screen>\n"
-#| "$ md5sum <replaceable>debian-testing-i386-netinst.iso</replaceable>\n"
-#| "a20391b12f7ff22ef705cee4059c6b92 <replaceable>debian-testing-i386-"
-#| "netinst.iso</replaceable>\n"
-#| "</screen></informalexample> Next, check that the md5sum of the burned CD-"
-#| "ROM matches as well. The following command should work. It uses the size "
-#| "of the image to read the correct number of bytes from the CD-ROM."
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
"the one listed for the image in the <filename>MD5SUMS</filename> file that "
@@ -4257,8 +4167,8 @@ msgid ""
"image to read the correct number of bytes from the disc."
msgstr ""
"Se fez o download de uma imagem iso, verifique se o md5sum dessa imagem "
-"coincide com o que está listado para a imagem no ficheiro <filename>MD5SUMS"
-"</filename> que deverá estar presente no mesmo local de a partir de onde "
+"coincide com o que está listado para a imagem no ficheiro <filename>MD5SUMS</"
+"filename> que deverá estar presente no mesmo local de a partir de onde "
"obteve a imagem. <informalexample><screen>\n"
"$ md5sum <replaceable>debian-testing-i386-netinst.iso</replaceable>\n"
"a20391b12f7ff22ef705cee4059c6b92 <replaceable>debian-testing-i386-netinst."
@@ -4292,15 +4202,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:3007
#, no-c-format
-#| msgid ""
-#| "If, after the installer has been booted successfully, the CD-ROM is not "
-#| "detected, sometimes simply trying again may solve the problem. If you "
-#| "have more than one CD-ROM drive, try changing the CD-ROM to the other "
-#| "drive. If that does not work or if the CD-ROM is recognized but there are "
-#| "errors when reading from it, try the suggestions listed below. Some basic "
-#| "knowledge of &arch-kernel; is required for this. To execute any of the "
-#| "commands, you should first switch to the second virtual console (VT2) and "
-#| "activate the shell there."
msgid ""
"If, after the installer has been booted successfully, the disc is not "
"detected, sometimes simply trying again may solve the problem. If you have "
@@ -4335,21 +4236,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:3026
#, no-c-format
-#| msgid ""
-#| "Check in the output of <command>dmesg</command> if your CD-ROM drive was "
-#| "recognized. You should see something like (the lines do not necessarily "
-#| "have to be consecutive): <informalexample><screen>\n"
-#| "ata1.00: ATAPI: MATSHITADVD-RAM UJ-822S, 1.61, max UDMA/33\n"
-#| "ata1.00: configured for UDMA/33\n"
-#| "scsi 0:0:0:0: CD-ROM MATSHITA DVD-RAM UJ-822S 1.61 PQ: 0 "
-#| "ANSI: 5\n"
-#| "sr0: scsi3-mmc drive: 24x/24x writer dvd-ram cd/rw xa/form2 cdda tray\n"
-#| "cdrom: Uniform CD-ROM driver Revision: 3.20\n"
-#| "</screen></informalexample> If you don't see something like that, chances "
-#| "are the controller your CD-ROM is connected to was not recognized or may "
-#| "be not supported at all. If you know what driver is needed for the "
-#| "controller, you can try loading it manually using <command>modprobe</"
-#| "command>."
msgid ""
"Check in the output of <command>dmesg</command> if your optical drive was "
"recognized. You should see something like (the lines do not necessarily have "
@@ -4374,19 +4260,15 @@ msgstr ""
"5\n"
"sr0: scsi3-mmc drive: 24x/24x writer dvd-ram cd/rw xa/form2 cdda tray\n"
"cdrom: Uniform CD-ROM driver Revision: 3.20\n"
-"</screen></informalexample> Se não vir algo como isso, existe a possibilidade "
-"do controlador a que o seu leitor está ligado não tenha sido reconhecido ou "
-"não é suportado. Se souber qual o controlador que é necessário para este "
-"leitor, deve tentar carregá-lo manualmente utilizando o <command>modprobe"
-"</command>."
+"</screen></informalexample> Se não vir algo como isso, existe a "
+"possibilidade do controlador a que o seu leitor está ligado não tenha sido "
+"reconhecido ou não é suportado. Se souber qual o controlador que é "
+"necessário para este leitor, deve tentar carregá-lo manualmente utilizando o "
+"<command>modprobe</command>."
#. Tag: para
#: boot-installer.xml:3040
#, no-c-format
-#| msgid ""
-#| "Check that there is a device node for your CD-ROM drive under <filename>/"
-#| "dev/</filename>. In the example above, this would be <filename>/dev/sr0</"
-#| "filename>. There should also be a <filename>/dev/cdrom</filename>."
msgid ""
"Check that there is a device node for your optical drive under <filename>/"
"dev/</filename>. In the example above, this would be <filename>/dev/sr0</"
@@ -4399,13 +4281,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:3048
#, no-c-format
-#| msgid ""
-#| "Use the <command>mount</command> command to check if the CD-ROM is "
-#| "already mounted; if not, try mounting it manually: "
-#| "<informalexample><screen>\n"
-#| "$ mount /dev/<replaceable>hdc</replaceable> /cdrom\n"
-#| "</screen></informalexample> Check if there are any error messages after "
-#| "that command."
msgid ""
"Use the <command>mount</command> command to check if the optical disc is "
"already mounted; if not, try mounting it manually: "
@@ -4424,17 +4299,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:3058
#, no-c-format
-#| msgid ""
-#| "Check if DMA is currently enabled: <informalexample><screen>\n"
-#| "$ cd /proc/<replaceable>ide</replaceable>/<replaceable>hdc</replaceable>\n"
-#| "$ grep using_dma settings\n"
-#| "using_dma 1 0 1 rw\n"
-#| "</screen></informalexample> A <quote>1</quote> in the first column after "
-#| "<literal>using_dma</literal> means it is enabled. If it is, try disabling "
-#| "it: <informalexample><screen>\n"
-#| "$ echo -n \"using_dma:0\" &gt;settings\n"
-#| "</screen></informalexample> Make sure that you are in the directory for "
-#| "the device that corresponds to your CD-ROM drive."
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
"$ cd /proc/<replaceable>ide</replaceable>/<replaceable>hdc</replaceable>\n"
@@ -4461,11 +4325,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:3073
#, no-c-format
-#| msgid ""
-#| "If there are any problems during the installation, try checking the "
-#| "integrity of the CD-ROM using the option near the bottom of the "
-#| "installer's main menu. This option can also be used as a general test if "
-#| "the CD-ROM can be read reliably."
msgid ""
"If there are any problems during the installation, try checking the "
"integrity of the installation media using the option near the bottom of the "
@@ -4858,50 +4717,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:3362
#, no-c-format
-#| msgid ""
-#| "Alternatively you can use this template when filling out installation "
-#| "reports, and file the report as a bug report against the "
-#| "<classname>installation-reports</classname> pseudo package, by sending it "
-#| "to <email>submit@bugs.debian.org</email>. <informalexample><screen>\n"
-#| "Package: installation-reports\n"
-#| "\n"
-#| "Boot method: &lt;How did you boot the installer? CD? USB stick? Network?"
-#| "&gt;\n"
-#| "Image version: &lt;Full URL to image you downloaded is best&gt;\n"
-#| "Date: &lt;Date and time of the install&gt;\n"
-#| "\n"
-#| "Machine: &lt;Description of machine (eg, IBM Thinkpad R32)&gt;\n"
-#| "Processor:\n"
-#| "Memory:\n"
-#| "Partitions: &lt;df -Tl will do; the raw partition table is preferred&gt;\n"
-#| "\n"
-#| "Output of lspci -knn (or lspci -nn):\n"
-#| "\n"
-#| "Base System Installation Checklist:\n"
-#| "[O] = OK, [E] = Error (please elaborate below), [ ] = didn't try it\n"
-#| "\n"
-#| "Initial boot: [ ]\n"
-#| "Detect network card: [ ]\n"
-#| "Configure network: [ ]\n"
-#| "Detect CD: [ ]\n"
-#| "Load installer modules: [ ]\n"
-#| "Detect hard drives: [ ]\n"
-#| "Partition hard drives: [ ]\n"
-#| "Install base system: [ ]\n"
-#| "Clock/timezone setup: [ ]\n"
-#| "User/password setup: [ ]\n"
-#| "Install tasks: [ ]\n"
-#| "Install boot loader: [ ]\n"
-#| "Overall install: [ ]\n"
-#| "\n"
-#| "Comments/Problems:\n"
-#| "\n"
-#| "&lt;Description of the install, in prose, and any thoughts, comments\n"
-#| " and ideas you had during the initial install.&gt;\n"
-#| "</screen></informalexample> In the bug report, describe what the problem "
-#| "is, including the last visible kernel messages in the event of a kernel "
-#| "hang. Describe the steps that you did which brought the system into the "
-#| "problem state."
msgid ""
"Alternatively you can use this template when filling out installation "
"reports, and file the report as a bug report against the "
@@ -4953,8 +4768,10 @@ msgstr ""
"<email>submit@bugs.debian.org</email>. <informalexample><screen>\n"
"Package: installation-reports\n"
"\n"
-"Método de arranque: &lt;Como arrancou o instalador? CD/DVD? Pen USB? Rede?&gt;\n"
-"Versão da imagem: &lt;o melhor é o URL completo para a imagem que obteve&gt;\n"
+"Método de arranque: &lt;Como arrancou o instalador? CD/DVD? Pen USB? Rede?"
+"&gt;\n"
+"Versão da imagem: &lt;o melhor é o URL completo para a imagem que "
+"obteve&gt;\n"
"Data: &lt; Data e hora da instalação&gt;\n"
"\n"
"Máquina: &lt;Descrição da máquina (p.e. IBM Thinkpad R32)&gt;\n"
diff --git a/po/pt/welcome.po b/po/pt/welcome.po
index 023179c13..9fd6b4f49 100644
--- a/po/pt/welcome.po
+++ b/po/pt/welcome.po
@@ -691,12 +691,6 @@ msgstr "Obter &debian;"
#. Tag: para
#: welcome.xml:424
#, no-c-format
-#| msgid ""
-#| "For information on how to download &debian-gnu; from the Internet or from "
-#| "whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
-#| "debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-#| "debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
-#| "official &debian; mirrors, so you can easily find the nearest one."
msgid ""
"For information on how to download &debian-gnu; from the Internet or from "
"whom official &debian; installation media can be purchased, see the <ulink "
@@ -705,11 +699,11 @@ msgid ""
"set of official &debian; mirrors, so you can easily find the nearest one."
msgstr ""
"Para informação acerca de como descarregar &debian-gnu; da Internet ou onde "
-"podem ser comprados meios de instalação oficiais de &debian; veja <ulink "
-"url=\"&url-debian-distrib;\">a página da distribuição</ulink>. A <ulink url="
+"podem ser comprados meios de instalação oficiais de &debian; veja <ulink url="
+"\"&url-debian-distrib;\">a página da distribuição</ulink>. A <ulink url="
"\"&url-debian-mirrors;\">lista de mirrors &debian;</ulink> contém a lista "
-"completa dos mirrors oficiais de &debian; para que possa facilmente encontrar "
-"o mais próximo de si."
+"completa dos mirrors oficiais de &debian; para que possa facilmente "
+"encontrar o mais próximo de si."
#. Tag: para
#: welcome.xml:433
@@ -847,15 +841,6 @@ msgstr ""
#. Tag: para
#: welcome.xml:519
#, no-c-format
-#| msgid ""
-#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
-#| ">. This involves choosing your language, configuring peripheral driver "
-#| "modules, configuring your network connection, so that remaining "
-#| "installation files can be obtained directly from a &debian; server (if "
-#| "you are not installing from a CD/DVD set), partitioning your hard drives "
-#| "and installation of a base system, then selection and installation of "
-#| "tasks. (Some background about setting up the partitions for your &debian; "
-#| "system is explained in <xref linkend=\"partitioning\"/>.)"
msgid ""
"Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
"This involves choosing your language, configuring peripheral driver modules, "
@@ -866,15 +851,15 @@ msgid ""
"(Some background about setting up the partitions for your &debian; system is "
"explained in <xref linkend=\"partitioning\"/>.)"
msgstr ""
-"Faça a instalação de acordo com o <xref linkend=\"d-i-intro\"/>. Isto envolve "
-"escolher a sua linguagem, configurar módulos controladores de periféricos, "
-"configurar a sua ligação de rede de modo a que os restantes ficheiros de "
-"instalação possam ser obtidos a partir de um servidor &debian; (isto se não "
-"estiver a instalar a partir de um conjunto de imagens de instalação de "
-"CDs/DVDs), particionar os seus discos rígidos e instalar um sistema base, e "
-"por fim a selecção e instalação de tarefas. (São explicadas algumas noções "
-"sobre como fazer o particionamento para o seu sistema &debian; em "
-"<xref linkend=\"partitioning\"/>.)"
+"Faça a instalação de acordo com o <xref linkend=\"d-i-intro\"/>. Isto "
+"envolve escolher a sua linguagem, configurar módulos controladores de "
+"periféricos, configurar a sua ligação de rede de modo a que os restantes "
+"ficheiros de instalação possam ser obtidos a partir de um servidor &debian; "
+"(isto se não estiver a instalar a partir de um conjunto de imagens de "
+"instalação de CDs/DVDs), particionar os seus discos rígidos e instalar um "
+"sistema base, e por fim a selecção e instalação de tarefas. (São explicadas "
+"algumas noções sobre como fazer o particionamento para o seu sistema "
+"&debian; em <xref linkend=\"partitioning\"/>.)"
#. Tag: para
#: welcome.xml:532
@@ -979,14 +964,6 @@ msgstr ""
#. Tag: para
#: welcome.xml:601
#, no-c-format
-#| msgid ""
-#| "Calling software <emphasis>free</emphasis> doesn't mean that the software "
-#| "isn't copyrighted, and it doesn't mean that CDs/DVDs containing that "
-#| "software must be distributed at no charge. Free software, in part, means "
-#| "that the licenses of individual programs do not require you to pay for "
-#| "the privilege of distributing or using those programs. Free software also "
-#| "means that not only may anyone extend, adapt, and modify the software, "
-#| "but that they may distribute the results of their work as well."
msgid ""
"Calling software <emphasis>free</emphasis> doesn't mean that the software "
"isn't copyrighted, and it doesn't mean that installation media containing "
@@ -1002,7 +979,8 @@ msgstr ""
"em parte, significa que as licenças dos programas individuais não necessitam "
"que pague pelo privilégio de distribuir e utilizar esses programas. Software "
"livre também significa que não só qualquer um pode estender, adaptar, e "
-"modificar o software, mas também pode distribuir os resultados do seu trabalho."
+"modificar o software, mas também pode distribuir os resultados do seu "
+"trabalho."
#. Tag: para
#: welcome.xml:612