Refresh po and pot files after changings in en

1 files changed, 207 insertions, 190 deletions

diff --git a/po/fi/using-d-i.po b/po/fi/using-d-i.po
index 8c57c1a72..28ba19de2 100644
--- a/po/fi/using-d-i.po
+++ b/po/fi/using-d-i.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide using-d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2014-10-05 18:15+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2010-05-14 08:20+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -2257,8 +2257,9 @@ msgstr "<filename>/</filename>, <filename>/home</filename>, sivutus"
 
 #. Tag: entry
 #: using-d-i.xml:1350
-#, no-c-format
-msgid "Separate /home, /usr, /var and /tmp partitions"
+#, fuzzy, no-c-format
+#| msgid "Separate /home, /usr, /var and /tmp partitions"
+msgid "Separate /home, /var and /tmp partitions"
 msgstr "Erilliset /home-, /usr-, /var- ja /tmp-osiot"
 
 #. Tag: entry
@@ -2269,10 +2270,13 @@ msgstr "<entry>1 Gt</entry>"
 
 #. Tag: entry
 #: using-d-i.xml:1352
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
+#| "filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
 msgid ""
-"<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
-"filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
+"<filename>/</filename>, <filename>/home</filename>, <filename>/var</"
+"filename>, <filename>/tmp</filename>, swap"
 msgstr ""
 "<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
 "filename>, <filename>/var</filename>, <filename>/tmp</filename>, sivutus"
@@ -4316,59 +4320,17 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2561
-#, fuzzy, no-c-format
-#| msgid ""
-#| "It is not possible to interactively select a different desktop during the "
-#| "installation. However, it <emphasis>is</emphasis> possible to get &d-i; "
-#| "to install a KDE desktop environment instead of GNOME by using preseeding "
-#| "(see <xref linkend=\"preseed-pkgsel\"/>) or by adding the parameter "
-#| "<literal>desktop=kde</literal> at the boot prompt when starting the "
-#| "installer. Alternatively the more lightweight Xfce and LXDE desktop "
-#| "environments can be selected by using <literal>desktop=xfce</literal> or "
-#| "<literal>desktop=lxde</literal>."
-msgid ""
-"By default, &d-i; installs the Xfce desktop environment. It is not possible "
-"to interactively select a different desktop environment during the "
-"installation, however, it <emphasis>is</emphasis> possible to have the "
-"installer install a different desktop environment by using preseeding (see "
-"<xref linkend=\"preseed-pkgsel\"/>) or by adding the parameter "
-"<literal>desktop=name_of_the_desktop_environment</literal> at the boot "
-"prompt when starting the installer. Possible variants in this case are "
-"<literal>desktop=gnome</literal>, <literal>desktop=kde</literal>, "
-"<literal>desktop=lxde</literal> or <literal>desktop=xfce</literal>."
-msgstr ""
-"Asennuksen aikana ei ole mahdollista valita muuta työpöytäympäristöä. "
-"<emphasis>On</emphasis> kuitenkin mahdollista saada &d-i; asentamaan KDE-"
-"työpöytäympäristö GNOME:n sijaan valmiita vastauksia käyttämällä (katso "
-"<xref linkend=\"preseed-pkgsel\"/>) tai lisäämällä käynnistysvalitsin "
-"<literal>desktop=kde</literal> käynnistyskehotteeseen asenninta "
-"käynnistettäessä. Mahdollista on myös valita kevyempi työpöytäympäristö Xfce "
-"ja LXDE valitsimella <literal>desktop=xfce</literal> tai "
-"<literal>desktop=lxde</literal>."
-
-#. Tag: para
-#: using-d-i.xml:2575
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Some CD images (businesscard, netinst and DVD) also allow selection of "
-#| "the desired desktop environment from the graphical boot menu. Select the "
-#| "<quote>Advanced options</quote> option in the main menu and look for "
-#| "<quote>Alternative desktop environments</quote>."
+#, no-c-format
 msgid ""
-"If you use the special GNOME-, KDE- or LXDE-variant of the first CD in the "
-"full CD set, the installer installs the respective desktop environment "
-"instead of the default. Some CD images (netinst and DVD) also allow "
-"selection of the desired desktop environment from the graphical boot menu. "
-"Select the <quote>Advanced options</quote> option in the main menu and look "
-"for <quote>Alternative desktop environments</quote>."
+"By default, &d-i; installs the <phrase arch=\"x86\">Gnome</phrase> <phrase "
+"arch=\"non-x86\">Xfce</phrase> desktop environment. It is possible to "
+"interactively select a different desktop environment during the "
+"installation. It is also possible to install multiple desktops, but some "
+"combinations of desktop may not be co-installable."
 msgstr ""
-"Jotkin romppuotokset (businesscard, netinst ja DVD) sallivat halutun "
-"työpöytäympäristön valinnan myös graafisesta käynnistysvalikosta. Valitse "
-"päävalikosta <quote>Advanced options</quote> ja etsi kohta "
-"<quote>Alternative desktop environments</quote>."
 
 #. Tag: para
-#: using-d-i.xml:2586
+#: using-d-i.xml:2569
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Note that this will only work if the packages needed for the desired "
@@ -4394,27 +4356,16 @@ msgstr ""
 "otosta tai mitä tahansa muuta asennustapaa."
 
 #. Tag: para
-#: using-d-i.xml:2596
+#: using-d-i.xml:2579
 #, no-c-format
 msgid ""
-"The various server tasks will install software roughly as follows. DNS "
-"server: <classname>bind9</classname>; File server: <classname>samba</"
-"classname>, <classname>nfs</classname>; Mail server: <classname>exim4</"
-"classname>, <classname>spamassassin</classname>, <classname>uw-imap</"
-"classname>; Print server: <classname>cups</classname>; SQL database: "
-"<classname>postgresql</classname>; Web server: <classname>apache2</"
-"classname>."
+"The various server tasks will install software roughly as follows. Web "
+"server: <classname>apache2</classname>; Print server: <classname>cups</"
+"classname>; SSH server: <classname>openssh</classname>."
 msgstr ""
-"Palvelintehtävät asentavat ohjelmia suunnilleen seuraavasti. DNS-palvelin: "
-"<classname>bind9</classname>; Tiedostopalvelin: <classname>samba</"
-"classname>, <classname>nfs</classname>; Postipalvelin: <classname>exim4</"
-"classname>, <classname>spamassassin</classname>, <classname>uw-imap</"
-"classname>; Tulostuspalvelin: <classname>cups</classname>; SQL-palvelin: "
-"<classname>postgresql</classname>; WWW-palvelin: <classname>apache2</"
-"classname>."
 
 #. Tag: para
-#: using-d-i.xml:2607
+#: using-d-i.xml:2586
 #, no-c-format
 msgid ""
 "The <quote>Standard system</quote> task will install any package that has a "
@@ -4430,7 +4381,7 @@ msgstr ""
 "jos tiedät mitä teet ja haluat todella suppean järjestelmän."
 
 #. Tag: para
-#: using-d-i.xml:2615
+#: using-d-i.xml:2594
 #, no-c-format
 msgid ""
 "If during language selection a default locale other than the <quote>C</"
@@ -4449,7 +4400,7 @@ msgstr ""
 "sitä vastaavat maa-asetustopaketit (jos niitä on saatavilla)."
 
 #. Tag: para
-#: using-d-i.xml:2625
+#: using-d-i.xml:2604
 #, no-c-format
 msgid ""
 "Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -4463,7 +4414,7 @@ msgstr ""
 "näyttää kehotteen asennuksen aikana"
 
 #. Tag: para
-#: using-d-i.xml:2632
+#: using-d-i.xml:2611
 #, no-c-format
 msgid ""
 "You should be aware that especially the Desktop task is very large. "
@@ -4481,7 +4432,7 @@ msgstr ""
 "on alkanut."
 
 #. Tag: para
-#: using-d-i.xml:2641
+#: using-d-i.xml:2620
 #, no-c-format
 msgid ""
 "Even when packages are included on the CD-ROM, the installer may still "
@@ -4498,13 +4449,13 @@ msgstr ""
 "testattavaa jakelua näin käy jos käytetään vanhaa otosta."
 
 #. Tag: title
-#: using-d-i.xml:2656
+#: using-d-i.xml:2635
 #, no-c-format
 msgid "Making Your System Bootable"
 msgstr "Järjestelmä käynnistymään kiintolevyltä"
 
 #. Tag: para
-#: using-d-i.xml:2658
+#: using-d-i.xml:2637
 #, no-c-format
 msgid ""
 "If you are installing a diskless workstation, obviously, booting off the "
@@ -4518,13 +4469,13 @@ msgstr ""
 "verkkokäynnistystä; katso <xref linkend=\"boot-dev-select-sun\"/>.</phrase>"
 
 #. Tag: title
-#: using-d-i.xml:2673
+#: using-d-i.xml:2652
 #, no-c-format
 msgid "Detecting other operating systems"
 msgstr "Etsitään muita käyttöjärjestelmiä"
 
 #. Tag: para
-#: using-d-i.xml:2675
+#: using-d-i.xml:2654
 #, no-c-format
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
@@ -4539,7 +4490,7 @@ msgstr ""
 "myös tämän käyttöjärjestelmän käynnistyminen &debian;in lisäksi."
 
 #. Tag: para
-#: using-d-i.xml:2683
+#: using-d-i.xml:2662
 #, no-c-format
 msgid ""
 "Note that multiple operating systems booting on a single machine is still "
@@ -4555,13 +4506,13 @@ msgstr ""
 "alkulatausohjelman ohjeista etsittävä lisätietoa."
 
 #. Tag: title
-#: using-d-i.xml:2701
+#: using-d-i.xml:2680
 #, no-c-format
 msgid "<command>palo</command>-installer"
 msgstr "Käynnistyslataimen <command>palo</command> asennin"
 
 #. Tag: para
-#: using-d-i.xml:2702
+#: using-d-i.xml:2681
 #, no-c-format
 msgid ""
 "The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -4577,19 +4528,19 @@ msgstr ""
 "mahdollistaa <command>PALO</command>:n kyky lukea Linux-osioiden tiedostoja."
 
 #. Tag: para
-#: using-d-i.xml:2711
+#: using-d-i.xml:2690
 #, no-c-format
 msgid "hppa FIXME ( need more info )"
 msgstr "hppa KORJAAMUT ( tarvitaan lisätietoja )"
 
 #. Tag: title
-#: using-d-i.xml:2723
+#: using-d-i.xml:2702
 #, no-c-format
 msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
 msgstr "Asennetaan käynnistyslatain <command>GRUB</command> kiintolevylle"
 
 #. Tag: para
-#: using-d-i.xml:2725
+#: using-d-i.xml:2704
 #, no-c-format
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -4601,7 +4552,7 @@ msgstr ""
 "aloittelijoille että vanhoille parroille."
 
 #. Tag: para
-#: using-d-i.xml:2731
+#: using-d-i.xml:2710
 #, no-c-format
 msgid ""
 "By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -4613,7 +4564,7 @@ msgstr ""
 "Lisätietoja löytyy grub:n man-sivulta."
 
 #. Tag: para
-#: using-d-i.xml:2737
+#: using-d-i.xml:2716
 #, no-c-format
 msgid ""
 "If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -4624,13 +4575,13 @@ msgstr ""
 "päävalikkoon, ja valitse siellä haluttu käynnistyslatain."
 
 #. Tag: title
-#: using-d-i.xml:2750
+#: using-d-i.xml:2729
 #, no-c-format
 msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 msgstr "Asennetaan käynnistyslatain <command>LILO</command> kiintolevylle"
 
 #. Tag: para
-#: using-d-i.xml:2752
+#: using-d-i.xml:2731
 #, no-c-format
 msgid ""
 "The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -4647,7 +4598,7 @@ msgstr ""
 "howto;\">LILO mini-HOWTO</ulink>."
 
 #. Tag: para
-#: using-d-i.xml:2762
+#: using-d-i.xml:2741
 #, no-c-format
 msgid ""
 "Currently the LILO installation will only create menu entries for other "
@@ -4660,7 +4611,7 @@ msgstr ""
 "lisäämään rivit GNU/Linux- ja GNU/Hurd-järjestelmille asennuksen jälkeen."
 
 #. Tag: para
-#: using-d-i.xml:2770
+#: using-d-i.xml:2749
 #, no-c-format
 msgid ""
 "&d-i; offers you three choices on where to install the <command>LILO</"
@@ -4670,13 +4621,13 @@ msgstr ""
 "asennusapaikaksi:"
 
 #. Tag: term
-#: using-d-i.xml:2777
+#: using-d-i.xml:2756
 #, no-c-format
 msgid "Master Boot Record (MBR)"
 msgstr "Pääkäynnistyslohko (MBR)"
 
 #. Tag: para
-#: using-d-i.xml:2777
+#: using-d-i.xml:2756
 #, no-c-format
 msgid ""
 "This way the <command>LILO</command> will take complete control of the boot "
@@ -4684,13 +4635,13 @@ msgid ""
 msgstr "Komento <command>LILO</command> ohjaa käynnistyksen kokonaan."
 
 #. Tag: term
-#: using-d-i.xml:2784
+#: using-d-i.xml:2763
 #, no-c-format
 msgid "new &debian; partition"
 msgstr "uusi &debian;in osio"
 
 #. Tag: para
-#: using-d-i.xml:2784
+#: using-d-i.xml:2763
 #, no-c-format
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -4702,13 +4653,13 @@ msgstr ""
 "toissijaisena käynnistyslataimena."
 
 #. Tag: term
-#: using-d-i.xml:2793
+#: using-d-i.xml:2772
 #, no-c-format
 msgid "Other choice"
 msgstr "Muu valinta"
 
 #. Tag: para
-#: using-d-i.xml:2793
+#: using-d-i.xml:2772
 #, no-c-format
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
@@ -4722,7 +4673,7 @@ msgstr ""
 "<filename>/dev/sda</filename>."
 
 #. Tag: para
-#: using-d-i.xml:2803
+#: using-d-i.xml:2782
 #, no-c-format
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -4738,13 +4689,13 @@ msgstr ""
 "käytettävä jotain muuta keinoa &debian;in käynnistämiseen!"
 
 #. Tag: title
-#: using-d-i.xml:2819
+#: using-d-i.xml:2798
 #, no-c-format
 msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
 msgstr "Asennetaan käynnistyslatain <command>ELILO</command> kiintolevylle"
 
 #. Tag: para
-#: using-d-i.xml:2821
+#: using-d-i.xml:2800
 #, no-c-format
 msgid ""
 "The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -4772,7 +4723,7 @@ msgstr ""
 "käynnistämään Linux-ytimen."
 
 #. Tag: para
-#: using-d-i.xml:2837
+#: using-d-i.xml:2816
 #, no-c-format
 msgid ""
 "The <quote>elilo</quote> configuration and installation is done as the last "
@@ -4789,13 +4740,13 @@ msgstr ""
 "tiedostojärjestelmä."
 
 #. Tag: title
-#: using-d-i.xml:2849
+#: using-d-i.xml:2828
 #, no-c-format
 msgid "Choose the correct partition!"
 msgstr "Valitse oikea levyosio!"
 
 #. Tag: para
-#: using-d-i.xml:2851
+#: using-d-i.xml:2830
 #, fuzzy, no-c-format
 #| msgid ""
 #| "The criteria for selecting a partition is that it is FAT format "
@@ -4821,13 +4772,13 @@ msgstr ""
 "tiedostojärjestelmän."
 
 #. Tag: title
-#: using-d-i.xml:2866
+#: using-d-i.xml:2845
 #, no-c-format
 msgid "EFI Partition Contents"
 msgstr "EFI-osion sisältö"
 
 #. Tag: para
-#: using-d-i.xml:2868
+#: using-d-i.xml:2847
 #, no-c-format
 msgid ""
 "The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -4867,13 +4818,13 @@ msgstr ""
 "niitä kertyy järjestelmää päivitettäessä tai asetuksia muokattaessa."
 
 #. Tag: filename
-#: using-d-i.xml:2890
+#: using-d-i.xml:2869
 #, no-c-format
 msgid "elilo.conf"
 msgstr "elilo.conf"
 
 #. Tag: para
-#: using-d-i.xml:2891
+#: using-d-i.xml:2870
 #, no-c-format
 msgid ""
 "This is the configuration file read by the boot loader when it starts. It is "
@@ -4888,13 +4839,13 @@ msgstr ""
 "tiedostoihin."
 
 #. Tag: filename
-#: using-d-i.xml:2900
+#: using-d-i.xml:2879
 #, no-c-format
 msgid "elilo.efi"
 msgstr "elilo.efi"
 
 #. Tag: para
-#: using-d-i.xml:2901
+#: using-d-i.xml:2880
 #, no-c-format
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -4908,13 +4859,13 @@ msgstr ""
 "valinta."
 
 #. Tag: filename
-#: using-d-i.xml:2911
+#: using-d-i.xml:2890
 #, no-c-format
 msgid "initrd.img"
 msgstr "initrd.img"
 
 #. Tag: para
-#: using-d-i.xml:2912
+#: using-d-i.xml:2891
 #, no-c-format
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -4929,13 +4880,13 @@ msgstr ""
 "hakemistossa <filename>/boot</filename>."
 
 #. Tag: filename
-#: using-d-i.xml:2924
+#: using-d-i.xml:2903
 #, no-c-format
 msgid "readme.txt"
 msgstr "readme.txt"
 
 #. Tag: para
-#: using-d-i.xml:2925
+#: using-d-i.xml:2904
 #, no-c-format
 msgid ""
 "This is a small text file warning you that the contents of the directory are "
@@ -4947,13 +4898,13 @@ msgstr ""
 "elilo</filename> suoritetaan seuraavan kerran."
 
 #. Tag: filename
-#: using-d-i.xml:2935
+#: using-d-i.xml:2914
 #, no-c-format
 msgid "vmlinuz"
 msgstr "vmlinuz"
 
 #. Tag: para
-#: using-d-i.xml:2936
+#: using-d-i.xml:2915
 #, no-c-format
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -4967,13 +4918,13 @@ msgstr ""
 "filename> osoitettu tiedosto hakemistossa <filename>/boot</filename>."
 
 #. Tag: title
-#: using-d-i.xml:2956
+#: using-d-i.xml:2935
 #, no-c-format
 msgid "<command>arcboot</command>-installer"
 msgstr "Käynnistyslataimen <command>arcboot</command> asennin"
 
 #. Tag: para
-#: using-d-i.xml:2957
+#: using-d-i.xml:2936
 #, no-c-format
 msgid ""
 "The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -5018,13 +4969,13 @@ msgstr ""
 "sitten <command>boot</command>."
 
 #. Tag: replaceable
-#: using-d-i.xml:2976
+#: using-d-i.xml:2955
 #, no-c-format
 msgid "scsi"
 msgstr "scsi"
 
 #. Tag: para
-#: using-d-i.xml:2977
+#: using-d-i.xml:2956
 #, no-c-format
 msgid ""
 "is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -5034,13 +4985,13 @@ msgstr ""
 "yhdysrakenteisille ohjaimille"
 
 #. Tag: replaceable
-#: using-d-i.xml:2985
+#: using-d-i.xml:2964
 #, no-c-format
 msgid "disk"
 msgstr "levy"
 
 #. Tag: para
-#: using-d-i.xml:2986
+#: using-d-i.xml:2965
 #, no-c-format
 msgid ""
 "is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -5048,13 +4999,13 @@ msgid ""
 msgstr "on SCSI ID sille levylle johon <command>arcboot</command> on asennettu"
 
 #. Tag: replaceable
-#: using-d-i.xml:2994
+#: using-d-i.xml:2973
 #, no-c-format
 msgid "partnr"
 msgstr "partnr"
 
 #. Tag: para
-#: using-d-i.xml:2995
+#: using-d-i.xml:2974
 #, no-c-format
 msgid ""
 "is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -5063,13 +5014,13 @@ msgstr ""
 "on sen osion numero jossa <filename>/etc/arcboot.conf</filename> sijaitsee"
 
 #. Tag: replaceable
-#: using-d-i.xml:3003
+#: using-d-i.xml:2982
 #, no-c-format
 msgid "config"
 msgstr "config"
 
 #. Tag: para
-#: using-d-i.xml:3004
+#: using-d-i.xml:2983
 #, no-c-format
 msgid ""
 "is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -5079,13 +5030,13 @@ msgstr ""
 "oletusarvona <quote>linux</quote>."
 
 #. Tag: title
-#: using-d-i.xml:3025
+#: using-d-i.xml:3004
 #, no-c-format
 msgid "Install <command>Yaboot</command> on a Hard Disk"
 msgstr "Asennetaan käynnistyslatain <command>Yaboot</command> kiintolevylle"
 
 #. Tag: para
-#: using-d-i.xml:3026
+#: using-d-i.xml:3005
 #, no-c-format
 msgid ""
 "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -5105,13 +5056,13 @@ msgstr ""
 "käynnistämään &debian-gnu;."
 
 #. Tag: title
-#: using-d-i.xml:3044
+#: using-d-i.xml:3023
 #, no-c-format
 msgid "Install <command>Quik</command> on a Hard Disk"
 msgstr "Asennetaan käynnistyslatain <command>Quik</command> kiintolevylle"
 
 #. Tag: para
-#: using-d-i.xml:3045
+#: using-d-i.xml:3024
 #, no-c-format
 msgid ""
 "The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -5126,13 +5077,13 @@ msgstr ""
 "Computingin klooneille."
 
 #. Tag: title
-#: using-d-i.xml:3061
+#: using-d-i.xml:3040
 #, no-c-format
 msgid "<command>zipl</command>-installer"
 msgstr "Käynnistyslataimen <command>zipl</command> asennin"
 
 #. Tag: para
-#: using-d-i.xml:3062
+#: using-d-i.xml:3041
 #, no-c-format
 msgid ""
 "The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -5148,13 +5099,13 @@ msgstr ""
 "sivustolta jos haluat tietää ohjelmasta <command>ZIPL</command> enemmän."
 
 #. Tag: title
-#: using-d-i.xml:3079
+#: using-d-i.xml:3058
 #, no-c-format
 msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
 msgstr "Asennetaan käynnistyslatain <command>SILO</command> kiintolevylle"
 
 #. Tag: para
-#: using-d-i.xml:3081
+#: using-d-i.xml:3060
 #, no-c-format
 msgid ""
 "The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -5185,13 +5136,13 @@ msgstr ""
 "SunOS/Solaris-asennuksen rinnalle."
 
 #. Tag: title
-#: using-d-i.xml:3106
+#: using-d-i.xml:3085
 #, no-c-format
 msgid "Making the system bootable with flash-kernel"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3107
+#: using-d-i.xml:3086
 #, no-c-format
 msgid ""
 "As there is no common firmware interface on all ARM platforms, the steps "
@@ -5204,7 +5155,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3118
+#: using-d-i.xml:3097
 #, no-c-format
 msgid ""
 "On devices which boot from internal NOR- or NAND-flash memory, flash-kernel "
@@ -5216,7 +5167,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3128
+#: using-d-i.xml:3107
 #, no-c-format
 msgid ""
 "For ARM systems that use u-boot as their system firmware and boot the kernel "
@@ -5226,13 +5177,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3144
+#: using-d-i.xml:3123
 #, no-c-format
 msgid "Continue Without Boot Loader"
 msgstr "Jatketaan ilman käynnistyslatainta"
 
 #. Tag: para
-#: using-d-i.xml:3146
+#: using-d-i.xml:3125
 #, no-c-format
 msgid ""
 "This option can be used to complete the installation even when no boot "
@@ -5245,7 +5196,7 @@ msgstr ""
 "(esim. käytetään jo asennettua käynnistyslatainta)."
 
 #. Tag: para
-#: using-d-i.xml:3153
+#: using-d-i.xml:3132
 #, no-c-format
 msgid ""
 "If you plan to manually configure your bootloader, you should check the name "
@@ -5266,13 +5217,13 @@ msgstr ""
 "osio."
 
 #. Tag: title
-#: using-d-i.xml:3170
+#: using-d-i.xml:3149
 #, no-c-format
 msgid "Finishing the Installation"
 msgstr "Päätetään asennus"
 
 #. Tag: para
-#: using-d-i.xml:3171
+#: using-d-i.xml:3150
 #, no-c-format
 msgid ""
 "This is the last step in the &debian; installation process during which the "
@@ -5283,13 +5234,13 @@ msgstr ""
 "tehtävät. Pääasiassa siistitään työn jälkiä jotka &d-i; jätti."
 
 #. Tag: title
-#: using-d-i.xml:3184
+#: using-d-i.xml:3163
 #, no-c-format
 msgid "Setting the System Clock"
 msgstr "Tehdään kellon asetukset"
 
 #. Tag: para
-#: using-d-i.xml:3186
+#: using-d-i.xml:3165
 #, no-c-format
 msgid ""
 "The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -5302,7 +5253,7 @@ msgstr ""
 "käyttöjärjestelmien perusteella onko kello maailmanajassa."
 
 #. Tag: para
-#: using-d-i.xml:3193
+#: using-d-i.xml:3172
 #, no-c-format
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
@@ -5321,7 +5272,7 @@ msgstr ""
 "valitaan paikallinen aika.</phrase>"
 
 #. Tag: para
-#: using-d-i.xml:3204
+#: using-d-i.xml:3183
 #, no-c-format
 msgid ""
 "At this point &d-i; will also attempt to save the current time to the "
@@ -5333,13 +5284,13 @@ msgstr ""
 "tehdyn valinnan mukaiseti."
 
 #. Tag: title
-#: using-d-i.xml:3219
+#: using-d-i.xml:3198
 #, no-c-format
 msgid "Reboot the System"
 msgstr "Järjestelmän uudelleenkäynnistys"
 
 #. Tag: para
-#: using-d-i.xml:3221
+#: using-d-i.xml:3200
 #, no-c-format
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -5350,7 +5301,7 @@ msgstr ""
 "jälkeen laite käynnistetään uudelleen uuteen &debian;-järjestelmään."
 
 #. Tag: para
-#: using-d-i.xml:3227
+#: using-d-i.xml:3206
 #, no-c-format
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
@@ -5364,13 +5315,13 @@ msgstr ""
 "juuritiedostojärjestelmäksi asennuksen ensimmäisten vaiheiden aikana."
 
 #. Tag: title
-#: using-d-i.xml:3240
+#: using-d-i.xml:3219
 #, no-c-format
 msgid "Troubleshooting"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3241
+#: using-d-i.xml:3220
 #, no-c-format
 msgid ""
 "The components listed in this section are usually not involved in the "
@@ -5381,13 +5332,13 @@ msgstr ""
 "ovat käytettävissä jos jotain menee pieleen."
 
 #. Tag: title
-#: using-d-i.xml:3254
+#: using-d-i.xml:3233
 #, no-c-format
 msgid "Saving the installation logs"
 msgstr "Asentimen lokien tallentaminen"
 
 #. Tag: para
-#: using-d-i.xml:3256
+#: using-d-i.xml:3235
 #, no-c-format
 msgid ""
 "If the installation is successful, the logfiles created during the "
@@ -5399,7 +5350,7 @@ msgstr ""
 "installer/</filename>."
 
 #. Tag: para
-#: using-d-i.xml:3263
+#: using-d-i.xml:3242
 #, no-c-format
 msgid ""
 "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -5415,13 +5366,13 @@ msgstr ""
 "tai liittää lokit asennusraporttiin."
 
 #. Tag: title
-#: using-d-i.xml:3283
+#: using-d-i.xml:3262
 #, no-c-format
 msgid "Using the Shell and Viewing the Logs"
 msgstr "Komentotulkin käyttö ja lokien lukeminen"
 
 #. Tag: para
-#: using-d-i.xml:3285
+#: using-d-i.xml:3264
 #, no-c-format
 msgid ""
 "There are several methods you can use to get a shell while running an "
@@ -5447,14 +5398,14 @@ msgstr ""
 "<keycap>F1</keycap></keycombo>."
 
 #. Tag: para
-#: using-d-i.xml:3303
+#: using-d-i.xml:3282
 #, no-c-format
 msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
 msgstr ""
 "Graafista asenninta käytettäessä katso myös <xref linkend=\"gtk-using\"/>."
 
 #. Tag: para
-#: using-d-i.xml:3307
+#: using-d-i.xml:3286
 #, no-c-format
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -5470,7 +5421,7 @@ msgstr ""
 "komentotulkin."
 
 #. Tag: para
-#: using-d-i.xml:3315
+#: using-d-i.xml:3294
 #, no-c-format
 msgid ""
 "At this point you are booted from the RAM disk, and there is a limited set "
@@ -5488,7 +5439,7 @@ msgstr ""
 "tekstintäydennys ja komentohistoria."
 
 #. Tag: para
-#: using-d-i.xml:3324
+#: using-d-i.xml:3303
 #, no-c-format
 msgid ""
 "To edit and view files, use the text editor <command>nano</command>. Log "
@@ -5500,7 +5451,7 @@ msgstr ""
 "filename>."
 
 #. Tag: para
-#: using-d-i.xml:3331
+#: using-d-i.xml:3310
 #, no-c-format
 msgid ""
 "Although you can do basically anything in a shell that the available "
@@ -5512,7 +5463,7 @@ msgstr ""
 "käytettäväksi jos jokin menee vikaan ja virheenjäljitykseen."
 
 #. Tag: para
-#: using-d-i.xml:3337
+#: using-d-i.xml:3316
 #, no-c-format
 msgid ""
 "Doing things manually from the shell may interfere with the installation "
@@ -5526,13 +5477,13 @@ msgstr ""
 "komentotulkissa."
 
 #. Tag: title
-#: using-d-i.xml:3353
+#: using-d-i.xml:3332
 #, no-c-format
 msgid "Installation Over the Network"
 msgstr "Etäasennus"
 
 #. Tag: para
-#: using-d-i.xml:3355
+#: using-d-i.xml:3334
 #, no-c-format
 msgid ""
 "One of the more interesting components is <firstterm>network-console</"
@@ -5549,7 +5500,7 @@ msgstr ""
 "tämän osan voi automatisoida, katso <xref linkend=\"automatic-install\"/>.)"
 
 #. Tag: para
-#: using-d-i.xml:3365
+#: using-d-i.xml:3344
 #, no-c-format
 msgid ""
 "This component is not loaded into the main installation menu by default, so "
@@ -5571,7 +5522,7 @@ msgstr ""
 "SSH:ta.</guimenuitem>."
 
 #. Tag: para
-#: using-d-i.xml:3378
+#: using-d-i.xml:3357
 #, no-c-format
 msgid ""
 "For installations on &arch-title;, this is the default method after setting "
@@ -5581,7 +5532,7 @@ msgstr ""
 "tultua tehdyksi."
 
 #. Tag: para
-#: using-d-i.xml:3383
+#: using-d-i.xml:3362
 #, no-c-format
 msgid ""
 "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -5603,7 +5554,7 @@ msgstr ""
 "tietoturvallisesti etäasennuksen tekevälle henkilölle."
 
 #. Tag: para
-#: using-d-i.xml:3395
+#: using-d-i.xml:3374
 #, no-c-format
 msgid ""
 "Should you decide to continue with the installation locally, you can always "
@@ -5615,7 +5566,7 @@ msgstr ""
 "toinen asentimen osa."
 
 #. Tag: para
-#: using-d-i.xml:3401
+#: using-d-i.xml:3380
 #, no-c-format
 msgid ""
 "Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -5647,7 +5598,7 @@ msgstr ""
 "on vahvistettava se oikeaksi."
 
 #. Tag: para
-#: using-d-i.xml:3418
+#: using-d-i.xml:3397
 #, no-c-format
 msgid ""
 "The <command>ssh</command> server in the installer uses a default "
@@ -5671,7 +5622,7 @@ msgstr ""
 "voiko asennusta jatkaa kun yhteys on muodostettu uudelleen."
 
 #. Tag: para
-#: using-d-i.xml:3431
+#: using-d-i.xml:3410
 #, no-c-format
 msgid ""
 "You may be able to avoid the connection being dropped by adding the option "
@@ -5693,7 +5644,7 @@ msgstr ""
 "muuten toipunut). Sitä oli siis käytettävä vain tarvittaessa."
 
 #. Tag: para
-#: using-d-i.xml:3444
+#: using-d-i.xml:3423
 #, no-c-format
 msgid ""
 "If you install several computers in turn and they happen to have the same IP "
@@ -5717,7 +5668,7 @@ msgstr ""
 "ja yrittää uudelleen."
 
 #. Tag: para
-#: using-d-i.xml:3460
+#: using-d-i.xml:3439
 #, no-c-format
 msgid ""
 "After the login you will be presented with an initial screen where you have "
@@ -5737,7 +5688,7 @@ msgstr ""
 "useampia."
 
 #. Tag: para
-#: using-d-i.xml:3470
+#: using-d-i.xml:3449
 #, no-c-format
 msgid ""
 "After you have started the installation remotely over SSH, you should not go "
@@ -5753,13 +5704,13 @@ msgstr ""
 "järjestelmä toimii huonosti."
 
 #. Tag: title
-#: using-d-i.xml:3489
+#: using-d-i.xml:3468
 #, no-c-format
 msgid "Loading Missing Firmware"
 msgstr "Puuttuvan laitetiedoston lataaminen"
 
 #. Tag: para
-#: using-d-i.xml:3490
+#: using-d-i.xml:3469
 #, no-c-format
 msgid ""
 "As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -5774,7 +5725,7 @@ msgstr ""
 "lisäominaisuuksien saamiseen käyttöön."
 
 #. Tag: para
-#: using-d-i.xml:3498
+#: using-d-i.xml:3477
 #, no-c-format
 msgid ""
 "If a device driver requests firmware that is not available, &d-i; will "
@@ -5792,7 +5743,7 @@ msgstr ""
 "lib/firmware</filename>) ja laiteajuria vastaava moduuli ladataan uudelleen."
 
 #. Tag: para
-#: using-d-i.xml:3508
+#: using-d-i.xml:3487
 #, no-c-format
 msgid ""
 "Which devices are scanned and which file systems are supported depends on "
@@ -5810,7 +5761,7 @@ msgstr ""
 "laiteohjelmisto voidaan ladata myös MMC- tai SD-kortilta</phrase>."
 
 #. Tag: para
-#: using-d-i.xml:3518
+#: using-d-i.xml:3497
 #, no-c-format
 msgid ""
 "Note that it is possible to skip loading the firmware if you know the device "
@@ -5821,7 +5772,7 @@ msgstr ""
 "laite toimii ilmankin tai jos laitetta ei tarvita asennuksen aikana."
 
 #. Tag: para
-#: using-d-i.xml:3524
+#: using-d-i.xml:3503
 #, no-c-format
 msgid ""
 "&d-i; only prompts for firmware needed by kernel modules loaded during the "
@@ -5835,13 +5786,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3538
+#: using-d-i.xml:3517
 #, no-c-format
 msgid "Preparing a medium"
 msgstr "Taltion valmistelu"
 
 #. Tag: para
-#: using-d-i.xml:3539
+#: using-d-i.xml:3518
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Although in some cases the firmware can also be loaded from a partition "
@@ -5871,7 +5822,7 @@ msgstr ""
 "tuettu asennuksen ensimmäisten vaiheiden aikana."
 
 #. Tag: para
-#: using-d-i.xml:3552
+#: using-d-i.xml:3531
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Tarballs containing current packages for the most common firmware are "
@@ -5892,7 +5843,7 @@ msgstr ""
 "vastaava tar-tiedosto ja pura se taltion tiedostojärjestelmään."
 
 #. Tag: para
-#: using-d-i.xml:3566
+#: using-d-i.xml:3545
 #, no-c-format
 msgid ""
 "If the firmware you need is not included in the tarball, you can also "
@@ -5909,7 +5860,7 @@ msgstr ""
 "laiteohjelmistopaketteja."
 
 #. Tag: para
-#: using-d-i.xml:3580
+#: using-d-i.xml:3559
 #, no-c-format
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
@@ -5921,13 +5872,13 @@ msgstr ""
 "laitevalmistajalta."
 
 #. Tag: title
-#: using-d-i.xml:3589
+#: using-d-i.xml:3568
 #, no-c-format
 msgid "Firmware and the Installed System"
 msgstr "Laiteohjelmisto ja asennettu järjestelmä"
 
 #. Tag: para
-#: using-d-i.xml:3590
+#: using-d-i.xml:3569
 #, no-c-format
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
@@ -5945,7 +5896,7 @@ msgstr ""
 "laiteohjelmistoa voida ladata versioerojen vuoksi."
 
 #. Tag: para
-#: using-d-i.xml:3599
+#: using-d-i.xml:3578
 #, no-c-format
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -5961,7 +5912,7 @@ msgstr ""
 "automaattisesti jos uusi versio julkaistaan."
 
 #. Tag: para
-#: using-d-i.xml:3607
+#: using-d-i.xml:3586
 #, no-c-format
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
@@ -5973,7 +5924,7 @@ msgstr ""
 "laiteohjelmistopaketti) on asennettu käyttäjän toimesta."
 
 #. Tag: para
-#: using-d-i.xml:3614
+#: using-d-i.xml:3593
 #, no-c-format
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -5986,6 +5937,72 @@ msgstr ""
 "jos ei vastaavaa laiteohjelmistopakettia (jos sellainen on saatavilla) "
 "asenneta asennuksen valmistuttua. "
 
+#, fuzzy
+#~| msgid ""
+#~| "It is not possible to interactively select a different desktop during "
+#~| "the installation. However, it <emphasis>is</emphasis> possible to get &d-"
+#~| "i; to install a KDE desktop environment instead of GNOME by using "
+#~| "preseeding (see <xref linkend=\"preseed-pkgsel\"/>) or by adding the "
+#~| "parameter <literal>desktop=kde</literal> at the boot prompt when "
+#~| "starting the installer. Alternatively the more lightweight Xfce and LXDE "
+#~| "desktop environments can be selected by using <literal>desktop=xfce</"
+#~| "literal> or <literal>desktop=lxde</literal>."
+#~ msgid ""
+#~ "By default, &d-i; installs the Xfce desktop environment. It is not "
+#~ "possible to interactively select a different desktop environment during "
+#~ "the installation, however, it <emphasis>is</emphasis> possible to have "
+#~ "the installer install a different desktop environment by using preseeding "
+#~ "(see <xref linkend=\"preseed-pkgsel\"/>) or by adding the parameter "
+#~ "<literal>desktop=name_of_the_desktop_environment</literal> at the boot "
+#~ "prompt when starting the installer. Possible variants in this case are "
+#~ "<literal>desktop=gnome</literal>, <literal>desktop=kde</literal>, "
+#~ "<literal>desktop=lxde</literal> or <literal>desktop=xfce</literal>."
+#~ msgstr ""
+#~ "Asennuksen aikana ei ole mahdollista valita muuta työpöytäympäristöä. "
+#~ "<emphasis>On</emphasis> kuitenkin mahdollista saada &d-i; asentamaan KDE-"
+#~ "työpöytäympäristö GNOME:n sijaan valmiita vastauksia käyttämällä (katso "
+#~ "<xref linkend=\"preseed-pkgsel\"/>) tai lisäämällä käynnistysvalitsin "
+#~ "<literal>desktop=kde</literal> käynnistyskehotteeseen asenninta "
+#~ "käynnistettäessä. Mahdollista on myös valita kevyempi työpöytäympäristö "
+#~ "Xfce ja LXDE valitsimella <literal>desktop=xfce</literal> tai "
+#~ "<literal>desktop=lxde</literal>."
+
+#, fuzzy
+#~| msgid ""
+#~| "Some CD images (businesscard, netinst and DVD) also allow selection of "
+#~| "the desired desktop environment from the graphical boot menu. Select the "
+#~| "<quote>Advanced options</quote> option in the main menu and look for "
+#~| "<quote>Alternative desktop environments</quote>."
+#~ msgid ""
+#~ "If you use the special GNOME-, KDE- or LXDE-variant of the first CD in "
+#~ "the full CD set, the installer installs the respective desktop "
+#~ "environment instead of the default. Some CD images (netinst and DVD) also "
+#~ "allow selection of the desired desktop environment from the graphical "
+#~ "boot menu. Select the <quote>Advanced options</quote> option in the main "
+#~ "menu and look for <quote>Alternative desktop environments</quote>."
+#~ msgstr ""
+#~ "Jotkin romppuotokset (businesscard, netinst ja DVD) sallivat halutun "
+#~ "työpöytäympäristön valinnan myös graafisesta käynnistysvalikosta. Valitse "
+#~ "päävalikosta <quote>Advanced options</quote> ja etsi kohta "
+#~ "<quote>Alternative desktop environments</quote>."
+
+#~ msgid ""
+#~ "The various server tasks will install software roughly as follows. DNS "
+#~ "server: <classname>bind9</classname>; File server: <classname>samba</"
+#~ "classname>, <classname>nfs</classname>; Mail server: <classname>exim4</"
+#~ "classname>, <classname>spamassassin</classname>, <classname>uw-imap</"
+#~ "classname>; Print server: <classname>cups</classname>; SQL database: "
+#~ "<classname>postgresql</classname>; Web server: <classname>apache2</"
+#~ "classname>."
+#~ msgstr ""
+#~ "Palvelintehtävät asentavat ohjelmia suunnilleen seuraavasti. DNS-"
+#~ "palvelin: <classname>bind9</classname>; Tiedostopalvelin: "
+#~ "<classname>samba</classname>, <classname>nfs</classname>; Postipalvelin: "
+#~ "<classname>exim4</classname>, <classname>spamassassin</classname>, "
+#~ "<classname>uw-imap</classname>; Tulostuspalvelin: <classname>cups</"
+#~ "classname>; SQL-palvelin: <classname>postgresql</classname>; WWW-"
+#~ "palvelin: <classname>apache2</classname>."
+
 #~ msgid ""
 #~ "&d-i; supports several encryption methods. The default method is "
 #~ "<firstterm>dm-crypt</firstterm> (included in newer Linux kernels, able to "