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, 59 insertions, 51 deletions

diff --git a/po/zh_TW/installation-howto.po b/po/zh_TW/installation-howto.po
index 3996f4756..469f4de80 100644
--- a/po/zh_TW/installation-howto.po
+++ b/po/zh_TW/installation-howto.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\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: 2005-06-10 01:57+0800\n"
 "Last-Translator: Lin Shu-Fen<satashiohno@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -110,16 +110,24 @@ msgstr "光碟"
 
 #. Tag: para
 #: installation-howto.xml:67
-#, no-c-format
-msgid ""
-"There are two different netinst CD images which can be used to install "
-"&releasename; with the &d-i;. These images are intended to boot from CD and "
-"install additional packages over a network, hence the name 'netinst'. The "
-"difference between the two images is that on the full netinst image the base "
-"packages are included, whereas you have to download these from the web if "
-"you are using the business card image. If you'd rather, you can get a full "
-"size CD image which will not need the network to install. You only need the "
-"first CD of the set."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "There are two different netinst CD images which can be used to install "
+#| "&releasename; with the &d-i;. These images are intended to boot from CD "
+#| "and install additional packages over a network, hence the name 'netinst'. "
+#| "The difference between the two images is that on the full netinst image "
+#| "the base packages are included, whereas you have to download these from "
+#| "the web if you are using the business card image. If you'd rather, you "
+#| "can get a full size CD image which will not need the network to install. "
+#| "You only need the first CD of the set."
+msgid ""
+"The netinst CD image is a popular image which can be used to install "
+"&releasename; with the &d-i;. This image is intended to boot from CD and "
+"install additional packages over a network; hence the name 'netinst'. The "
+"image has the software components needed to run the installer and the base "
+"packages to provide a minimal &releasename; system. If you'd rather, you can "
+"get a full size CD image which will not need the network to install. You "
+"only need the first CD of the set."
 msgstr ""
 "現在有兩種不同的 netinst 光碟映像可以用 &d-i; 安裝 &releasename;。這些映像檔"
 "是為了讓電腦透過光碟機開機，再透過網路上下載安裝額外的軟體套件，'netinst' 的"
@@ -128,7 +136,7 @@ msgstr ""
 "整映像檔，就可以不需透過網路安裝，你只需要一套光碟中的第一片就行了。"
 
 #. Tag: para
-#: installation-howto.xml:78
+#: installation-howto.xml:77
 #, fuzzy, no-c-format
 msgid ""
 "Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-"
@@ -145,13 +153,13 @@ msgstr ""
 "閱 <xref linkend=\"boot-cd\"/>。</phrase>"
 
 #. Tag: title
-#: installation-howto.xml:92
+#: installation-howto.xml:91
 #, no-c-format
 msgid "Floppy"
 msgstr "軟碟"
 
 #. Tag: para
-#: installation-howto.xml:93
+#: installation-howto.xml:92
 #, fuzzy, no-c-format
 msgid ""
 "If you can't boot from CD, you can download floppy images to install "
@@ -163,7 +171,7 @@ msgstr ""
 "img</filename>，也許還需要某張驅動程式磁片。"
 
 #. Tag: para
-#: installation-howto.xml:99
+#: installation-howto.xml:98
 #, no-c-format
 msgid ""
 "The boot floppy is the one with <filename>boot.img</filename> on it. This "
@@ -175,7 +183,7 @@ msgstr ""
 "filename> 的那張磁片。"
 
 #. Tag: para
-#: installation-howto.xml:105
+#: installation-howto.xml:104
 #, fuzzy, no-c-format
 msgid ""
 "If you're planning to install over the network, you will usually need the "
@@ -187,7 +195,7 @@ msgstr ""
 "包含許多種乙太網卡的驅動程式，並支援 PCMCIA 。"
 
 #. Tag: para
-#: installation-howto.xml:112
+#: installation-howto.xml:111
 #, no-c-format
 msgid ""
 "If you have a CD, but cannot boot from it, then boot from floppies and use "
@@ -198,7 +206,7 @@ msgstr ""
 "<filename>floppy/cd-drivers.img</filename> 接著完成透過光碟的安裝。"
 
 #. Tag: para
-#: installation-howto.xml:118
+#: installation-howto.xml:117
 #, no-c-format
 msgid ""
 "Floppy disks are one of the least reliable media around, so be prepared for "
@@ -214,13 +222,13 @@ msgstr ""
 "看 <xref linkend=\"create-floppy\"/> )。記得為這些磁片依序編號。"
 
 #. Tag: title
-#: installation-howto.xml:131
+#: installation-howto.xml:130
 #, no-c-format
 msgid "USB memory stick"
 msgstr "USB 隨身碟"
 
 #. Tag: para
-#: installation-howto.xml:132
+#: installation-howto.xml:131
 #, no-c-format
 msgid ""
 "It's also possible to install from removable USB storage devices. For "
@@ -231,7 +239,7 @@ msgstr ""
 "相當方便的 &debian; 安裝工具。"
 
 #. Tag: para
-#: installation-howto.xml:138
+#: installation-howto.xml:137
 #, no-c-format
 msgid ""
 "The easiest way to prepare your USB memory stick is to download any Debian "
@@ -242,7 +250,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: installation-howto.xml:146
+#: installation-howto.xml:145
 #, fuzzy, no-c-format
 msgid ""
 "The easiest way to prepare your USB memory stick is to download <filename>hd-"
@@ -262,7 +270,7 @@ msgstr ""
 "貝到  USB 隨身碟。檔名沒有限制，只要結尾是 <literal>.iso</literal> 就可以。"
 
 #. Tag: para
-#: installation-howto.xml:157
+#: installation-howto.xml:156
 #, no-c-format
 msgid ""
 "There are other, more flexible ways to set up a memory stick to use the "
@@ -274,7 +282,7 @@ msgstr ""
 "\"boot-usb-files\"/>。"
 
 #. Tag: para
-#: installation-howto.xml:163
+#: installation-howto.xml:162
 #, fuzzy, no-c-format
 msgid ""
 "Some BIOSes can boot USB storage directly, and some cannot. You may need to "
@@ -289,7 +297,7 @@ msgstr ""
 "linkend=\"usb-boot\"/>。"
 
 #. Tag: para
-#: installation-howto.xml:170
+#: installation-howto.xml:169
 #, no-c-format
 msgid ""
 "Booting Macintosh systems from USB storage devices involves manual use of "
@@ -299,13 +307,13 @@ msgstr ""
 "<xref linkend=\"usb-boot\"/>。"
 
 #. Tag: title
-#: installation-howto.xml:179
+#: installation-howto.xml:178
 #, no-c-format
 msgid "Booting from network"
 msgstr "透過網路開機"
 
 #. Tag: para
-#: installation-howto.xml:180
+#: installation-howto.xml:179
 #, no-c-format
 msgid ""
 "It's also possible to boot &d-i; completely from the net. The various "
@@ -317,7 +325,7 @@ msgstr ""
 "的檔案是用來從網路啟動 &d-i; 。"
 
 #. Tag: para
-#: installation-howto.xml:186
+#: installation-howto.xml:185
 #, fuzzy, no-c-format
 msgid ""
 "The easiest thing to set up is probably PXE netbooting. Untar the file "
@@ -334,13 +342,13 @@ msgstr ""
 "\"install-tftp\"/>。"
 
 #. Tag: title
-#: installation-howto.xml:200
+#: installation-howto.xml:199
 #, no-c-format
 msgid "Booting from hard disk"
 msgstr "從硬碟開機"
 
 #. Tag: para
-#: installation-howto.xml:201
+#: installation-howto.xml:200
 #, fuzzy, no-c-format
 msgid ""
 "It's possible to boot the installer using no removable media, but just an "
@@ -360,13 +368,13 @@ msgstr ""
 "到這個目的。</phrase>"
 
 #. Tag: title
-#: installation-howto.xml:218
+#: installation-howto.xml:217
 #, no-c-format
 msgid "Installation"
 msgstr "安裝"
 
 #. Tag: para
-#: installation-howto.xml:219
+#: installation-howto.xml:218
 #, fuzzy, no-c-format
 msgid ""
 "Once the installer starts, you will be greeted with an initial screen. Press "
@@ -386,7 +394,7 @@ msgstr ""
 "para></footnote> </phrase>"
 
 #. Tag: para
-#: installation-howto.xml:225
+#: installation-howto.xml:224
 #, no-c-format
 msgid ""
 "After a while you will be asked to select your language. Use the arrow keys "
@@ -401,7 +409,7 @@ msgstr ""
 "擇。"
 
 #. Tag: para
-#: installation-howto.xml:233
+#: installation-howto.xml:232
 #, no-c-format
 msgid ""
 "You may be asked to confirm your keyboard layout. Choose the default unless "
@@ -411,7 +419,7 @@ msgstr ""
 "一個。"
 
 #. Tag: para
-#: installation-howto.xml:238
+#: installation-howto.xml:237
 #, no-c-format
 msgid ""
 "Now sit back while debian-installer detects some of your hardware, and loads "
@@ -421,7 +429,7 @@ msgstr ""
 "USB 隨身碟或其它設備裡將其餘部分載入系統。"
 
 #. Tag: para
-#: installation-howto.xml:243
+#: installation-howto.xml:242
 #, no-c-format
 msgid ""
 "Next the installer will try to detect your network hardware and set up "
@@ -432,7 +440,7 @@ msgstr ""
 "有連接網路，或是沒有用 DHCP，那麼您也可以手動設定網路。"
 
 #. Tag: para
-#: installation-howto.xml:249
+#: installation-howto.xml:248
 #, no-c-format
 msgid ""
 "The next step is setting up your clock and time zone. The installer will try "
@@ -442,7 +450,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: installation-howto.xml:256
+#: installation-howto.xml:255
 #, fuzzy, no-c-format
 msgid ""
 "Now it is time to partition your disks. First you will be given the "
@@ -456,7 +464,7 @@ msgstr ""
 "話，請在選單中選擇手動分割。"
 
 #. Tag: para
-#: installation-howto.xml:264
+#: installation-howto.xml:263
 #, no-c-format
 msgid ""
 "If you have an existing DOS or Windows partition that you want to preserve, "
@@ -470,7 +478,7 @@ msgstr ""
 "&debian; 更多的安裝空間：只需選擇該分區，並指定新的大小。"
 
 #. Tag: para
-#: installation-howto.xml:271
+#: installation-howto.xml:270
 #, fuzzy, no-c-format
 msgid ""
 "On the next screen you will see your partition table, how the partitions "
@@ -491,7 +499,7 @@ msgstr ""
 "的資訊。"
 
 #. Tag: para
-#: installation-howto.xml:284
+#: installation-howto.xml:283
 #, no-c-format
 msgid ""
 "Now &d-i; formats your partitions and starts to install the base system, "
@@ -501,7 +509,7 @@ msgstr ""
 "安裝核心。"
 
 #. Tag: para
-#: installation-howto.xml:289
+#: installation-howto.xml:288
 #, no-c-format
 msgid ""
 "The base system that was installed earlier is a working, but very minimal "
@@ -516,7 +524,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: installation-howto.xml:301
+#: installation-howto.xml:300
 #, no-c-format
 msgid ""
 "Installation of the base system is followed by setting up user accounts. By "
@@ -526,7 +534,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: installation-howto.xml:308
+#: installation-howto.xml:307
 #, fuzzy, no-c-format
 msgid ""
 "The last step is to install a boot loader. If the installer detects other "
@@ -542,7 +550,7 @@ msgstr ""
 "不讓它這樣做，而是把 GRUB 裝在其它地方。</phrase>"
 
 #. Tag: para
-#: installation-howto.xml:318
+#: installation-howto.xml:317
 #, fuzzy, no-c-format
 msgid ""
 "&d-i; will now tell you that the installation has finished. Remove the cdrom "
@@ -555,7 +563,7 @@ msgstr ""
 "<xref linkend=\"boot-new\"/> 有對它的詳盡說明。"
 
 #. Tag: para
-#: installation-howto.xml:325
+#: installation-howto.xml:324
 #, no-c-format
 msgid ""
 "If you need more information on the install process, see <xref linkend=\"d-i-"
@@ -563,13 +571,13 @@ msgid ""
 msgstr "如果您想要更多的安裝過程相關資訊，請看 <xref linkend=\"d-i-intro\"/>。"
 
 #. Tag: title
-#: installation-howto.xml:334
+#: installation-howto.xml:333
 #, no-c-format
 msgid "Send us an installation report"
 msgstr "請寄給我們一份安裝報告"
 
 #. Tag: para
-#: installation-howto.xml:335
+#: installation-howto.xml:334
 #, no-c-format
 msgid ""
 "If you successfully managed an installation with &d-i;, please take time to "
@@ -580,7 +588,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: installation-howto.xml:345
+#: installation-howto.xml:344
 #, fuzzy, no-c-format
 msgid ""
 "If you did not complete the install, you probably found a bug in debian-"
@@ -595,13 +603,13 @@ msgstr ""
 "了，請參閱 <xref linkend=\"problem-report\"/>。"
 
 #. Tag: title
-#: installation-howto.xml:357
+#: installation-howto.xml:356
 #, fuzzy, no-c-format
 msgid "And finally&hellip;"
 msgstr "最後......"
 
 #. Tag: para
-#: installation-howto.xml:358
+#: installation-howto.xml:357
 #, no-c-format
 msgid ""
 "We hope that your &debian; installation is pleasant and that you find "