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, 77 insertions, 57 deletions

diff --git a/po/pot/random-bits.pot b/po/pot/random-bits.pot
index 323ec4c38..7cba57706 100644
--- a/po/pot/random-bits.pot
+++ b/po/pot/random-bits.pot
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-07-20 14:12+0000\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: application/x-xml2pot; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
@@ -751,7 +751,7 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:405
 #, no-c-format
-msgid "With your current *nix partitioning tools, repartition the hard drive as needed, creating at least one filesystem plus swap. You need around 350MB of space available for a console only install, or about 1GB if you plan to install X (more if you intend to install desktop environments like GNOME or KDE)."
+msgid "With your current *nix partitioning tools, repartition the hard drive as needed, creating at least one filesystem plus swap. You need around &base-system-size;MB of space available for a console only install, or about &task-desktop-lxde-inst;MB if you plan to install X (more if you intend to install desktop environments like GNOME or KDE)."
 msgstr ""
 
 #. Tag: para
@@ -1213,12 +1213,32 @@ msgstr ""
 #. Tag: title
 #: random-bits.xml:816
 #, no-c-format
-msgid "Finishing touches"
+msgid "Remote access: Installing SSH and setting a password"
 msgstr ""
 
 #. Tag: para
 #: random-bits.xml:817
 #, no-c-format
+msgid "In case you can login to the system via console, you can skip this section. If the system should be accessible via the network later on, you need to install SSH and set a password for root:"
+msgstr ""
+
+#. Tag: screen
+#: random-bits.xml:823
+#, no-c-format
+msgid ""
+      "# aptitude install ssh\n"
+      "# passwd"
+msgstr ""
+
+#. Tag: title
+#: random-bits.xml:828
+#, no-c-format
+msgid "Finishing touches"
+msgstr ""
+
+#. Tag: para
+#: random-bits.xml:829
+#, no-c-format
 msgid ""
       "As mentioned earlier, the installed system will be very basic. If you would like to make the system a bit more mature, there is an easy method to install all packages with <quote>standard</quote> priority: <informalexample><screen>\n"
       "# tasksel install standard\n"
@@ -1226,91 +1246,91 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:828
+#: random-bits.xml:840
 #, no-c-format
 msgid "After the installation there will be a lot of downloaded packages in <filename>/var/cache/apt/archives/</filename>. You can free up some diskspace by running:"
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:834
+#: random-bits.xml:846
 #, no-c-format
 msgid "# aptitude clean"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:845
+#: random-bits.xml:857
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:847
+#: random-bits.xml:859
 #, no-c-format
 msgid "This section explains how to install &debian-gnu; on a computer without an Ethernet card, but with just a remote gateway computer attached via a Null-Modem cable (also called Null-Printer cable). The gateway computer should be connected to a network that has a &debian; mirror on it (e.g. to the Internet)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:855
+#: random-bits.xml:867
 #, no-c-format
 msgid "In the example in this appendix we will set up a PLIP connection using a gateway connected to the Internet over a dial-up connection (ppp0). We will use IP addresses 192.168.0.1 and 192.168.0.2 for the PLIP interfaces on the target system and the source system respectively (these addresses should be unused within your network address space)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:863
+#: random-bits.xml:875
 #, no-c-format
 msgid "The PLIP connection set up during the installation will also be available after the reboot into the installed system (see <xref linkend=\"boot-new\"/>)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:868
+#: random-bits.xml:880
 #, no-c-format
 msgid "Before you start, you will need to check the BIOS configuration (IO base address and IRQ) for the parallel ports of both the source and target systems. The most common values are <literal>io=0x378</literal>, <literal>irq=7</literal>."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:878
+#: random-bits.xml:890
 #, no-c-format
 msgid "Requirements"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:881
+#: random-bits.xml:893
 #, no-c-format
 msgid "A target computer, called <emphasis>target</emphasis>, where &debian; will be installed."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:887
+#: random-bits.xml:899
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:904
 #, no-c-format
 msgid "Another computer connected to the Internet, called <emphasis>source</emphasis>, that will function as the gateway."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:898
+#: random-bits.xml:910
 #, no-c-format
 msgid "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;\">PLIP-Install-HOWTO</ulink> for more information on this cable and instructions how to make your own."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:910
+#: random-bits.xml:922
 #, no-c-format
 msgid "Setting up source"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:911
+#: random-bits.xml:923
 #, no-c-format
 msgid "The following shell script is a simple example of how to configure the source computer as a gateway to the Internet using ppp0."
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:916
+#: random-bits.xml:928
 #, no-c-format
 msgid ""
       "#!/bin/sh\n"
@@ -1331,13 +1351,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:922
+#: random-bits.xml:934
 #, no-c-format
 msgid "Installing target"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:923
+#: random-bits.xml:935
 #, no-c-format
 msgid ""
       "Boot the installation media. The installation needs to be run in expert mode; enter <userinput>expert</userinput> at the boot prompt. If you need to set parameters for kernel modules, you also need to do this at the boot prompt. For example, to boot the installer and set values for the <quote>io</quote> and <quote>irq</quote> options for the parport_pc module, enter the following at the boot prompt: <informalexample><screen>\n"
@@ -1346,217 +1366,217 @@ msgid ""
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:942
+#: random-bits.xml:954
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:944
+#: random-bits.xml:956
 #, no-c-format
 msgid "Select the <userinput>plip-modules</userinput> option from the list; this will make the PLIP drivers available to the installation system."
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:952
+#: random-bits.xml:964
 #, no-c-format
 msgid "Detect network hardware"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:957
+#: random-bits.xml:969
 #, no-c-format
 msgid "If target <emphasis>does</emphasis> have a network card, a list of driver modules for detected cards will be shown. If you want to force &d-i; to use plip instead, you have to deselect all listed driver modules. Obviously, if target doesn't have a network card, the installer will not show this list."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:966
+#: random-bits.xml:978
 #, no-c-format
 msgid "Because no network card was detected/selected earlier, the installer will ask you to select a network driver module from a list. Select the <userinput>plip</userinput> module."
 msgstr ""
 
 #. Tag: guimenuitem
-#: random-bits.xml:978
+#: random-bits.xml:990
 #, no-c-format
 msgid "Configure the network"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:981
+#: random-bits.xml:993
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:986
+#: random-bits.xml:998
 #, no-c-format
 msgid "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:1003
 #, no-c-format
 msgid "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></userinput>"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:997
+#: random-bits.xml:1009
 #, no-c-format
 msgid "Name server addresses: you can enter the same addresses used on source (see <filename>/etc/resolv.conf</filename>)"
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1016
+#: random-bits.xml:1028
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1018
+#: random-bits.xml:1030
 #, no-c-format
 msgid "In some countries PPP over Ethernet (PPPoE) is a common protocol for broadband (ADSL or cable) connections to an Internet Service Provider. Setting up a network connection using PPPoE is not supported by default in the installer, but can be made to work very simply. This section explains how."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1026
+#: random-bits.xml:1038
 #, no-c-format
 msgid "The PPPoE connection set up during the installation will also be available after the reboot into the installed system (see <xref linkend=\"boot-new\"/>)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1031
+#: random-bits.xml:1043
 #, no-c-format
 msgid "To have the option of setting up and using PPPoE during the installation, you will need to install using one of the CD-ROM/DVD images that are available. It is not supported for other installation methods (e.g. netboot<phrase condition=\"supports-floppy-boot\"> or floppy</phrase>)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1038
+#: random-bits.xml:1050
 #, no-c-format
 msgid "Installing over PPPoE is mostly the same as any other installation. The following steps explain the differences."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1046
+#: random-bits.xml:1058
 #, no-c-format
 msgid "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</userinput><footnote arch=\"x86\"> <para> See <xref linkend=\"boot-screen\"/> for information on how to add a boot parameter. </para> </footnote>. This will ensure the component responsible for the setup of PPPoE (<classname>ppp-udeb</classname>) will be loaded and run automatically."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1061
+#: random-bits.xml:1073
 #, no-c-format
 msgid "Follow the regular initial steps of the installation (language, country and keyboard selection; the loading of additional installer components<footnote> <para> The <classname>ppp-udeb</classname> component is loaded as one of the additional components in this step. If you want to install at medium or low priority (expert mode), you can also manually select the <classname>ppp-udeb</classname> instead of entering the <quote>modules</quote> parameter at the boot prompt. </para> </footnote>)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1092
 #, no-c-format
 msgid "The next step is the detection of network hardware, in order to identify any Ethernet cards present in the system."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1086
+#: random-bits.xml:1098
 #, no-c-format
 msgid "After this the actual setup of PPPoE is started. The installer will probe all the detected Ethernet interfaces in an attempt to find a PPPoE concentrator (a type of server which handles PPPoE connections)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1092
+#: random-bits.xml:1104
 #, no-c-format
 msgid "It is possible that the concentrator will not to be found at the first attempt. This can happen occasionally on slow or loaded networks or with faulty servers. In most cases a second attempt to detect the concentrator will be successful; to retry, select <guimenuitem>Configure and start a PPPoE connection</guimenuitem> from the main menu of the installer."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1113
 #, no-c-format
 msgid "After a concentrator is found, the user will be prompted to type the login information (the PPPoE username and password)."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1107
+#: random-bits.xml:1119
 #, no-c-format
 msgid "At this point the installer will use the provided information to establish the PPPoE connection. If the correct information was provided, the PPPoE connection should be configured and the installer should be able to use it to connect to the Internet and retrieve packages over it (if needed). If the login information is not correct or some error appears, the installer will stop, but the configuration can be attempted again by selecting the menu entry <guimenuitem>Configure and start a PPPoE connection</guimenuitem>."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1127
+#: random-bits.xml:1139
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1128
+#: random-bits.xml:1140
 #, no-c-format
 msgid "The graphical version of the installer is only available for a limited number of architectures, including &arch-title;. The functionality of the graphical installer is essentially the same as that of the regular installer as it basically uses the same programs, but with a different frontend."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1136
+#: random-bits.xml:1148
 #, no-c-format
 msgid "Although the functionality is identical, the graphical installer still has a few significant advantages. The main advantage is that it supports more languages, namely those that use a character set that cannot be displayed with the regular <quote>newt</quote> frontend. It also has a few usability advantages such as the option to use a mouse, and in some cases several questions can be displayed on a single screen."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1145
+#: random-bits.xml:1157
 #, no-c-format
 msgid "The graphical installer is available with all CD images and with the hd-media installation method. To boot the graphical installer simply select the relevant option from the boot menu. Expert and rescue mode for the graphical installer can be selected from the <quote>Advanced options</quote> menu. The previously used boot methods <userinput>installgui</userinput>, <userinput>expertgui</userinput> and <userinput>rescuegui</userinput> can still be used from the boot prompt which is shown after selecting the <quote>Help</quote> option in the boot menu."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1156
+#: random-bits.xml:1168
 #, no-c-format
 msgid "There is also a graphical installer image that can be netbooted. And there is a special <quote>mini</quote> ISO image<footnote id=\"gtk-miniiso\"> <para> The mini ISO image can be downloaded from a &debian; mirror as described in <xref linkend=\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</filename>. </para> </footnote>, which is mainly useful for testing."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1169
+#: random-bits.xml:1181
 #, no-c-format
 msgid "For &arch-title;, currently only an experimental <quote>mini</quote> ISO image is available<footnote id=\"gtk-miniiso\"> <para> The mini ISO image can be downloaded from a &debian; mirror as described in <xref linkend=\"downloading-files\"/>. Look for <filename>netboot/gtk/mini.iso</filename>. </para> </footnote>. It should work on almost all PowerPC systems that have an ATI graphical card, but is unlikely to work on other systems."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1183
+#: random-bits.xml:1195
 #, no-c-format
 msgid "Just as with the regular installer it is possible to add boot parameters when starting the graphical installer."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1189
+#: random-bits.xml:1201
 #, no-c-format
 msgid "The graphical installer requires significantly more memory to run than the regular installer: &minimum-memory-gtk;. If insufficient memory is available, it will automatically fall back to the regular <quote>newt</quote> frontend."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1196
+#: random-bits.xml:1208
 #, no-c-format
 msgid "If the amount of memory in your system is below &minimum-memory;, the graphical installer may fail to boot at all while booting the regular installer would still work. Using the regular installer is recommended for systems with little available memory."
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:1206
+#: random-bits.xml:1218
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1207
+#: random-bits.xml:1219
 #, no-c-format
 msgid "As already mentioned, the graphical installer basically works the same as the regular installer and thus the rest of this manual can be used to guide you through the installation process."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1213
+#: random-bits.xml:1225
 #, no-c-format
 msgid "If you prefer using the keyboard over the mouse, there are two things you need to know. To expand a collapsed list (used for example for the selection of countries within continents), you can use the <keycap>+</keycap> and <keycap>-</keycap> keys. For questions where more than one item can be selected (e.g. task selection), you first need to tab to the &BTN-CONT; button after making your selections; hitting enter will toggle a selection, not activate &BTN-CONT;."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1223
+#: random-bits.xml:1235
 #, no-c-format
 msgid "If a dialog offers additional help information, a <guibutton>Help</guibutton> button will be displayed. The help information can be accessed either by activating the button or by pressing the <keycap>F1</keycap> key."
 msgstr ""
 
 #. Tag: para
-#: random-bits.xml:1229
+#: random-bits.xml:1241
 #, no-c-format
 msgid "To switch to another console, you will also need to use the <keycap>Ctrl</keycap> key, just as with the X Window System. For example, to switch to VT2 (the first debug shell) you would use: <keycombo> <keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F2</keycap> </keycombo>. The graphical installer itself runs on VT5, so you can use <keycombo> <keycap>Left Alt</keycap> <keycap>F5</keycap> </keycombo> to switch back."
 msgstr ""