summaryrefslogtreecommitdiff
path: root/po/sv/welcome.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/sv/welcome.po')
-rw-r--r--po/sv/welcome.po24
1 files changed, 12 insertions, 12 deletions
diff --git a/po/sv/welcome.po b/po/sv/welcome.po
index cdd1ae0db..6874e9618 100644
--- a/po/sv/welcome.po
+++ b/po/sv/welcome.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: installation-guide 20051025 welcome\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-16 09:12+0000\n"
+"POT-Creation-Date: 2012-09-18 17:24+0000\n"
"PO-Revision-Date: 2011-04-25 09:40+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -788,10 +788,10 @@ msgid ""
"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\"/>.)"
+"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\"/>.)"
msgstr ""
"Genomför den aktuella installationen enligt <xref linkend=\"d-i-intro\"/>. "
"Det här innefattar ditt val av språk, konfiguration av drivrutiner för "
@@ -914,12 +914,12 @@ msgstr ""
#| "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 CDs 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."
+"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."
msgstr ""
"Att kalla programvara för <emphasis>fri</emphasis> betyder inte att "
"programvaran inte är upphovsrättsskyddad och det betyder inte att cd-skivor "
@@ -947,7 +947,7 @@ msgid ""
"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 "
+"userinput> areas of &debian; mirrors or on third-party CD/DVD-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."