Regenerate PO(T) files

1 files changed, 261 insertions, 99 deletions

diff --git a/po/fi/welcome.po b/po/fi/welcome.po
index f20d218c2..18d93a83e 100644
--- a/po/fi/welcome.po
+++ b/po/fi/welcome.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-05 18:28+0000\n"
+"POT-Creation-Date: 2010-10-10 12:35+0000\n"
 "PO-Revision-Date: 2010-05-11 08:46+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -18,17 +18,22 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:4
-#, no-c-format
-msgid "Welcome to Debian"
+#, fuzzy, no-c-format
+#| msgid "Welcome to Debian"
+msgid "Welcome to &debian;"
 msgstr "Tervetuloa Debianin pariin"
 
 #. Tag: para
 #: welcome.xml:5
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This chapter provides an overview of the Debian Project and &debian-gnu;. "
+#| "If you already know about the Debian Project's history and the &debian-"
+#| "gnu; distribution, feel free to skip to the next chapter."
 msgid ""
-"This chapter provides an overview of the Debian Project and &debian-gnu;. If "
-"you already know about the Debian Project's history and the &debian-gnu; "
-"distribution, feel free to skip to the next chapter."
+"This chapter provides an overview of the &debian; Project and &debian-gnu;. "
+"If you already know about the &debian; Project's history and the &debian-"
+"gnu; distribution, feel free to skip to the next chapter."
 msgstr ""
 "Tässä luvussa on katsaus Debian-projektiin ja &debian-gnu; -jakeluun. Jos "
 "olet jo perehtynyt Debian-projektin historiaan ja &debian-gnu; -jakeluun, "
@@ -375,17 +380,29 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:231
-#, no-c-format
-msgid "What is Debian GNU/Linux?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Linux?"
+msgid "What is &debian; GNU/Linux?"
 msgstr "Mitä on Debian GNU/Linux?"
 
 #. Tag: para
 #: welcome.xml:232
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The combination of Debian's philosophy and methodology and the GNU tools, "
+#| "the Linux kernel, and other important free software, form a unique "
+#| "software distribution called Debian GNU/Linux. This distribution is made "
+#| "up of a large number of software <emphasis>packages</emphasis>. Each "
+#| "package in the distribution contains executables, scripts, documentation, "
+#| "and configuration information, and has a <emphasis>maintainer</emphasis> "
+#| "who is primarily responsible for keeping the package up-to-date, tracking "
+#| "bug reports, and communicating with the upstream author(s) of the "
+#| "packaged software. Our extremely large user base, combined with our bug "
+#| "tracking system ensures that problems are found and fixed quickly."
 msgid ""
-"The combination of Debian's philosophy and methodology and the GNU tools, "
+"The combination of &debian;'s philosophy and methodology and the GNU tools, "
 "the Linux kernel, and other important free software, form a unique software "
-"distribution called Debian GNU/Linux. This distribution is made up of a "
+"distribution called &debian; GNU/Linux. This distribution is made up of a "
 "large number of software <emphasis>packages</emphasis>. Each package in the "
 "distribution contains executables, scripts, documentation, and configuration "
 "information, and has a <emphasis>maintainer</emphasis> who is primarily "
@@ -408,9 +425,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:246
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debian's attention to detail allows us to produce a high-quality, stable, "
+#| "and scalable distribution. Installations can be easily configured to "
+#| "serve many roles, from stripped-down firewalls to desktop scientific "
+#| "workstations to high-end network servers."
 msgid ""
-"Debian's attention to detail allows us to produce a high-quality, stable, "
+"&debian;'s attention to detail allows us to produce a high-quality, stable, "
 "and scalable distribution. Installations can be easily configured to serve "
 "many roles, from stripped-down firewalls to desktop scientific workstations "
 "to high-end network servers."
@@ -422,12 +444,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:253
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debian is especially popular among advanced users because of its "
+#| "technical excellence and its deep commitment to the needs and "
+#| "expectations of the Linux community. Debian also introduced many features "
+#| "to Linux that are now commonplace."
 msgid ""
-"Debian is especially popular among advanced users because of its technical "
+"&debian; is especially popular among advanced users because of its technical "
 "excellence and its deep commitment to the needs and expectations of the "
-"Linux community. Debian also introduced many features to Linux that are now "
-"commonplace."
+"Linux community. &debian; also introduced many features to Linux that are "
+"now commonplace."
 msgstr ""
 "Debianin teknisen erinomaisuuden ja tiukan sitoutumisen Linux-yhteisön "
 "odotuksiin ja tarpeisiin ansiosta se on erityisen suosittu edistyneempien "
@@ -435,9 +462,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:260
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For example, Debian was the first Linux distribution to include a package "
+#| "management system for easy installation and removal of software. It was "
+#| "also the first Linux distribution that could be upgraded without "
+#| "requiring reinstallation."
 msgid ""
-"For example, Debian was the first Linux distribution to include a package "
+"For example, &debian; was the first Linux distribution to include a package "
 "management system for easy installation and removal of software. It was also "
 "the first Linux distribution that could be upgraded without requiring "
 "reinstallation."
@@ -449,9 +481,14 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:267
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debian continues to be a leader in Linux development. Its development "
+#| "process is an example of just how well the Open Source development model "
+#| "can work &mdash; even for very complex tasks such as building and "
+#| "maintaining a complete operating system."
 msgid ""
-"Debian continues to be a leader in Linux development. Its development "
+"&debian; continues to be a leader in Linux development. Its development "
 "process is an example of just how well the Open Source development model can "
 "work &mdash; even for very complex tasks such as building and maintaining a "
 "complete operating system."
@@ -463,11 +500,20 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:274
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The feature that most distinguishes Debian from other Linux distributions "
+#| "is its package management system. These tools give the administrator of a "
+#| "Debian system complete control over the packages installed on that "
+#| "system, including the ability to install a single package or "
+#| "automatically update the entire operating system. Individual packages can "
+#| "also be protected from being updated. You can even tell the package "
+#| "management system about software you have compiled yourself and what "
+#| "dependencies it fulfills."
 msgid ""
-"The feature that most distinguishes Debian from other Linux distributions is "
-"its package management system. These tools give the administrator of a "
-"Debian system complete control over the packages installed on that system, "
+"The feature that most distinguishes &debian; from other Linux distributions "
+"is its package management system. These tools give the administrator of a "
+"&debian; system complete control over the packages installed on that system, "
 "including the ability to install a single package or automatically update "
 "the entire operating system. Individual packages can also be protected from "
 "being updated. You can even tell the package management system about "
@@ -483,15 +529,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:285
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "To protect your system against <quote>Trojan horses</quote> and other "
+#| "malevolent software, Debian's servers verify that uploaded packages come "
+#| "from their registered Debian maintainers. Debian packagers also take "
+#| "great care to configure their packages in a secure manner. When security "
+#| "problems in shipped packages do appear, fixes are usually available very "
+#| "quickly. With Debian's simple update options, security fixes can be "
+#| "downloaded and installed automatically across the Internet."
 msgid ""
 "To protect your system against <quote>Trojan horses</quote> and other "
-"malevolent software, Debian's servers verify that uploaded packages come "
-"from their registered Debian maintainers. Debian packagers also take great "
-"care to configure their packages in a secure manner. When security problems "
-"in shipped packages do appear, fixes are usually available very quickly. "
-"With Debian's simple update options, security fixes can be downloaded and "
-"installed automatically across the Internet."
+"malevolent software, &debian;'s servers verify that uploaded packages come "
+"from their registered &debian; maintainers. &debian; packagers also take "
+"great care to configure their packages in a secure manner. When security "
+"problems in shipped packages do appear, fixes are usually available very "
+"quickly. With &debian;'s simple update options, security fixes can be "
+"downloaded and installed automatically across the Internet."
 msgstr ""
 "Debianin palvelimet tarkistavat asennuspalvelimelle siirrettyjen pakettien "
 "tulevan paketin rekisteröidyltä ylläpitäjältä. Näin asentamaasi Debian-"
@@ -504,15 +558,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:295
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The primary, and best, method of getting support for your Debian GNU/"
+#| "Linux system and communicating with Debian Developers is through the many "
+#| "mailing lists maintained by the Debian Project (there are more than &num-"
+#| "of-debian-maillists; at this writing). The easiest way to subscribe to "
+#| "one or more of these lists is visit <ulink url=\"&url-debian-lists-"
+#| "subscribe;\"> Debian's mailing list subscription page</ulink> and fill "
+#| "out the form you'll find there."
 msgid ""
-"The primary, and best, method of getting support for your Debian GNU/Linux "
-"system and communicating with Debian Developers is through the many mailing "
-"lists maintained by the Debian Project (there are more than &num-of-debian-"
-"maillists; at this writing). The easiest way to subscribe to one or more of "
-"these lists is visit <ulink url=\"&url-debian-lists-subscribe;\"> Debian's "
-"mailing list subscription page</ulink> and fill out the form you'll find "
-"there."
+"The primary, and best, method of getting support for your &debian; GNU/Linux "
+"system and communicating with &debian; Developers is through the many "
+"mailing lists maintained by the &debian; Project (there are more than &num-"
+"of-debian-maillists; at this writing). The easiest way to subscribe to one "
+"or more of these lists is visit <ulink url=\"&url-debian-lists-subscribe;\"> "
+"Debian's mailing list subscription page</ulink> and fill out the form you'll "
+"find there."
 msgstr ""
 "Ensisijainen ja paras tapa saada tukea Debian GNU/Linux -järjestelmälle ja "
 "tietojen vaihtoon Debianin kehittäjien kanssa ovat Debian-projektin "
@@ -525,28 +587,42 @@ msgstr ""
 #: welcome.xml:315
 #, fuzzy, no-c-format
 #| msgid "What is Debian GNU/Hurd?"
-msgid "What is Debian GNU/kFreeBSD?"
+msgid "What is &debian; GNU/kFreeBSD?"
 msgstr "Mikä on Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:317
 #, no-c-format
-msgid "Debian GNU/kFreeBSD is a Debian GNU system with the kFreeBSD kernel."
+msgid ""
+"&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:321
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debian GNU/Hurd is a Debian GNU system that replaces the Linux monolithic "
+#| "kernel with the GNU Hurd &mdash; a set of servers running on top of the "
+#| "GNU Mach microkernel. The Hurd is still unfinished, and is unsuitable for "
+#| "day-to-day use, but work is continuing. The Hurd is currently only being "
+#| "developed for the i386 architecture, although ports to other "
+#| "architectures will be made once the system becomes more stable."
 msgid ""
-"This port of Debian is currently only being developed for the i386 and amd64 "
-"architectures, although ports to other architectures is possible."
+"This port of &debian; is currently only being developed for the i386 and "
+"amd64 architectures, although ports to other architectures is possible."
 msgstr ""
+"Debian GNU/Hurd on Debianin GNU-järjestelmä, jossa monoliittinen Linux-ydin "
+"on korvattu GNU Hurdilla, joukolla palvelimia, jotka toimivat GNU Mach -"
+"mikroytimen päällä. Hurd on vielä keskeneräinen ja sopimaton tavalliseen "
+"käyttöön, mutta työtä jatketaan. Hurdia kehitetään tällä hetkellä vain i386-"
+"arkkitehtuurille, mutta siirroksia muille arkkitehtuureille tehdään kunhan "
+"järjestelmä saadaan vakaammaksi."
 
 #. Tag: para
 #: welcome.xml:326
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/kFreeBSD is not a Linux system, and thus some "
+"Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
@@ -559,7 +635,7 @@ msgstr ""
 #| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
-"kfreebsd-gnu/\"> Debian GNU/kFreeBSD ports page</ulink> and the "
+"kfreebsd-gnu/\"> &debian; GNU/kFreeBSD ports page</ulink> and the "
 "<email>debian-bsd@lists.debian.org</email> mailing list."
 msgstr ""
 "Lisää voi lukea <ulink url=\"http://www.debian.org/ports/hurd/\">Debian GNU/"
@@ -568,16 +644,17 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:350
-#, no-c-format
-msgid "What is Debian GNU/Hurd?"
+#, fuzzy, no-c-format
+#| msgid "What is Debian GNU/Hurd?"
+msgid "What is &debian; GNU/Hurd?"
 msgstr "Mikä on Debian GNU/Hurd?"
 
 #. Tag: para
 #: welcome.xml:352
 #, no-c-format
 msgid ""
-"Debian GNU/Hurd is a Debian GNU system with the GNU Hurd &mdash; a set of "
-"servers running on top of the GNU Mach microkernel."
+"&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd &mdash; a set "
+"of servers running on top of the GNU Mach microkernel."
 msgstr ""
 
 #. Tag: para
@@ -607,16 +684,20 @@ msgstr ""
 #: welcome.xml:365
 #, no-c-format
 msgid ""
-"Please note that Debian GNU/Hurd is not a Linux system, and thus some "
+"Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
 "information on Linux system may not apply to it."
 msgstr ""
 
 #. Tag: para
 #: welcome.xml:370
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For more information, see the <ulink url=\"http://www.debian.org/ports/"
+#| "hurd/\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-"
+#| "hurd@lists.debian.org</email> mailing list."
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/hurd/"
-"\"> Debian GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
+"\"> &debian; GNU/Hurd ports page</ulink> and the <email>debian-hurd@lists."
 "debian.org</email> mailing list."
 msgstr ""
 "Lisää voi lukea <ulink url=\"http://www.debian.org/ports/hurd/\">Debian GNU/"
@@ -625,19 +706,26 @@ msgstr ""
 
 #. Tag: title
 #: welcome.xml:387
-#, no-c-format
-msgid "Getting Debian"
+#, fuzzy, no-c-format
+#| msgid "Getting Debian"
+msgid "Getting &debian;"
 msgstr "Debianin hankkiminen"
 
 #. Tag: para
 #: welcome.xml:389
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "Tietoa &debian-gnu; -jakelun noutamisesta Internetistä tai Debian-romppujen "
 "ostopaikoista löytyy <ulink url=\"&url-debian-distrib;\">Debianin "
@@ -647,9 +735,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:398
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debian can be upgraded after installation very easily. The installation "
+#| "procedure will help set up the system so that you can make those upgrades "
+#| "once installation is complete, if need be."
 msgid ""
-"Debian can be upgraded after installation very easily. The installation "
+"&debian; can be upgraded after installation very easily. The installation "
 "procedure will help set up the system so that you can make those upgrades "
 "once installation is complete, if need be."
 msgstr ""
@@ -687,12 +779,17 @@ msgstr "Tämän ohjeen rakenne"
 
 #. Tag: para
 #: welcome.xml:435
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "This document is meant to serve as a manual for first-time Debian users. "
+#| "It tries to make as few assumptions as possible about your level of "
+#| "expertise. However, we do assume that you have a general understanding of "
+#| "how the hardware in your computer works."
 msgid ""
-"This document is meant to serve as a manual for first-time Debian users. It "
-"tries to make as few assumptions as possible about your level of expertise. "
-"However, we do assume that you have a general understanding of how the "
-"hardware in your computer works."
+"This document is meant to serve as a manual for first-time &debian; users. "
+"It tries to make as few assumptions as possible about your level of "
+"expertise. However, we do assume that you have a general understanding of "
+"how the hardware in your computer works."
 msgstr ""
 "Tämä ohje on tarkoitettu käsikirjaksi ensimmäistä kertaa Debiania "
 "käyttäville. Lukijan asiantuntemuksen tasosta pyritään olettamaan "
@@ -701,12 +798,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:442
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Expert users may also find interesting reference information in this "
+#| "document, including minimum installation sizes, details about the "
+#| "hardware supported by the Debian installation system, and so on. We "
+#| "encourage expert users to jump around in the document."
 msgid ""
 "Expert users may also find interesting reference information in this "
 "document, including minimum installation sizes, details about the hardware "
-"supported by the Debian installation system, and so on. We encourage expert "
-"users to jump around in the document."
+"supported by the &debian; installation system, and so on. We encourage "
+"expert users to jump around in the document."
 msgstr ""
 "Asiantuntevat käyttäjätkin löytänevät kiinnostavia tiedonjyväsiä ohjeesta, "
 "muun muassa asennuksen vähimmäiskoosta, Debianin asennusjärjestelmän "
@@ -738,12 +840,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:463
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Backup your system, perform any necessary planning and hardware "
+#| "configuration prior to installing Debian, in <xref linkend=\"preparing\"/"
+#| ">. If you are preparing a multi-boot system, you may need to create "
+#| "partitionable space on your hard disk for Debian to use."
 msgid ""
 "Backup your system, perform any necessary planning and hardware "
-"configuration prior to installing Debian, in <xref linkend=\"preparing\"/>. "
-"If you are preparing a multi-boot system, you may need to create "
-"partitionable space on your hard disk for Debian to use."
+"configuration prior to installing &debian;, in <xref linkend=\"preparing\"/"
+">. If you are preparing a multi-boot system, you may need to create "
+"partitionable space on your hard disk for &debian; to use."
 msgstr ""
 "Tee varmuuskopiot, mahdollinen asennussuunnitelma ja laitteiston asetusten "
 "säätö ennen Debianin asentamista, luvussa <xref linkend=\"preparing\"/>. Jos "
@@ -772,15 +879,24 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, no-c-format
+#, fuzzy, 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), 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, "
 "configuring your network connection, so that remaining installation files "
-"can be obtained directly from a Debian server (if you are not installing "
+"can be obtained directly from a &debian; server (if you are not installing "
 "from a CD), 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="
+"the partitions for your &debian; system is explained in <xref linkend="
 "\"partitioning\"/>.)"
 msgstr ""
 "Varsinainen asennus tehdään luvun <xref linkend=\"d-i-intro\"/> ohjeilla. "
@@ -803,11 +919,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:505
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Once you've got your system installed, you can read <xref linkend=\"post-"
+#| "install\"/>. That chapter explains where to look to find more information "
+#| "about Unix and Debian, and how to replace your kernel."
 msgid ""
 "Once you've got your system installed, you can read <xref linkend=\"post-"
 "install\"/>. That chapter explains where to look to find more information "
-"about Unix and Debian, and how to replace your kernel."
+"about Unix and &debian;, and how to replace your kernel."
 msgstr ""
 "Kun järjestelmän asennus on valmis, voidaan lukea luku <xref linkend=\"post-"
 "install\"/>. Luvusta ilmenee mistä löytyy lisätietoa Linuxista ja Debianista "
@@ -867,7 +987,18 @@ msgstr "Tekijänoikeuksista ja ohjelmistojen käyttöehdoista"
 
 #. Tag: para
 #: welcome.xml:553
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "We're sure that you've read some of the licenses that come with most "
+#| "commercial software &mdash; they usually say that you can only use one "
+#| "copy of the software on a single computer. This system's license isn't "
+#| "like that at all. We encourage you to put a copy of &debian-gnu; on every "
+#| "computer in your school or place of business. Lend your installation "
+#| "media to your friends and help them install it on their computers! You "
+#| "can even make thousands of copies and <emphasis>sell</emphasis> them "
+#| "&mdash; albeit with a few restrictions. Your freedom to install and use "
+#| "the system comes directly from Debian being based on <emphasis>free "
+#| "software</emphasis>."
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
 "commercial software &mdash; they usually say that you can only use one copy "
@@ -877,7 +1008,7 @@ msgid ""
 "friends and help them install it on their computers! You can even make "
 "thousands of copies and <emphasis>sell</emphasis> them &mdash; albeit with a "
 "few restrictions. Your freedom to install and use the system comes directly "
-"from Debian being based on <emphasis>free software</emphasis>."
+"from &debian; being based on <emphasis>free software</emphasis>."
 msgstr ""
 "Olet varmaankin lukenut joitakin useimpien kaupallisten ohjelmien mukana "
 "tulevista käyttöehdoista &mdash; tavallisesti ohjelmasta saa käyttää yhtä "
@@ -911,16 +1042,25 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The Debian project, as a pragmatic concession to its users, does make "
+#| "some packages available that do not meet our criteria for being free. "
+#| "These packages are not part of the official distribution, however, and "
+#| "are only available from the <userinput>contrib</userinput> or "
+#| "<userinput>non-free</userinput> areas of Debian mirrors or on third-party "
+#| "CD-ROMs; see the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, "
+#| "under <quote>The Debian FTP archives</quote>, for more information about "
+#| "the layout and contents of the archives."
 msgid ""
-"The Debian project, as a pragmatic concession to its users, does make some "
+"The &debian; project, as a pragmatic concession to its users, does make some "
 "packages available that do not meet our criteria for being free. These "
 "packages are not part of the official distribution, however, and are only "
 "available from the <userinput>contrib</userinput> or <userinput>non-free</"
-"userinput> areas of Debian mirrors or on third-party CD-ROMs; see the <ulink "
-"url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>The Debian FTP "
-"archives</quote>, for more information about the layout and contents of the "
-"archives."
+"userinput> areas of &debian; mirrors or on third-party CD-ROMs; see the "
+"<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>The Debian "
+"FTP archives</quote>, for more information about the layout and contents of "
+"the archives."
 msgstr ""
 "Debian-projekti tarjoaa myönnytyksenä käyttäjilleen muutamia paketteja jotka "
 "eivät ole projektin määritelmän mukaan vapaita. Nämä paketit eivät "
@@ -932,7 +1072,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:591
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Many of the programs in the system are licensed under the <emphasis>GNU</"
+#| "emphasis> <emphasis>General Public License</emphasis>, often simply "
+#| "referred to as <quote>the GPL</quote>. The GPL requires you to make the "
+#| "<emphasis>source code</emphasis> of the programs available whenever you "
+#| "distribute a binary copy of the program; that provision of the license "
+#| "ensures that any user will be able to modify the software. Because of "
+#| "this provision, the source code<footnote> <para> For information on how "
+#| "to locate, unpack, and build binaries from Debian source packages, see "
+#| "the <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under "
+#| "<quote>Basics of the Debian Package Management System</quote>. </para> </"
+#| "footnote> for all such programs is available in the Debian system."
 msgid ""
 "Many of the programs in the system are licensed under the <emphasis>GNU</"
 "emphasis> <emphasis>General Public License</emphasis>, often simply referred "
@@ -941,10 +1093,10 @@ msgid ""
 "distribute a binary copy of the program; that provision of the license "
 "ensures that any user will be able to modify the software. Because of this "
 "provision, the source code<footnote> <para> For information on how to "
-"locate, unpack, and build binaries from Debian source packages, see the "
+"locate, unpack, and build binaries from &debian; source packages, see the "
 "<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>Basics of "
 "the Debian Package Management System</quote>. </para> </footnote> for all "
-"such programs is available in the Debian system."
+"such programs is available in the &debian; system."
 msgstr ""
 "Monien järjestelmän ohjelmien käyttöehtona on <emphasis>GNU</emphasis> "
 "<emphasis>yleinen lisenssi</emphasis> (General Public Licence), johon usein "
@@ -960,13 +1112,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:610
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "There are several other forms of copyright statements and software "
+#| "licenses used on the programs in Debian. You can find the copyrights and "
+#| "licenses for every package installed on your system by looking in the "
+#| "file <filename>/usr/share/doc/<replaceable>package-name</replaceable>/"
+#| "copyright </filename> once you've installed a package on your system."
 msgid ""
 "There are several other forms of copyright statements and software licenses "
-"used on the programs in Debian. You can find the copyrights and licenses for "
-"every package installed on your system by looking in the file <filename>/usr/"
-"share/doc/<replaceable>package-name</replaceable>/copyright </filename> once "
-"you've installed a package on your system."
+"used on the programs in &debian;. You can find the copyrights and licenses "
+"for every package installed on your system by looking in the file <filename>/"
+"usr/share/doc/<replaceable>package-name</replaceable>/copyright </filename> "
+"once you've installed a package on your system."
 msgstr ""
 "Muunkinlaisia tekijänoikeusilmoituksia ja ohjelmien käyttöehtoja on käytössä "
 "Debianissa olevissa ohjelmissa. Tekijänoikeudet ja käyttöehdot jokaiselle "
@@ -975,9 +1133,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:620
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For more information about licenses and how Debian determines whether "
+#| "software is free enough to be included in the main distribution, see the "
+#| "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
 msgid ""
-"For more information about licenses and how Debian determines whether "
+"For more information about licenses and how &debian; determines whether "
 "software is free enough to be included in the main distribution, see the "
 "<ulink url=\"&url-dfsg;\">Debian Free Software Guidelines</ulink>."
 msgstr ""