Fix incorrect creation of po files - take 2

(my first try (for pt) was not successful, corrupted characters in the po files):
- checkout rev. 68272 (revision before my commit with wrong po files)
- svn update en
- perform usual process to update po and pot files (with merge_xml.awk fixed by nabetaro, thanks!)
- copy changed files to my svn tree
- commit

M    po/ro/using-d-i.po
M    po/pt/partitioning.po
M    po/pt/install-methods.po
M    po/pt/random-bits.po
M    po/pt/preseed.po
M    po/pt/preparing.po
M    po/pt/welcome.po
M    po/pt/using-d-i.po
M    po/pt/hardware.po
M    po/pt/boot-installer.po
M    po/pt/installation-howto.po
M    po/da/boot-installer.po
M    po/ru/install-methods.po
M    po/ru/partitioning.po
M    po/ru/random-bits.po
M    po/ru/preseed.po
M    po/ru/welcome.po
M    po/ru/using-d-i.po
M    po/ru/hardware.po
M    po/ru/boot-installer.po
M    po/ru/installation-howto.po
M    po/sv/install-methods.po
M    po/sv/partitioning.po
M    po/sv/preseed.po
M    po/sv/using-d-i.po
M    po/sv/hardware.po
M    po/sv/boot-installer.po
M    po/sv/installation-howto.po
M    po/ja/install-methods.po
M    po/ja/partitioning.po
M    po/ja/preseed.po
M    po/ja/using-d-i.po
M    po/ja/hardware.po
M    po/ja/boot-installer.po
M    po/ja/installation-howto.po
M    po/zh_TW/install-methods.po
M    po/zh_TW/partitioning.po
M    po/zh_TW/using-d-i.po
M    po/zh_TW/hardware.po
M    po/zh_TW/boot-installer.po
M    po/zh_TW/installation-howto.po
M    po/fi/install-methods.po
M    po/fi/partitioning.po
M    po/fi/preseed.po
M    po/fi/using-d-i.po
M    po/fi/hardware.po
M    po/fi/boot-installer.po
M    po/fi/installation-howto.po
M    po/el/install-methods.po
M    po/el/partitioning.po
M    po/el/preseed.po
M    po/el/using-d-i.po
M    po/el/hardware.po
M    po/el/boot-installer.po
M    po/el/installation-howto.po
M    po/zh_CN/install-methods.po
M    po/zh_CN/partitioning.po
M    po/zh_CN/preseed.po
M    po/zh_CN/using-d-i.po
M    po/zh_CN/hardware.po
M    po/zh_CN/boot-installer.po
M    po/zh_CN/installation-howto.po
M    po/pot/random-bits.pot
M    po/pot/gpl.pot
M    po/pot/preseed.pot
M    po/pot/preparing.pot
M    po/pot/post-install.pot
M    po/pot/boot-new.pot
M    po/pot/welcome.pot
M    po/pot/using-d-i.pot
M    po/pot/hardware.pot
M    po/pot/boot-installer.pot
M    po/pot/installation-howto.pot
M    po/pot/administrivia.pot
M    po/pot/preface.pot
M    po/pot/bookinfo.pot
M    po/pot/install-methods.pot
M    po/pot/partitioning.pot
M    po/es/partitioning.po
M    po/es/install-methods.po
M    po/es/preseed.po
M    po/es/using-d-i.po
M    po/es/hardware.po
M    po/es/boot-installer.po
M    po/es/installation-howto.po
M    po/ko/install-methods.po
M    po/ko/partitioning.po
M    po/ko/preseed.po
M    po/ko/using-d-i.po
M    po/ko/hardware.po
M    po/ko/boot-installer.po
M    po/ko/installation-howto.po
M    po/hu/install-methods.po
M    po/hu/partitioning.po
M    po/hu/preseed.po
M    po/hu/using-d-i.po
M    po/hu/hardware.po
M    po/hu/boot-installer.po
M    po/hu/installation-howto.po
M    po/vi/install-methods.po
M    po/vi/partitioning.po
M    po/vi/preseed.po
M    po/vi/using-d-i.po
M    po/vi/hardware.po
M    po/vi/boot-installer.po
M    po/vi/installation-howto.po

1 files changed, 15 insertions, 41 deletions

diff --git a/po/pt/welcome.po b/po/pt/welcome.po
index 01dbc1285..30aa88de1 100644
--- a/po/pt/welcome.po
+++ b/po/pt/welcome.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 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-10-24 19:53+0000\n"
 "PO-Revision-Date: 2012-09-19 19:54+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -786,25 +786,16 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:484
-#, 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\"/>.)"
+#, 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\"/>.)"
+"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 ""
 "Fazer a instalação de acordo com o <xref linkend=\"d-i-intro\"/>. Isto "
 "involve escolher o seu idioma, configurar módulos de controladores de "
@@ -918,23 +909,15 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:566
-#, 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."
+#, 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 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 ""
 "Chamar ao software <emphasis>livre</emphasis> não significa que o software "
 "não tem direitos de cópia, e não significa que os CDs/DVDs que contêm o "
@@ -946,22 +929,13 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:577
-#, 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."
+#, 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 "
+"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."