Regenerating po files:

- ./scripts/merge_xml en
- ./scripts/update_pot
- ./scripts/update_po da|el|es|fi|hu|ja|ko|nl|nn|pt|ro|ru|sv|tl|vi|zh_CN|zh_TW

1 files changed, 46 insertions, 20 deletions

diff --git a/po/da/welcome.po b/po/da/welcome.po
index 691803778..637478ab7 100644
--- a/po/da/welcome.po
+++ b/po/da/welcome.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-09-18 17:24+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
 "PO-Revision-Date: 2012-10-10 09:40+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -774,25 +774,34 @@ 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/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, "
 "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\"/>.)"
+"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\"/>.)"
 msgstr ""
 "Gennemfør den aktuelle installation jævnfør <xref linkend=\"d-i-intro\"/>. "
 "Dette indbefatter valg af sprog, konfiguration af perifære drivermoduler, "
 "konfiguration af netværkstilslutning, så at resterende installationsfiler "
 "kan hentes direkte fra en &debian;-server (såfremt du ikke installerer fra "
 "et cd/dvd-sæt), partitionering af dine harddiske og installation af et "
-"grundsystem og efter det valg og installation af opgaver. (Lidt baggrund "
-"om installation af partitioner for dit &debian;-system findes forklaret i "
-"<xref linkend=\"partitioning\"/>.)"
+"grundsystem og efter det valg og installation af opgaver. (Lidt baggrund om "
+"installation af partitioner for dit &debian;-system findes forklaret i <xref "
+"linkend=\"partitioning\"/>.)"
 
 #. Tag: para
 #: welcome.xml:497
@@ -894,15 +903,23 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:566
-#, no-c-format
+#, fuzzy, 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 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."
+"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."
 msgstr ""
 "At kalde programmer for <emphasis>frie</emphasis> betyder ikke, at "
 "programmerne ikke er ophavsretbeskyttet og det betyder ikke, at cd'er/dvd'er "
@@ -914,13 +931,22 @@ 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/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."
 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/DVD-ROMs; see the "
+"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."
@@ -930,8 +956,8 @@ msgstr ""
 "være frie. Disse pakker er dog ikke en del af den officielle udgave og er "
 "kun tilgængelig fra områderne <userinput>contrib</userinput> eller "
 "<userinput>non-free</userinput> på &debian;-spejlene eller på tredjeparts "
-"cd- og dvd-skiver, se <ulink url=\"&url-debian-faq;\">Debian GNU/Linux OSS"
-"</ulink> under <quote>Debians FTP-arkiv</quote> for yderligere information om "
+"cd- og dvd-skiver, se <ulink url=\"&url-debian-faq;\">Debian GNU/Linux OSS</"
+"ulink> under <quote>Debians FTP-arkiv</quote> for yderligere information om "
 "layouttet og indeholdet af arkiverne."
 
 #. Tag: para