some more Dutch strings

author: Marja van Waes <marja@mageia.org> 2013-10-10 17:16:40 +0200
committer: Marja van Waes <marja@mageia.org> 2013-10-10 17:16:40 +0200
commit: 09f1dd8cb4575245a1a88d52db7184306e209e6d (patch)
tree: 4438dcee78d8fcb3c24f7ed50dc678f45ce97ebe /docs
parent: 1d3d422748c2a174bb72f7155689f185ce46c991 (diff)
download: tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.tar
tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.tar.gz
tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.tar.bz2
tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.tar.xz
tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.zip
1 files changed, 1184 insertions, 1199 deletions
diff --git a/docs/mcc-help/nl.po b/docs/mcc-help/nl.po
index 62406663..0172d5dd 100644
--- a/docs/mcc-help/nl.po
+++ b/docs/mcc-help/nl.po
@@ -1,16 +1,14 @@
 # Copyright (C) 2013, Mageia
 # This file is distributed under the same license as the Mageia Control Center Help package.
 # Marja van Waes <marja@mageia.org>, 2013.
-
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2013-10-09 20:58+0400\n"
-"PO-Revision-Date: 2013-10-09 22:17+0200\n"
+"POT-Creation-Date: 2013-10-09 22:11+0400\n"
+"PO-Revision-Date: 2013-10-10 17:06+0200\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
-"Language-Team: Dutch <i18n-nl@nl.mageia.org>\n"
+"Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,11 +36,11 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--dav.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --dav</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --dav</emphasis> as root."
 msgstr ""
-"U kunt dit hulpmiddel op de commandoregel starten, door als root "
-"<emphasis role=\"bold\">diskdrake --dav</emphasis> te typen."
+"U kunt dit hulpmiddel op de commandoregel starten, door als root <emphasis "
+"role=\"bold\">diskdrake --dav</emphasis> te typen."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--dav.xml:24
@@ -56,7 +54,10 @@ msgstr ""
 "label <guilabel>Gedeelde WebDAV-bronnen configureren</guilabel>."
 
 #. type: Content of: <section><section><title>
-#: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21 en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29 en/draksambashare.xml:27 en/drakvpn.xml:16 en/keyboarddrake.xml:17 en/system-config-printer.xml:21
+#: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
+#: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
+#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/keyboarddrake.xml:17
+#: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Introductie"
 
@@ -69,11 +70,11 @@ msgid ""
 "WebDAV server. This is not the aim of this tool to configure the WebDAV "
 "server."
 msgstr ""
-"<link xlink:href=\"http://nl.wikipedia.org/wiki/WebDAV\">WebDAV</link> is een "
-"protocol dat het mogelijk maakt een map op een webserver lokaal te koppelen, "
-"zodat het zich als een lokale map gedraagt. Voorwaarde is, dat de externe "
-"machine een WebDAV server draait. Het configureren van een WebDAV server is "
-"niet het doel van dit gereedschap."
+"<link xlink:href=\"http://nl.wikipedia.org/wiki/WebDAV\">WebDAV</link> is "
+"een protocol dat het mogelijk maakt een map op een webserver lokaal te "
+"koppelen, zodat het zich als een lokale map gedraagt. Voorwaarde is, dat de "
+"externe machine een WebDAV server draait. Het configureren van een WebDAV "
+"server is niet het doel van dit gereedschap."
 
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:40
@@ -84,13 +85,13 @@ msgstr "Een nieuwe ingang maken"
 #: en/diskdrake--dav.xml:42
 msgid ""
 "The first screen of the tool displays the already configured entries, if "
-"any, and a <guibutton>New</guibutton> button. Use it to create a new "
-"entry. Insert the server URL in the field of the new screen."
+"any, and a <guibutton>New</guibutton> button. Use it to create a new entry. "
+"Insert the server URL in the field of the new screen."
 msgstr ""
 "Het eerste scherm van het hulpmiddel laat de reeds geconfigureerde ingangen "
-"zien, indien aanwezig, en een <guibutton>\"Nieuw\"</guibutton> toets. Gebruik "
-"die om een nieuwe ingang te creëren. Geef de URL van de server in het nieuwe "
-"scherm."
+"zien, indien aanwezig, en een <guibutton>\"Nieuw\"</guibutton> toets. "
+"Gebruik die om een nieuwe ingang te creëren. Geef de URL van de server in "
+"het nieuwe scherm."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:46
@@ -102,8 +103,8 @@ msgid ""
 "it, if needed."
 msgstr ""
 "Vervolgens krijgt u een scherm met keuzerondjes waar u bepaalde acties kunt "
-"selecteren.  Ga, door het  betreffende keuzerondje te selecteren en dan op <"
-"guibutton>\"OK\"</guibutton> te klikken, verder met de actie <guibutton>"
+"selecteren.  Ga, door het  betreffende keuzerondje te selecteren en dan op "
+"<guibutton>OK</guibutton> te klikken, verder met de actie <guibutton>"
 "\"Koppelpunt\"</guibutton>. De <guibutton>Server</guibutton> is reeds "
 "geconfigureerd. Indien nodig kunt u deze echter corrigeren."
 
@@ -150,21 +151,20 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:74
 msgid ""
-"After you accepted the configuration with the radio button "
-"<guibutton>Done</guibutton>, the first screen is displayed again and you new "
-"mount point is listed. After you choose <guibutton>Quit</guibutton>, you are "
-"asked to save or not the modifications in "
-"<emphasis>/etc/fstab</emphasis>. Choose this option if you want that the "
-"remote directory is available at each boot. If your configuration is for "
-"one-time usage, do not save it."
-msgstr ""
-"Nadat u de configuratie geaccepteerd heeft door op het keuzerondje <guibutton>"
-"\"Klaar\"</guibutton> te klikken, ziet u het beginscherm weer met uw nieuwe "
-"koppelpunt erop. Als u <guibutton>\"Afsluiten\"</guibutton> kiest, wordt u "
-"gevraagd of u de aanpassingen in <emphasis>/etc/fstab</emphasis> wilt "
-"bewaren. Kies hiervoor als u wilt dat de externe map elke keer dat u uw "
-"computer start, beschikbaar is. Kies \"Nee\" als uw configuratie slechts voor "
-"éénmalig gebruik is."
+"After you accepted the configuration with the radio button <guibutton>Done</"
+"guibutton>, the first screen is displayed again and you new mount point is "
+"listed. After you choose <guibutton>Quit</guibutton>, you are asked to save "
+"or not the modifications in <emphasis>/etc/fstab</emphasis>. Choose this "
+"option if you want that the remote directory is available at each boot. If "
+"your configuration is for one-time usage, do not save it."
+msgstr ""
+"Nadat u de configuratie geaccepteerd heeft door op het keuzerondje "
+"<guibutton>\"Klaar\"</guibutton> te klikken, ziet u het beginscherm weer met "
+"uw nieuwe koppelpunt erop. Als u <guibutton>\"Afsluiten\"</guibutton> kiest, "
+"wordt u gevraagd of u de aanpassingen in <emphasis>/etc/fstab</emphasis> "
+"wilt bewaren. Kies hiervoor als u wilt dat de externe map elke keer dat u uw "
+"computer start, beschikbaar is. Kies \"Nee\" als uw configuratie slechts "
+"voor éénmalig gebruik is."
 
 #. type: Content of: <section><info><title>
 #: en/diskdrake--fileshare.xml:3
@@ -180,19 +180,21 @@ msgstr "diskdrake --fileshare"
 #: en/diskdrake--fileshare.xml:10
 msgid ""
 "<imageobject> <imagedata fileref=\"diskdrake--fileshare.png\" revision=\"1\" "
-"xml:id=\"diskdrake--fileshare-im1\" align=\"center\" format=\"PNG\" /> "
-"</imageobject>"
+"xml:id=\"diskdrake--fileshare-im1\" align=\"center\" format=\"PNG\" /> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"diskdrake--fileshare.png\" revision=\"1\" "
-"xml:id=\"diskdrake--fileshare-im1\" align=\"center\" format=\"PNG\" /> "
-"</imageobject>"
+"xml:id=\"diskdrake--fileshare-im1\" align=\"center\" format=\"PNG\" /> </"
+"imageobject>"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--fileshare.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --fileshare</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --fileshare</emphasis> as root."
 msgstr ""
+"U kunt deze tool starten door als root <emphasis role= \"bold\">diskdrake "
+"--fileshare</emphasis> te typen op de commandoregel."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:15
@@ -202,6 +204,10 @@ msgid ""
 "subdirectories with other users of a same local network which may have "
 "computers running either Linux or Windows operating system."
 msgstr ""
+"Dit eenvoudige hulpmiddel<placeholder type=\"footnote\" id=\"0\"/> geeft u, "
+"de beheerder, de mogelijkheid gebruikers toe te staan een deel van hun /home "
+"submappen te delen met gebruikers op hetzelfde lokale netwerk, die een Linux "
+"of Windows besturingssysteem hebben draaien."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:20
@@ -209,6 +215,8 @@ msgid ""
 "It is found in the Mageia Control Center, under the Local Disk tab, labelled "
 "\"Share your hard disk partitions\"."
 msgstr ""
+"Het is in het Mageia Configuratiecentrum te vinden, onder de tab \"Lokale "
+"schijven\", en gelabeld \"Uw schijfpartities delen\"."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:23
@@ -222,6 +230,14 @@ msgid ""
 "directories must belong to the fileshare group, which is automatically "
 "created by the system. You will be asked about this later."
 msgstr ""
+"Beantwoord allereerst de vraag : \"<guilabel>Wilt U gebruikers toestaan om "
+"enkele eigen mappen te delen?</guilabel>\". Zo nee, klik dan op <guibutton>"
+"Niet delen</guibutton>. Klik op <guibutton>Alle gebruikers toestaan<"
+"/guibutton> om allen dat recht te geven en op <guibutton>Aangepast</guibutton>"
+" als het antwoord \"nee\" is voor sommige gebruikers en \"ja\" voor de rest. "
+"In het laatste geval moeten de gebruikers die submappen mogen delen aan de "
+"groep \"fileshare\" toegevoegd worden, die automatisch door het systeem "
+"gemaakt wordt. U krijgt hier nog een vraag over."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:32
@@ -233,6 +249,12 @@ msgid ""
 "Linux and Windows machines and then click on <guibutton>OK</guibutton>. Any "
 "required packages will be installed if necessary."
 msgstr ""
+"Klik op <guilabel>OK</guilabel>, een tweede scherm verschijnt waarin u "
+"gevraagd wordt <guibutton>NFS</guibutton> en/of <guibutton>SMB</guibutton> te "
+"kiezen. Check <guibutton>NFS</guibutton> als Linux het enige "
+"besturingssysteem is op het netwerk, check <guibutton>SMB</guibutton> als het "
+"netwerk ook Windows machines bevat. Klik vervolgens op <guibutton>OK<"
+"/guibutton>. Zo nodig zullen benodigde pakketten geïnstalleerd worden."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:39
@@ -245,6 +267,14 @@ msgid ""
 "fileshare group and click on <guibutton>OK</guibutton>. For more information "
 "about Userdrake, see <link ns2:href=\"userdrake.xml\">this page</link>"
 msgstr ""
+"De configuratie is nu gereed, tenzij voor een aangepaste configuratie werd "
+"gekozen. In dat geval nodigt een extra scherm u uit Userdrake te op te "
+"starten. Daarmee kunt u gebruikers die u toe wil staan mappen te delen, aan "
+"de fileshare groep toevoegen. Klik hiertoe in de tab \"Gebruikers\" op de "
+"betreffende gebruiker, dan op \"Bewerken\" en zet vervolgens in de tab "
+"\"Groepen\" een vinkje voor \"fileshare\".  Klik daarna op OK. Voor meer "
+"informatie over Userdrake, zie <link ns2:href=\"userdrake.xml\">deze pagina<"
+"/link>."
 
 #. type: Content of: <section><note><para>
 #: en/diskdrake--fileshare.xml:50
@@ -252,6 +282,8 @@ msgid ""
 "When adding a new user to the fileshare group, you have to disconnect and "
 "reconnect the network for the modifications to be taken into account."
 msgstr ""
+"Als u een nieuwe gebruiker aan de fileshare groep heeft toegevoegd, moet u de "
+"netwerkverbinding verbreken en opnieuw starten om de aanpassing te verwerken."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:55
@@ -260,11 +292,15 @@ msgid ""
 "file manager the directories to be shared, although not all file managers "
 "have this facility."
 msgstr ""
+"Van nu af aan kan elke gebruiker die tot de fileshare-groep hoort, in de "
+"belangijkste bestandsbeheerders aangeven welke mappen gedeeld moeten worden. "
+"Helaas bieden niet alle bestandsbeheerders deze mogelijkheid."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/mageia-doc-readme.xml:3 en/mcc-boot.xml:3 en/mcc-hardware.xml:2 en/mcc-localdisks.xml:3 en/mcc-networkservices.xml:2 en/mcc-networksharing.xml:2 en/mcc-network.xml:1 en/mcc-security.xml:3 en/mcc-sharing.xml:2 en/mcc-system.xml:2 en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
-msgstr ""
+msgstr "nl"
 
 #. type: Content of: <section><info><title>
 #: en/diskdrake--nfs.xml:3
@@ -279,9 +315,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/diskdrake--nfs.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"2\" xml:id=\"diskdrake--nfs-im1\" "
-"align=\"center\" fileref=\"diskdrake--nfs.png\" format=\"PNG\"/> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"2\" xml:id=\"diskdrake--nfs-im1\" align="
+"\"center\" fileref=\"diskdrake--nfs.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -292,8 +327,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/diskdrake--nfs.xml:25
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --nfs</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --nfs</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -302,9 +337,9 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to declare "
 "some shared directories to be accessible to all users on the machine. The "
 "protocol used for this is NFS which is available on most Linux or Unix "
-"systems. The shared directory will be thus available directly at "
-"boot. Shared directories can be also accessible directly in a single session "
-"for a user with tools such as file browsers."
+"systems. The shared directory will be thus available directly at boot. "
+"Shared directories can be also accessible directly in a single session for a "
+"user with tools such as file browsers."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -395,24 +430,28 @@ msgstr ""
 #: en/diskdrake--removable.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"diskdrake--removable-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"diskdrake--removable.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"diskdrake--removable.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake--removable.xml:12 en/drakinvictus.xml:12 en/draknetcenter.xml:187 en/draknetprofile.xml:12 en/drakups.xml:12 en/drakwizard_apache2.xml:12 en/drakwizard_bind.xml:12 en/drakwizard_dhcp.xml:12 en/drakwizard_ntp.xml:12 en/drakwizard_proftpd.xml:12 en/drakwizard_squid.xml:12 en/drakwizard_sshd.xml:12 en/drakxservices.xml:12 en/msecgui.xml:12
+#: en/diskdrake--removable.xml:12 en/drakinvictus.xml:12
+#: en/draknetcenter.xml:187 en/draknetprofile.xml:12 en/drakups.xml:12
+#: en/drakwizard_apache2.xml:12 en/drakwizard_bind.xml:12
+#: en/drakwizard_dhcp.xml:12 en/drakwizard_ntp.xml:12
+#: en/drakwizard_proftpd.xml:12 en/drakwizard_squid.xml:12
+#: en/drakwizard_sshd.xml:12 en/drakxservices.xml:12 en/msecgui.xml:12
 msgid ""
 "This page hasn't been written yet for lack of resources. If you think you "
-"can write this help, please contact <link "
-"ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the Doc "
-"team.</link> Thanking you in advance."
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/diskdrake--removable.xml:14
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --removable</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --removable</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -428,8 +467,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/diskdrake--smb.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --smb</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --smb</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -505,8 +544,7 @@ msgid ""
 "After accepting the configuration with the Done button, a message will ask "
 "\"Do you want to save the /etc/fstab modifications\". Saving, will allow "
 "directory to made available at each boot, if the network is accessible. The "
-"new directory is then available in your file browser, for example in "
-"dolphin."
+"new directory is then available in your file browser, for example in dolphin."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
@@ -528,15 +566,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drak3d.xml:9
 msgid ""
-"<imageobject> <imagedata xml:id=\"drak3d-im1\" revision=\"1\" "
-"align=\"center\" fileref=\"drak3d.png\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"drak3d-im1\" revision=\"1\" align=\"center"
+"\" fileref=\"drak3d.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drak3d.xml:18
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drak3d</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drak3d</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -565,10 +603,9 @@ msgstr ""
 msgid ""
 "After starting drak3d, you will be presented with a menu window.  Here you "
 "can choose either <guilabel>No 3D Desktop Effects</guilabel> or "
-"<guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a "
-"composite/window manager, which includes hardware-accelerated special "
-"effects for your desktop. Choose <guilabel>Compiz Fusion</guilabel> to turn "
-"it on."
+"<guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a composite/"
+"window manager, which includes hardware-accelerated special effects for your "
+"desktop. Choose <guilabel>Compiz Fusion</guilabel> to turn it on."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -576,16 +613,16 @@ msgstr ""
 msgid ""
 "If this is your first time using this program after a clean installation of "
 "Mageia, you will get a warning message telling you which packages need to be "
-"installed in order to use Compiz Fusion. Click on the "
-"<guibutton>Ok</guibutton> button to continue."
+"installed in order to use Compiz Fusion. Click on the <guibutton>Ok</"
+"guibutton> button to continue."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/drak3d.xml:44
 msgid ""
-"<imageobject> <imagedata xml:id=\"drak3d-im3\" "
-"fileref=\"drak3d_installing_CompizFusion.png\" align=\"center\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"drak3d-im3\" fileref="
+"\"drak3d_installing_CompizFusion.png\" align=\"center\" format=\"PNG\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -624,9 +661,8 @@ msgstr ""
 #. type: Content of: <section><section><section><mediaobject>
 #: en/drak3d.xml:70
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"drak3d_troubleshooting_login_option.png\" format=\"PNG\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref="
+"\"drak3d_troubleshooting_login_option.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
@@ -651,15 +687,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakauth.xml:15
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"drakauth.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"drakauth-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"drakauth.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"drakauth-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakauth.xml:21
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakauth</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakauth</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -690,16 +726,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakboot--boot.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"drakboot--boot.png\" "
-"align=\"center\" xml:id=\"drakboot--boot-im1\" format=\"PNG\"/> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"drakboot--boot.png\" align="
+"\"center\" xml:id=\"drakboot--boot-im1\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:15 en/drakboot--boot.xml:126
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakboot --boot</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot --boot</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -730,20 +765,20 @@ msgid ""
 "In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
 "choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
 "with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot "
-"device</guibutton>, don't change anything here unless you are an expert. The "
-"boot device is where the bootloader is installed and any modification can "
-"prevent you machine from booting."
+"no other consequences. You can also set the <guibutton>Boot device</"
+"guibutton>, don't change anything here unless you are an expert. The boot "
+"device is where the bootloader is installed and any modification can prevent "
+"you machine from booting."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:36
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
-"the <guibutton>Delay before booting default image</guibutton>, in "
-"seconds. During this delay, grub or Lilo will display the list of available "
-"operating systems, prompting you to make your choice, if no selection is "
-"made, the bootloader will boot the default one once the delay elapses."
+"the <guibutton>Delay before booting default image</guibutton>, in seconds. "
+"During this delay, grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice, if no selection is made, the "
+"bootloader will boot the default one once the delay elapses."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -794,8 +829,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:66
 msgid ""
-"<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local "
-"APIC:</guibutton>"
+"<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
+"guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -903,15 +938,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakboot.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"drakboot-im1\" "
-"fileref=\"drakboot.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"drakboot-im1\" fileref="
+"\"drakboot.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakboot.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakboot</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -938,10 +973,10 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakboot.xml:28
 msgid ""
-"Check <guibutton>Launch the graphical environment when your system "
-"starts</guibutton>, if you want X Window System to be executed after the "
-"boot. If not, the system will start in text mode. Nevertheless, it will be "
-"possible to launch the graphic interface manually."
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -975,17 +1010,17 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakclock.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakclock</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakclock</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the tab "
-"System in the Mageia Control Center labelled <guilabel>\"Manage date and "
-"time\"</guilabel>. In some desktop environments it is also available by a "
-"right click / Adjust date and Time ... on the clock in the system tray."
+"System in the Mageia Control Center labelled <guilabel>\"Manage date and time"
+"\"</guilabel>. In some desktop environments it is also available by a right "
+"click / Adjust date and Time ... on the clock in the system tray."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -996,20 +1031,19 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakclock.xml:23
 msgid ""
-"On the upper left part, is the <emphasis "
-"role=\"bold\">calendar</emphasis>. On the screenshot above, the date is "
-"September (on the upper left), 2012 (on the upper right), the 2nd (in blue)  "
-"and it is a Sunday. Select the month (or year) by clicking on the little "
-"arrows on each side of September (or 2012). Select the day by clicking on "
-"its number."
+"On the upper left part, is the <emphasis role=\"bold\">calendar</emphasis>. "
+"On the screenshot above, the date is September (on the upper left), 2012 (on "
+"the upper right), the 2nd (in blue)  and it is a Sunday. Select the month "
+"(or year) by clicking on the little arrows on each side of September (or "
+"2012). Select the day by clicking on its number."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:29
 msgid ""
-"On the bottom left is the <emphasis role=\"bold\">Network Time "
-"Protocol</emphasis> synchronising, it is possible to have a clock always on "
-"time by synchronising it with a server. Check <guilabel>Enable Network Time "
+"On the bottom left is the <emphasis role=\"bold\">Network Time Protocol</"
+"emphasis> synchronising, it is possible to have a clock always on time by "
+"synchronising it with a server. Check <guilabel>Enable Network Time "
 "Protocol</guilabel> and choose the closest server."
 msgstr ""
 
@@ -1053,22 +1087,22 @@ msgstr ""
 #: en/drakconnect--del.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"drakconnect--del-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakconnect--del.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"drakconnect--del.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakconnect--del.xml:12
 msgid ""
-"You can also start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconnect --del</emphasis> as root."
+"You can also start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconnect --del</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakconnect--del.xml:12
 msgid ""
-"Here, you can delete a network interface<placeholder type=\"footnote\" "
-"id=\"0\"/>."
+"Here, you can delete a network interface<placeholder type=\"footnote\" id="
+"\"0\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1098,15 +1132,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakconnect.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"drakconnect-im1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakconnect.png\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"drakconnect-im1\" align="
+"\"center\" format=\"PNG\" fileref=\"drakconnect.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakconnect.xml:19
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconnect</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconnect</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -1201,8 +1235,8 @@ msgstr ""
 #: en/drakconnect.xml:95 en/drakconnect.xml:232 en/drakconnect.xml:599
 msgid ""
 "the HOSTNAME required by DHCP. Only use this option if the DHCP server "
-"requires the client to specify a hostname before receiving an IP "
-"address. This option is not dealt by some DHCP servers."
+"requires the client to specify a hostname before receiving an IP address. "
+"This option is not dealt by some DHCP servers."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
@@ -1230,20 +1264,20 @@ msgstr ""
 #: en/drakconnect.xml:121 en/drakconnect.xml:258
 msgid ""
 "For a residential network, the IP address usually looks like "
-"<emphasis>192.168.x.x</emphasis>, Netmask is "
-"<emphasis>255.255.255.0</emphasis>, and the Gateway and DNS servers are "
-"available from your service provider's website."
+"<emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</"
+"emphasis>, and the Gateway and DNS servers are available from your service "
+"provider's website."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:126
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It would usually be your home domain, i.e. if your "
-"computer is called \"splash\", and it's full domain name is "
-"\"splash.boatanchor.net\", the Search Domain would be "
-"\"boatanchor.net\". Unless you specifically need it, it's ok not to define "
-"this setting. Again, domestic ADSL would not need this setting."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It would usually be your home domain, i.e. if your computer is "
+"called \"splash\", and it's full domain name is \"splash.boatanchor.net\", "
+"the Search Domain would be \"boatanchor.net\". Unless you specifically need "
+"it, it's ok not to define this setting. Again, domestic ADSL would not need "
+"this setting."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject>
@@ -1252,7 +1286,9 @@ msgid "<imageobject> <imagedata fileref=\"drakconnect30.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/drakconnect.xml:142 en/drakconnect.xml:279 en/drakconnect.xml:351 en/drakconnect.xml:458 en/drakconnect.xml:636 en/drakconnect.xml:688 en/drakconnect.xml:780
+#: en/drakconnect.xml:142 en/drakconnect.xml:279 en/drakconnect.xml:351
+#: en/drakconnect.xml:458 en/drakconnect.xml:636 en/drakconnect.xml:688
+#: en/drakconnect.xml:780
 msgid "The next steps are exposed at <xref linkend=\"drakconnect-end\"/>"
 msgstr ""
 
@@ -1262,12 +1298,12 @@ msgid "A new Satellite connection (DVB)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakconnect.xml:152 en/drakconnect.xml:696 en/draknetcenter.xml:136 en/draknetcenter.xml:142 en/draknetcenter.xml:203
+#: en/drakconnect.xml:152 en/drakconnect.xml:696 en/draknetcenter.xml:136
+#: en/draknetcenter.xml:142 en/draknetcenter.xml:203
 msgid ""
 "This section hasn't been written yet for lack of resources. If you think you "
-"can write this help, please contact <link "
-"ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the Doc "
-"team.</link> Thanking you in advance."
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -1318,12 +1354,12 @@ msgstr ""
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:263
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It would usually be your home domain, i.e. if your "
-"computer is called \"splash\", and it's full domain name is "
-"\"splash.boatanchor.net\", the Search Domain would be "
-"\"boatanchor.net\". Unless you specifically need it, it's ok not to define "
-"this setting. Again, domestic connection would not need this setting."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It would usually be your home domain, i.e. if your computer is "
+"called \"splash\", and it's full domain name is \"splash.boatanchor.net\", "
+"the Search Domain would be \"boatanchor.net\". Unless you specifically need "
+"it, it's ok not to define this setting. Again, domestic connection would not "
+"need this setting."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject>
@@ -1347,8 +1383,8 @@ msgstr ""
 #: en/drakconnect.xml:296 en/drakconnect.xml:663
 msgid ""
 "A list of providers is proposed, classified by countries.  Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider gave."
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave."
 msgstr ""
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
@@ -1434,8 +1470,8 @@ msgstr ""
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:375
 msgid ""
-"A list of hardware is proposed, classified by category and "
-"manufacturer. Select your card."
+"A list of hardware is proposed, classified by category and manufacturer. "
+"Select your card."
 msgstr ""
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1452,9 +1488,9 @@ msgstr ""
 #: en/drakconnect.xml:395
 msgid ""
 "A list of providers is then offered, classified by countries.  Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider gave "
-"you. Then it is asked for parameters:"
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave you. Then it is "
+"asked for parameters:"
 msgstr ""
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1623,12 +1659,12 @@ msgstr ""
 #: en/drakconnect.xml:561
 msgid ""
 "<emphasis>IP settings</emphasis>: you have to select if DNS servers are "
-"declared by the DHCP server or are manually specified, as explained "
-"below. In the last case, IP address of DNS servers has to be set. The "
-"HOSTNAME of the computer can be specified here.  If no HOSTNAME is "
-"specified, the name localhost.localdomain is attributed by default. The "
-"Hostname can also be provided by the DHCP server with the option "
-"<emphasis>Assign host name from DHCP server</emphasis>"
+"declared by the DHCP server or are manually specified, as explained below. "
+"In the last case, IP address of DNS servers has to be set. The HOSTNAME of "
+"the computer can be specified here.  If no HOSTNAME is specified, the name "
+"localhost.localdomain is attributed by default. The Hostname can also be "
+"provided by the DHCP server with the option <emphasis>Assign host name from "
+"DHCP server</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1655,17 +1691,17 @@ msgstr ""
 #: en/drakconnect.xml:625
 msgid ""
 "For a residential network, the IP address always looks like "
-"<emphasis>192.168.x.x</emphasis>, Netmask is "
-"<emphasis>255.255.255.0</emphasis>, and the Gateway and DNS servers are "
-"available from your providers website."
+"<emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</"
+"emphasis>, and the Gateway and DNS servers are available from your providers "
+"website."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:630
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It must seem to your hostname without the first name, "
-"before the period."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It must seem to your hostname without the first name, before the "
+"period."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -1738,9 +1774,9 @@ msgstr ""
 #: en/drakconnect.xml:729
 msgid ""
 "A list of providers is proposed, classified by countries. Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider "
-"gave. Then it is asked for Dialup options:"
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave. Then it is asked "
+"for Dialup options:"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1882,16 +1918,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakconsole.xml:9
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakconsole-im1\" "
-"fileref=\"drakconsole.png\" revision=\"1\" align=\"center\" format=\"PNG\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"drakconsole-im1\" fileref=\"drakconsole.png"
+"\" revision=\"1\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakconsole.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconsole</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconsole</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1916,16 +1951,16 @@ msgstr ""
 #: en/drakdisk.xml:14
 msgid ""
 "<imageobject> <imagedata xml:id=\"drakdiskBackup-im1\" revision=\"1\" "
-"fileref=\"drakdiskBackup.png\" align=\"center\" format=\"PNG\"/> "
-"</imageobject>"
+"fileref=\"drakdiskBackup.png\" align=\"center\" format=\"PNG\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para><footnote><para>
 #: en/drakdisk.xml:21
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakdisk</emphasis> or <emphasis "
-"role=\"bold\">diskdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
+"as root."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -1934,8 +1969,8 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
 "partition or even to erasing the entire hard disk. For that reason, you'll "
-"see the screen above on top of the tool screen. Click on "
-"<emphasis>Exit</emphasis> if you're not sure you want to continue."
+"see the screen above on top of the tool screen. Click on <emphasis>Exit</"
+"emphasis> if you're not sure you want to continue."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1948,9 +1983,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakdisk.xml:34
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"xml:id=\"drakdisk-im1\" fileref=\"drakdisk.png\" format=\"PNG\"/> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"drakdisk-"
+"im1\" fileref=\"drakdisk.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1959,10 +1993,9 @@ msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
 "resizing them or changing the filesystem, formatting or viewing what is in a "
-"partition: it is all possible. The <emphasis><guibutton>Clear "
-"all</guibutton></emphasis> button at the bottom is to erase the complete "
-"disk, the other buttons become visible on the right after you click on a "
-"partition."
+"partition: it is all possible. The <emphasis><guibutton>Clear all</"
+"guibutton></emphasis> button at the bottom is to erase the complete disk, "
+"the other buttons become visible on the right after you click on a partition."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1995,9 +2028,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakdisk.xml:62
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakdiskMountedPartition-im1\" "
-"revision=\"1\" fileref=\"drakdiskMountedPartition.png\" align=\"center\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"drakdiskMountedPartition-im1\" revision="
+"\"1\" fileref=\"drakdiskMountedPartition.png\" align=\"center\" format=\"PNG"
+"\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2011,9 +2044,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakdisk.xml:72
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"xml:id=\"drakdiskExpertUnmounted-im1\" align=\"center\" "
-"fileref=\"drakdiskExpertUnmounted.png\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"drakdiskExpertUnmounted-"
+"im1\" align=\"center\" fileref=\"drakdiskExpertUnmounted.png\" format=\"PNG"
+"\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2029,15 +2062,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakedm.xml:11
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakedm-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakedm.png\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"drakedm-im1\" revision=\"1\" align=\"center"
+"\" format=\"PNG\" fileref=\"drakedm.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakedm.xml:17
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakedm</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakedm</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2051,9 +2084,9 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakedm.xml:24
 msgid ""
-"Most users will only notice that the provided login screens look "
-"different. However, there are differences in supported features, too. LXDM "
-"is a lightweight display manager, KDM and GDM have more extras."
+"Most users will only notice that the provided login screens look different. "
+"However, there are differences in supported features, too. LXDM is a "
+"lightweight display manager, KDM and GDM have more extras."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2069,15 +2102,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakfirewall.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"drakfirewall.png\" "
-"align=\"center\" xml:id=\"drakfirewall-im1\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"drakfirewall.png\" align="
+"\"center\" xml:id=\"drakfirewall-im1\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakfirewall.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakfirewall</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakfirewall</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2222,8 +2255,8 @@ msgstr ""
 #. type: Content of: <section><info><abstract><para>
 #: en/drakfloppy-sect1.xml:7
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" "
-"id=\"1\"/><placeholder type=\"inlinemediaobject\" id=\"2\"/>If you did not "
+"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id="
+"\"1\"/><placeholder type=\"inlinemediaobject\" id=\"2\"/>If you did not "
 "create a boot disk when you installed your system, this tool allows you to "
 "do so. This is also a rescue disk which allows you to perform maintenance "
 "tasks on your system in case of failure."
@@ -2240,9 +2273,9 @@ msgid ""
 "If you want to create a <quote>default</quote> boot disk, that is, one that "
 "is based on your current kernel, all you have to do is insert a floppy disk "
 "in the appropriate floppy drive, select that drive from the "
-"<guilabel>Device</guilabel> pull-down list and press the "
-"<guibutton>OK</guibutton> button. A dialog will pop up and remind you that a "
-"diskette must be inserted in the drive. Accept it to create the disk."
+"<guilabel>Device</guilabel> pull-down list and press the <guibutton>OK</"
+"guibutton> button. A dialog will pop up and remind you that a diskette must "
+"be inserted in the drive. Accept it to create the disk."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2261,30 +2294,31 @@ msgstr ""
 #. type: Content of: <section><section><figure><mediaobject>
 #: en/drakfloppy-sect1.xml:51
 msgid ""
-"<imageobject> <imagedata revision=\"2\" "
-"fileref=\"drakfloppy-custom-disk.png\" align=\"center\" width=\"11.5cm\" "
-"format=\"PNG\" xml:id=\"BId-drakfloppy-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"2\" fileref=\"drakfloppy-custom-disk.png"
+"\" align=\"center\" width=\"11.5cm\" format=\"PNG\" xml:id=\"BId-drakfloppy-"
+"im1\"></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><figure>
-#: en/drakfloppy-sect1.xml:46 en/drakx-MNF-chapter.xml:25 en/drakx-MNF-chapter.xml:158 en/drakx-selectLanguage-sect1.xml:9 en/scannerdrake.xml:86
+#: en/drakfloppy-sect1.xml:46 en/drakx-MNF-chapter.xml:25
+#: en/drakx-MNF-chapter.xml:158 en/drakx-selectLanguage-sect1.xml:9
+#: en/scannerdrake.xml:86
 msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" "
-"id=\"1\"/>"
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/drakfloppy-sect1.xml:57
 msgid ""
 "The window has two sections: one containing check boxes with options for "
-"<command>mkinitrd</command>, and another one with the modules "
-"<quote>tree</quote>. Select the modules you need to be added to the "
-"floppy. In this example, we want to use the <acronym>IDE</acronym> tape "
-"module and pre-load it. Use the <guibutton>Remove a module</guibutton> "
-"button to remove the currently selected module. When you are done "
-"customizing the boot disk press the <guibutton>OK</guibutton> button, return "
-"to <application>drakfloppy</application>'s window and then proceed as "
-"indicated above to create the disk."
+"<command>mkinitrd</command>, and another one with the modules <quote>tree</"
+"quote>. Select the modules you need to be added to the floppy. In this "
+"example, we want to use the <acronym>IDE</acronym> tape module and pre-load "
+"it. Use the <guibutton>Remove a module</guibutton> button to remove the "
+"currently selected module. When you are done customizing the boot disk press "
+"the <guibutton>OK</guibutton> button, return to <application>drakfloppy</"
+"application>'s window and then proceed as indicated above to create the disk."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2300,15 +2334,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakfont.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"drakfont-im1\" "
-"fileref=\"drakfont.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"drakfont-im1\" fileref="
+"\"drakfont.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakfont.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakfont</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakfont</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2382,10 +2416,10 @@ msgstr ""
 msgid ""
 "Allows you to add fonts from a third party (CD, internet, ...). The "
 "supported formats are ttf, pfa, pfb, pcf, pfm and gsf. Click on the "
-"<emphasis role=\"bold\">Import</emphasis> button and then on <emphasis "
-"role=\"bold\">Add</emphasis>, a file manager pops up where you can select "
-"the fonts to install, click on <emphasis role=\"bold\">Install</emphasis> "
-"when done. They are installed in the folder /usr/share/fonts."
+"<emphasis role=\"bold\">Import</emphasis> button and then on <emphasis role="
+"\"bold\">Add</emphasis>, a file manager pops up where you can select the "
+"fonts to install, click on <emphasis role=\"bold\">Install</emphasis> when "
+"done. They are installed in the folder /usr/share/fonts."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2408,24 +2442,24 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakguard.xml:9
 msgid ""
-"<imageobject> <imagedata fileref=\"drakguard.png\" revision=\"1\" "
-"xml:id=\"drakguard-im1\" align=\"center\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"drakguard.png\" revision=\"1\" xml:id="
+"\"drakguard-im1\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakguard.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakguard</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakguard</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakguard.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
-"Control Center, under the Security tab, labelled <guilabel>Parental "
-"Control</guilabel>. If you don't see this label, you have to install the "
-"drakguard package (not installed by default)."
+"Control Center, under the Security tab, labelled <guilabel>Parental Control</"
+"guilabel>. If you don't see this label, you have to install the drakguard "
+"package (not installed by default)."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -2458,10 +2492,10 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakguard.xml:40
 msgid ""
-"It restricts access to websites, both manually defined through "
-"blacklists/whitelists, but also dynamically based on the content of the "
-"website. To achieve this Drakguard uses the leading opensource parental "
-"control blocker DansGuardian."
+"It restricts access to websites, both manually defined through blacklists/"
+"whitelists, but also dynamically based on the content of the website. To "
+"achieve this Drakguard uses the leading opensource parental control blocker "
+"DansGuardian."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -2563,8 +2597,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakgw.xml:16
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"drakgw.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"drakgw-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"drakgw.png\" format=\"PNG"
+"\" revision=\"1\" xml:id=\"drakgw-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -2604,8 +2638,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakgw.xml:48
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakgw</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakgw</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2715,8 +2749,7 @@ msgstr ""
 #: en/drakgw.xml:125
 msgid ""
 "If you want to stop sharing the connection on the Mageia computer, launch "
-"the tool. It will offer to reconfigure the connection or to stop the "
-"sharing."
+"the tool. It will offer to reconfigure the connection or to stop the sharing."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2732,23 +2765,22 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakhosts.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"fileref=\"drakhosts.png\" format=\"PNG\" xml:id=\"drakhosts-im1\"/> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"drakhosts."
+"png\" format=\"PNG\" xml:id=\"drakhosts-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakhosts.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakhosts</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakhosts</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:14
 msgid ""
-"If some systems on your network grant you services, and have fixed "
-"IP-addresses, this tool<placeholder type=\"footnote\" id=\"0\"/> allows to "
+"If some systems on your network grant you services, and have fixed IP-"
+"addresses, this tool<placeholder type=\"footnote\" id=\"0\"/> allows to "
 "specify a name to access them more easily. Then you can use that name "
 "instead of the IP-address."
 msgstr ""
@@ -2791,16 +2823,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakinvictus.xml:7
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakinvictus-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakinvictus.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"drakinvictus-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"drakinvictus.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakinvictus.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakinvictus</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakinvictus</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2816,16 +2847,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/draknetcenter.xml:16
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"draknetcenter.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"draknetcenter-im1\"/> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"draknetcenter.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"draknetcenter-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/draknetcenter.xml:22
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknetcenter</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknetcenter</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2851,29 +2881,29 @@ msgstr ""
 #. type: Content of: <section><section><para><inlinemediaobject>
 #: en/draknetcenter.xml:42
 msgid ""
-"<imageobject> <imagedata fileref=\"draknetcenterEthernet-on.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"draknetcenterEthernet-on.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para><inlinemediaobject>
 #: en/draknetcenter.xml:46
 msgid ""
-"<imageobject> <imagedata fileref=\"draknetcenterEthernet-off.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"draknetcenterEthernet-off.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para><inlinemediaobject>
 #: en/draknetcenter.xml:51
 msgid ""
-"<imageobject> <imagedata fileref=\"draknetcenterWireless-off.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"draknetcenterWireless-off.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para><inlinemediaobject>
 #: en/draknetcenter.xml:55
 msgid ""
-"<imageobject> <imagedata fileref=\"draknetcenterWireless-on.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"draknetcenterWireless-on.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2883,10 +2913,10 @@ msgid ""
 "first one is wired and connected, recognizable by this icon <placeholder "
 "type=\"inlinemediaobject\" id=\"0\"/> (this one is not connected<placeholder "
 "type=\"inlinemediaobject\" id=\"1\"/> ) and the second section shows "
-"wireless networks, not connected recognizable by this icon <placeholder "
-"type=\"inlinemediaobject\" id=\"2\"/> and this one <placeholder "
-"type=\"inlinemediaobject\" id=\"3\"/>if connected. For the other network "
-"types, the colour code is always the same, green if connected and red if not "
+"wireless networks, not connected recognizable by this icon <placeholder type="
+"\"inlinemediaobject\" id=\"2\"/> and this one <placeholder type="
+"\"inlinemediaobject\" id=\"3\"/>if connected. For the other network types, "
+"the colour code is always the same, green if connected and red if not "
 "connected."
 msgstr ""
 
@@ -2894,14 +2924,14 @@ msgstr ""
 #: en/draknetcenter.xml:62
 msgid ""
 "In the wireless part of the screen, you can also see all the detected "
-"networks, with the <guilabel>SSID</guilabel>, the <guilabel>Signal "
-"strengh</guilabel>, if they are encrypted (in red) or not (in green), and "
-"the <guilabel>Operating mode</guilabel>. Click on the chosen one and then "
-"either on <guibutton>Monitor</guibutton>, <guibutton>Configure</guibutton> "
-"or <guibutton>Connect</guibutton>. It is possible here to go from a network "
-"to another one. If a private network is selected, the Network Settings "
-"window (see below) will open and ask you for extra settings ( an encryption "
-"key in particular)."
+"networks, with the <guilabel>SSID</guilabel>, the <guilabel>Signal strengh</"
+"guilabel>, if they are encrypted (in red) or not (in green), and the "
+"<guilabel>Operating mode</guilabel>. Click on the chosen one and then either "
+"on <guibutton>Monitor</guibutton>, <guibutton>Configure</guibutton> or "
+"<guibutton>Connect</guibutton>. It is possible here to go from a network to "
+"another one. If a private network is selected, the Network Settings window "
+"(see below) will open and ask you for extra settings ( an encryption key in "
+"particular)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2946,8 +2976,8 @@ msgstr ""
 #. type: Content of: <section><section><note><para>
 #: en/draknetcenter.xml:102
 msgid ""
-"At the bottom of the window is a title <guilabel>Traffic "
-"accounting</guilabel>, we will look at that in the next section."
+"At the bottom of the window is a title <guilabel>Traffic accounting</"
+"guilabel>, we will look at that in the next section."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -2969,8 +2999,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:118
 msgid ""
-"It is possible to change all the settings given during network "
-"creation. Most of the time, checking <guibutton>Automatic IP</guibutton> "
+"It is possible to change all the settings given during network creation. "
+"Most of the time, checking <guibutton>Automatic IP</guibutton> "
 "<guibutton>(BOOTP/DHCP)</guibutton> will do, but in case of problems, manual "
 "configuration may give better results."
 msgstr ""
@@ -2996,8 +3026,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:133
 msgid ""
-"<emphasis role=\"bold\">Allow interface to be controlled by Network "
-"Manager:</emphasis>"
+"<emphasis role=\"bold\">Allow interface to be controlled by Network Manager:"
+"</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3103,16 +3133,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/draknetprofile.xml:7
 msgid ""
-"<imageobject> <imagedata xml:id=\"draknetprofile-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"draknetprofile.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"draknetprofile-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"draknetprofile.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/draknetprofile.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknetprofile</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknetprofile</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3128,8 +3157,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/draknfs.xml:15
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"draknfs.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"draknfs-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"draknfs.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"draknfs-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -3140,8 +3169,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/draknfs.xml:27
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknfs</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknfs</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3191,8 +3220,8 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/draknfs.xml:57
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"draknfs4.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"draknfs-im4\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"draknfs4.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"draknfs-im4\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -3270,9 +3299,8 @@ msgstr ""
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:103
 msgid ""
-"<emphasis>allow real remote root access</emphasis>: turn off root "
-"squashing. This option is mainly useful for diskless clients "
-"(no_root_squash)."
+"<emphasis>allow real remote root access</emphasis>: turn off root squashing. "
+"This option is mainly useful for diskless clients (no_root_squash)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
@@ -3342,8 +3370,8 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/draknfs.xml:146
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"draknfs5.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"draknfs-im5\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"draknfs5.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"draknfs-im5\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
@@ -3375,8 +3403,7 @@ msgstr ""
 #. type: Content of: <section><section><formalpara><para>
 #: en/draknfs.xml:168 en/draksambashare.xml:230
 msgid ""
-"The configuration displayed is reloaded from the current configuration "
-"files."
+"The configuration displayed is reloaded from the current configuration files."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3392,15 +3419,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakproxy.xml:16
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"drakproxy.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"drakproxy-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"drakproxy.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"drakproxy-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakproxy.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakproxy</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakproxy</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -3438,9 +3465,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakrpm-edit-media.xml:11
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakrpm-edit-media-im1\" "
-"fileref=\"drakrpm-edit-media.png\" revision=\"1\" align=\"center\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"drakrpm-edit-media-im1\" fileref=\"drakrpm-"
+"edit-media.png\" revision=\"1\" align=\"center\" format=\"PNG\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><important><para>
@@ -3453,7 +3480,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><note>
-#: en/drakrpm-edit-media.xml:21 en/MageiaUpdate.xml:17 en/MageiaUpdate.xml:32 en/XFdrake.xml:36 en/XFdrake.xml:75 en/XFdrake.xml:89
+#: en/drakrpm-edit-media.xml:21 en/MageiaUpdate.xml:17 en/MageiaUpdate.xml:32
+#: en/XFdrake.xml:36 en/XFdrake.xml:75 en/XFdrake.xml:89
 msgid "<note>"
 msgstr ""
 
@@ -3467,15 +3495,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakrpm-edit-media.xml:26 en/mageia-doc-readme.xml:15 en/MageiaUpdate.xml:21 en/MageiaUpdate.xml:40 en/XFdrake.xml:79
+#: en/drakrpm-edit-media.xml:26 en/mageia-doc-readme.xml:15
+#: en/MageiaUpdate.xml:21 en/MageiaUpdate.xml:40 en/XFdrake.xml:79
 msgid "</note>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakrpm-edit-media.xml:30
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakrpm-edit-media</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakrpm-edit-media</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -3671,8 +3700,8 @@ msgstr ""
 msgid ""
 "Suppose you aren't happy with the actual mirror, because for example it's "
 "too slow or often unavailable, you can choose another mirror. Select all the "
-"actual media and click on <guibutton>Remove</guibutton> to take them "
-"out. Click on <guimenu>File -> Add a specific media mirror</guimenu>, choose "
+"actual media and click on <guibutton>Remove</guibutton> to take them out. "
+"Click on <guimenu>File -> Add a specific media mirror</guimenu>, choose "
 "between update only or the full set (if you do not know, choose the "
 "<guibutton>Full set of sources</guibutton>) and accept the contact by "
 "clicking on <guibutton>Yes</guibutton>. This window opens:"
@@ -3726,9 +3755,9 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:175
 msgid ""
-"This item allows you to choose when to \"Verify RPMs to be installed\" "
-"(always or never), the download program (curl, wget or aria2) and to define "
-"the download policy for information about the packages (on demand -by "
+"This item allows you to choose when to \"Verify RPMs to be installed"
+"\" (always or never), the download program (curl, wget or aria2) and to "
+"define the download policy for information about the packages (on demand -by "
 "default-, update only, always or never)."
 msgstr ""
 
@@ -3742,9 +3771,9 @@ msgstr ""
 msgid ""
 "To guarantee a high level of security, digital keys are used to authenticate "
 "the media. It is possible for each medium to allow or disallow a key. In the "
-"window that appear, select a medium and then click on "
-"<guibutton>Add</guibutton> to allow a new key or to select a key and click "
-"on <guibutton>Remove</guibutton> to disallow that key."
+"window that appear, select a medium and then click on <guibutton>Add</"
+"guibutton> to allow a new key or to select a key and click on "
+"<guibutton>Remove</guibutton> to disallow that key."
 msgstr ""
 
 #. type: Content of: <section><section><para><warning><para>
@@ -3836,8 +3865,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/draksambashare.xml:54
 msgid ""
-"You can start this tool from the command line, by typing<emphasis "
-"role=\"bold\"> draksambashare</emphasis> as root."
+"You can start this tool from the command line, by typing<emphasis role=\"bold"
+"\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3852,8 +3881,7 @@ msgstr ""
 #: en/draksambashare.xml:61
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"draksambashare0.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"draksambashare0-im1\"/> "
-"</imageobject>"
+"format=\"PNG\" revision=\"1\" xml:id=\"draksambashare0-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3867,8 +3895,7 @@ msgstr ""
 #: en/draksambashare.xml:71
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"draksambashare1.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"draksambashare1-im1\"/> "
-"</imageobject>"
+"format=\"PNG\" revision=\"1\" xml:id=\"draksambashare1-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3889,8 +3916,7 @@ msgstr ""
 #: en/draksambashare.xml:85
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"draksambashare2.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"draksambashare2-im1\"/> "
-"</imageobject>"
+"format=\"PNG\" revision=\"1\" xml:id=\"draksambashare2-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3923,8 +3949,7 @@ msgstr ""
 #: en/draksambashare.xml:110
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"draksambashare3.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"draksambashare3-im1\"/> "
-"</imageobject>"
+"format=\"PNG\" revision=\"1\" xml:id=\"draksambashare3-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3958,8 +3983,8 @@ msgstr ""
 #: en/draksambashare.xml:138
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
-"configuration. When accepted, the configuration will be written in "
-"<code>/etc/samba/smb.conf</code>."
+"configuration. When accepted, the configuration will be written in <code>/"
+"etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
@@ -4018,10 +4043,10 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:185
 msgid ""
-"A new entry is thus added. It can be modified with the "
-"<guibutton>Modify</guibutton> button. Options can be edited, such as whether "
-"the directory is visible to the public, writable or browseable.  The share "
-"name can not be modified."
+"A new entry is thus added. It can be modified with the <guibutton>Modify</"
+"guibutton> button. Options can be edited, such as whether the directory is "
+"visible to the public, writable or browseable.  The share name can not be "
+"modified."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
@@ -4078,7 +4103,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:240 en/drakvpn.xml:46 en/logdrake.xml:89 en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157 en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187 en/rpmdrake.xml:222
+#: en/draksambashare.xml:240 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
+#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
+#: en/rpmdrake.xml:222
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
@@ -4114,15 +4142,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/draksec.xml:10
 msgid ""
-"<imageobject> <imagedata xml:id=\"draksec-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"draksec.png\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"draksec-im1\" revision=\"1\" align=\"center"
+"\" format=\"PNG\" fileref=\"draksec.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/draksec.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksec</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksec</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4183,8 +4211,8 @@ msgstr ""
 #: en/draksnapshot-config.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"draksnapshot-config-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"draksnapshot-config.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"draksnapshot-config.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4197,8 +4225,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:14
 msgid ""
-"You can read more about the problem in this bug report: <link "
-"xlink:href=\"https://bugs.mageia.org/show_bug.cgi?id=3032\">bug 3032</link>"
+"You can read more about the problem in this bug report: <link xlink:href="
+"\"https://bugs.mageia.org/show_bug.cgi?id=3032\">bug 3032</link>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4211,8 +4239,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:20
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksnapshot-config</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksnapshot-config</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4228,15 +4256,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/draksound.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"draksound-im1\" "
-"fileref=\"draksound.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"draksound-im1\" fileref="
+"\"draksound.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/draksound.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksound</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksound</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4258,8 +4286,7 @@ msgstr ""
 #: en/draksound.xml:23
 msgid ""
 "The drop down list called <guilabel>Driver</guilabel> allows you to select a "
-"driver from all the ones available on the computer that match the sound "
-"card."
+"driver from all the ones available on the computer that match the sound card."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -4333,15 +4360,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakups.xml:7
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakups-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakups.png\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"drakups-im1\" revision=\"1\" align=\"center"
+"\" format=\"PNG\" fileref=\"drakups.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakups.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakups</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakups</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4357,15 +4384,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakvpn.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"drakvpn-im1\" "
-"align=\"center\" fileref=\"drakvpn1.png\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"drakvpn-im1\" align=\"center"
+"\" fileref=\"drakvpn1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakvpn.xml:19
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakvpn</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakvpn</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -4474,15 +4501,15 @@ msgstr ""
 #: en/drakwizard_apache2.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"drakwizard_apache2-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakwizard_apache2.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"drakwizard_apache2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakwizard_apache2.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard apache2</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard apache2</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4498,16 +4525,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakwizard_bind.xml:7
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakwizard_bind-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakwizard_bind.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"drakwizard_bind-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"drakwizard_bind.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakwizard_bind.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard bind</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard bind</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4523,16 +4549,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakwizard_dhcp.xml:7
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakwizard_dhcp-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakwizard_dhcp.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"drakwizard_dhcp-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"drakwizard_dhcp.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakwizard_dhcp.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard dhcp</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard dhcp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4548,16 +4573,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakwizard_ntp.xml:7
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakwizard_ntp-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakwizard_ntp.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"drakwizard_ntp-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"drakwizard_ntp.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakwizard_ntp.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard ntp</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard ntp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4574,15 +4598,15 @@ msgstr ""
 #: en/drakwizard_proftpd.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"drakwizard_proftpd-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakwizard_proftpd.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"drakwizard_proftpd.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakwizard_proftpd.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard proftpd</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard proftpd</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4599,15 +4623,15 @@ msgstr ""
 #: en/drakwizard_squid.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"drakwizard_squid-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakwizard_squid.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"drakwizard_squid.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakwizard_squid.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard squid</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard squid</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4623,16 +4647,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakwizard_sshd.xml:7
 msgid ""
-"<imageobject> <imagedata xml:id=\"drakwizard_sshd-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"drakwizard_sshd.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"drakwizard_sshd-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"drakwizard_sshd.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakwizard_sshd.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard sshd</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard sshd</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4643,9 +4666,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakx-acceptLicense-sect1.xml:8
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-license.png\" "
-"format=\"PNG\" xml:id=\"BId-drakxid-acceptLicense-im1\" revision=\"3\" "
-"width=\"11.5cm\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-license.png\" format="
+"\"PNG\" xml:id=\"BId-drakxid-acceptLicense-im1\" revision=\"3\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><indexterm><primary>
@@ -4680,9 +4703,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakx-addUser-sect1.xml:7
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx-addUser.png\" "
-"width=\"11.5cm\" align=\"center\" format=\"PNG\" "
-"xml:id=\"BId-drakxid-addUser-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx-addUser.png\" width="
+"\"11.5cm\" align=\"center\" format=\"PNG\" xml:id=\"BId-drakxid-addUser-"
+"im1\"></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><indexterm><primary>
@@ -4726,27 +4749,27 @@ msgid ""
 "will use the first word you type in this field and copy it, all in "
 "lowercase, to the <guimenu>Login name</guimenu> field, which is the name "
 "this user will enter to log on to the system. You can override it and change "
-"the <guimenu>Login Name</guimenu>. The next step is to enter a "
-"password. From a security point of view, a non-privileged (regular) user's "
-"password is not as crucial as the <literal>root</literal> password, but "
-"that's no reason to neglect it by making it blank or too simple: after all, "
-"<emphasis>your</emphasis> files could be the ones at risk."
+"the <guimenu>Login Name</guimenu>. The next step is to enter a password. "
+"From a security point of view, a non-privileged (regular) user's password is "
+"not as crucial as the <literal>root</literal> password, but that's no reason "
+"to neglect it by making it blank or too simple: after all, <emphasis>your</"
+"emphasis> files could be the ones at risk."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakx-addUser-sect1.xml:44
 msgid ""
-"Once you click on <guimenu>Accept user</guimenu> you can add other "
-"users. Add a user for each one of your friends, your father, your sister, "
-"etc. Click <guimenu>Next</guimenu> when you're finished adding users."
+"Once you click on <guimenu>Accept user</guimenu> you can add other users. "
+"Add a user for each one of your friends, your father, your sister, etc. "
+"Click <guimenu>Next</guimenu> when you're finished adding users."
 msgstr ""
 
 #. type: Content of: <chapter><section><tip><para>
 #: en/drakx-addUser-sect1.xml:54 en/drakx-MNF-chapter.xml:623
 msgid ""
 "Clicking the <guibutton>Advanced</guibutton> button allows you to change the "
-"default <literal>shell</literal> for that user "
-"(<application>bash</application> by default)."
+"default <literal>shell</literal> for that user (<application>bash</"
+"application> by default)."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4755,7 +4778,9 @@ msgid "Deprecated - Choosing Mount Points"
 msgstr ""
 
 #. type: Content of: <section><indexterm><secondary>
-#: en/drakx-ask_mntpoint_s-sect1.xml:14 en/drakx-ask_mntpoint_s-sect1.xml:16 en/drakx-MNF-chapter.xml:532 en/drakx-MNF-chapter.xml:534 en/drakx-setRootPassword-sect1.xml:14 en/drakx-setRootPassword-sect1.xml:22
+#: en/drakx-ask_mntpoint_s-sect1.xml:14 en/drakx-ask_mntpoint_s-sect1.xml:16
+#: en/drakx-MNF-chapter.xml:532 en/drakx-MNF-chapter.xml:534
+#: en/drakx-setRootPassword-sect1.xml:14 en/drakx-setRootPassword-sect1.xml:22
 msgid "root"
 msgstr ""
 
@@ -4765,29 +4790,35 @@ msgid "partition"
 msgstr ""
 
 #. type: Content of: <section><para><indexterm><primary>
-#: en/drakx-ask_mntpoint_s-sect1.xml:15 en/drakx-doPartitionDisks-sect1.xml:24 en/drakx-doPartitionDisks-sect1.xml:110 en/drakx-formatPartitions-sect1.xml:21 en/drakx-formatPartitions-sect1.xml:28 en/drakx-formatPartitions-sect1.xml:52 en/drakx-MNF-chapter.xml:442 en/drakx-MNF-chapter.xml:472 en/drakx-MNF-chapter.xml:482 en/drakx-MNF-chapter.xml:502 en/drakx-resizeFATChoose-sect1.xml:17
+#: en/drakx-ask_mntpoint_s-sect1.xml:15 en/drakx-doPartitionDisks-sect1.xml:24
+#: en/drakx-doPartitionDisks-sect1.xml:110
+#: en/drakx-formatPartitions-sect1.xml:21
+#: en/drakx-formatPartitions-sect1.xml:28
+#: en/drakx-formatPartitions-sect1.xml:52 en/drakx-MNF-chapter.xml:442
+#: en/drakx-MNF-chapter.xml:472 en/drakx-MNF-chapter.xml:482
+#: en/drakx-MNF-chapter.xml:502 en/drakx-resizeFATChoose-sect1.xml:17
 msgid "partitions"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakx-ask_mntpoint_s-sect1.xml:10
 msgid ""
-"Listed here are the existing Linux partitions detected on your hard "
-"drive. You can keep the choices made by the wizard, since they are good for "
-"most common installations. If you make any changes, you must at least define "
-"a <placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" "
-"id=\"1\"/>root partition (<literal revision=\"3\">/</literal>). Do not "
-"choose too small a partition or you will not be able to install enough "
-"software. In most cases it is best to also create a <literal>/home</literal> "
-"partition, to store your data on (only possible if you have more than one "
-"Linux partition available)."
+"Listed here are the existing Linux partitions detected on your hard drive. "
+"You can keep the choices made by the wizard, since they are good for most "
+"common installations. If you make any changes, you must at least define a "
+"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id="
+"\"1\"/>root partition (<literal revision=\"3\">/</literal>). Do not choose "
+"too small a partition or you will not be able to install enough software. In "
+"most cases it is best to also create a <literal>/home</literal> partition, "
+"to store your data on (only possible if you have more than one Linux "
+"partition available)."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakx-ask_mntpoint_s-sect1.xml:19
 msgid ""
-"Each partition is listed as follows: \"Device\", \"Capacity\", \"Mount "
-"point\",\"Type\"."
+"Each partition is listed as follows: \"Device\", \"Capacity\", \"Mount point"
+"\",\"Type\"."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4800,11 +4831,11 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakx-ask_mntpoint_s-sect1.xml:28
 msgid ""
-"When the mount points are correct, or corrected, click "
-"<guibutton>Next</guibutton>. You'll then be given the choice to format one "
-"or more of the partitions you just chose to install Mageia on. Usually, "
-"formatting <literal>/</literal> and saving <literal>/home</literal> (if the "
-"same partition was your <literal>/home</literal> before), is a good choice."
+"When the mount points are correct, or corrected, click <guibutton>Next</"
+"guibutton>. You'll then be given the choice to format one or more of the "
+"partitions you just chose to install Mageia on. Usually, formatting "
+"<literal>/</literal> and saving <literal>/home</literal> (if the same "
+"partition was your <literal>/home</literal> before), is a good choice."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4835,7 +4866,9 @@ msgid "Graphical Environment"
 msgstr ""
 
 #. type: Content of: <section><section><indexterm><primary>
-#: en/drakx-choosePackages-sect1.xml:13 en/drakx-choosePackages-sect1.xml:31 en/drakx-choosePackages-sect1.xml:48 en/drakx-choosePackages-sect1.xml:57 en/drakx-choosePackages-sect1.xml:72
+#: en/drakx-choosePackages-sect1.xml:13 en/drakx-choosePackages-sect1.xml:31
+#: en/drakx-choosePackages-sect1.xml:48 en/drakx-choosePackages-sect1.xml:57
+#: en/drakx-choosePackages-sect1.xml:72
 msgid "packages"
 msgstr ""
 
@@ -4847,10 +4880,10 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/drakx-choosePackages-sect1.xml:13
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/> <guilabel>Graphical "
-"Environment</guilabel>: this is where you will choose your preferred "
-"graphical environment. At least one must be selected if you want to have a "
-"graphical interface available."
+"<placeholder type=\"indexterm\" id=\"0\"/> <guilabel>Graphical Environment</"
+"guilabel>: this is where you will choose your preferred graphical "
+"environment. At least one must be selected if you want to have a graphical "
+"interface available."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -4862,8 +4895,8 @@ msgstr ""
 #: en/drakx-choosePackages-sect1.xml:26
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-choosePackages.png\" "
-"format=\"PNG\" xml:id=\"BId-drakx-choosePackages-im1\" revision=\"3\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakx-choosePackages-im1\" revision=\"3\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para><indexterm><secondary>
@@ -4901,9 +4934,8 @@ msgid ""
 "if you plan to use your machine as a workstation, select one or more of the "
 "groups in this category. The special <literal>LSB</literal> group will "
 "configure your system so that it complies as much as possible with the <link "
-"xmlns:xlink=\"http://www.w3.org/1999/xlink\" "
-"xlink:href=\"http://www.linuxbase.org/\">Linux Standard Base Project</link> "
-"specifications."
+"xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:href=\"http://www."
+"linuxbase.org/\">Linux Standard Base Project</link> specifications."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para><indexterm><secondary>
@@ -4980,9 +5012,9 @@ msgstr ""
 #: en/drakx-choosePackages-sect1.xml:112
 msgid ""
 "<guilabel>Truly minimal install</guilabel>: installs the absolute minimum "
-"number of packages necessary to get a working "
-"<application>Linux</application> system. With this installation you will "
-"only have a command-line interface."
+"number of packages necessary to get a working <application>Linux</"
+"application> system. With this installation you will only have a command-"
+"line interface."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -4993,19 +5025,18 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/drakx-choosePackages-sect1.xml:125
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-choosePackagesTree.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-choosePackages-im2\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-choosePackagesTree.png"
+"\" format=\"PNG\" xml:id=\"BId-drakx-choosePackages-im2\" revision=\"1\" "
+"width=\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/drakx-choosePackages-sect1.xml:130
 msgid ""
 "If you choose to install packages individually, the installer will present a "
-"tree structure containing all packages classified by groups and "
-"subgroups. While browsing the tree, you can select entire groups, subgroups, "
-"or individual packages."
+"tree structure containing all packages classified by groups and subgroups. "
+"While browsing the tree, you can select entire groups, subgroups, or "
+"individual packages."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -5044,9 +5075,9 @@ msgstr ""
 #: en/drakx-choosePackages-sect1.xml:156
 msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/> The <guilabel>Show automatically "
-"selected packages</guilabel> option is used to disable the warning "
-"dialog. Those appear whenever the installer automatically selects a package "
-"to resolve a dependency issue.  Some packages depend on others and the "
+"selected packages</guilabel> option is used to disable the warning dialog. "
+"Those appear whenever the installer automatically selects a package to "
+"resolve a dependency issue.  Some packages depend on others and the "
 "installation of one particular package may require the installation of "
 "another one. The installer can determine which packages are required to "
 "satisfy a dependency and to successfully complete the installation."
@@ -5071,21 +5102,20 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakx-doPartitionDisks-sect1.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-doPartitionDisks.png\" format=\"PNG\" "
-"xml:id=\"BId-drakxid-doPartitionDisks-im1\" revision=\"1\" "
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-doPartitionDisks.png"
+"\" format=\"PNG\" xml:id=\"BId-drakxid-doPartitionDisks-im1\" revision=\"1\" "
 "width=\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakx-doPartitionDisks-sect1.xml:16
 msgid ""
-"You now need to decide where you want to install "
-"<application>Mageia</application> on your hard drive. If your hard drive is "
-"empty or if an existing operating system is using all the available space "
-"you will have to re-partition the drive. Basically, partitioning a hard "
-"drive means to logically divide it in order to create the space required for "
-"your new <application>Mageia</application> system."
+"You now need to decide where you want to install <application>Mageia</"
+"application> on your hard drive. If your hard drive is empty or if an "
+"existing operating system is using all the available space you will have to "
+"re-partition the drive. Basically, partitioning a hard drive means to "
+"logically divide it in order to create the space required for your new "
+"<application>Mageia</application> system."
 msgstr ""
 
 #. type: Content of: <chapter><section><para><indexterm><primary>
@@ -5098,8 +5128,8 @@ msgstr ""
 msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/>Because the process of "
 "partitioning a hard drive is usually irreversible and can lead to data loss, "
-"partitioning can be intimidating and stressful for the inexperienced "
-"user. Fortunately, <application>DrakX</application> includes a wizard which "
+"partitioning can be intimidating and stressful for the inexperienced user. "
+"Fortunately, <application>DrakX</application> includes a wizard which "
 "simplifies this process. Before continuing with this step, read through the "
 "rest of this section and, above all, take your time."
 msgstr ""
@@ -5132,9 +5162,8 @@ msgid ""
 "<application>Linux</application> partitions on your hard drive. If you want "
 "to use them, choose this option. You will then be asked to choose the mount "
 "points associated with each of the partitions. The legacy mount points are "
-"selected by default, and for the most part it's a good idea to keep "
-"them. You will also be asked to choose the partitions to be formatted or "
-"preserved."
+"selected by default, and for the most part it's a good idea to keep them. "
+"You will also be asked to choose the partitions to be formatted or preserved."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -5142,17 +5171,16 @@ msgstr ""
 msgid ""
 "<guibutton>Use the free space on the Windows partition</guibutton>. If "
 "<application>Windows<superscript>®</superscript></application> is installed "
-"on your hard drive, you might have to create free space for "
-"<application>GNU/Linux</application>. To do so, you can delete your "
+"on your hard drive, you might have to create free space for <application>GNU/"
+"Linux</application>. To do so, you can delete your "
 "<application>Windows<superscript>®</superscript></application> partition and "
 "data (see the <quote>Erase entire disk</quote> solution below) or resize "
 "your <acronym>FAT</acronym> or <acronym>NTFS</acronym> partition. Resizing "
 "can be performed without the loss of any data, <emphasis>provided you've "
-"previously defragmented the "
-"<application>Windows<superscript>®</superscript></application> "
-"partition. Backing up your data is strongly recommended</emphasis>. Using "
-"this option is recommended if you want to use both "
-"<application>Mageia</application> and "
+"previously defragmented the <application>Windows<superscript>®</"
+"superscript></application> partition. Backing up your data is strongly "
+"recommended</emphasis>. Using this option is recommended if you want to use "
+"both <application>Mageia</application> and "
 "<application>Windows<superscript>®</superscript></application> on the same "
 "computer in a <emphasis>dual boot</emphasis> configuration."
 msgstr ""
@@ -5161,10 +5189,9 @@ msgstr ""
 #: en/drakx-doPartitionDisks-sect1.xml:75
 msgid ""
 "Before choosing this option, please understand that after this procedure, "
-"the size of your "
-"<application>Windows<superscript>®</superscript></application> partition "
-"will be smaller than when you started, which means you will have less free "
-"space to store your data or to install new software."
+"the size of your <application>Windows<superscript>®</superscript></"
+"application> partition will be smaller than when you started, which means "
+"you will have less free space to store your data or to install new software."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -5187,10 +5214,9 @@ msgstr ""
 #: en/drakx-doPartitionDisks-sect1.xml:96
 msgid ""
 "<guibutton>Remove Windows(TM)</guibutton>. This option appears when the hard "
-"drive is entirely taken by "
-"<application>Windows<superscript>®</superscript></application>. Choosing "
-"this option will simply erase everything on the drive, partitioning "
-"everything from scratch."
+"drive is entirely taken by <application>Windows<superscript>®</superscript></"
+"application>. Choosing this option will simply erase everything on the "
+"drive, partitioning everything from scratch."
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><warning><para>
@@ -5214,18 +5240,16 @@ msgid ""
 "and you can very easily lose all your data. That's why this option is only "
 "recommended if you have performed custom disk partitioning before, and have "
 "enough <application>GNU/Linux</application> experience to know what you are "
-"doing. For more instructions on how to use the "
-"<application>DiskDrake</application> utility, refer to <phrase "
-"condition=\"Starter\" xml:id=\"BIdNEW-drakxid-doPartitionDisks-ph1\"><xref "
-"linkend=\"diskdrake\"/></phrase><phrase condition=\"Discovery\" "
-"xml:id=\"BIdNEW-drakxid-doPartitionDisks-ph3\">the <citetitle "
-"xml:id=\"BId-drakxid-doPartitionDisks-ct1\">Managing Your "
-"Partitions</citetitle> section in the <citetitle>Starter "
-"Guide</citetitle></phrase><phrase condition=\"QSP\" "
-"xml:id=\"BIdNEW-drakxid-doPartitionDisks-ph4\">the <citetitle "
-"xml:id=\"BId-drakxid-doPartitionDisks-ct2\">Managing Your "
-"Partitions</citetitle> section in the <citetitle>Starter "
-"Guide</citetitle></phrase>."
+"doing. For more instructions on how to use the <application>DiskDrake</"
+"application> utility, refer to <phrase condition=\"Starter\" xml:id=\"BIdNEW-"
+"drakxid-doPartitionDisks-ph1\"><xref linkend=\"diskdrake\"/></phrase><phrase "
+"condition=\"Discovery\" xml:id=\"BIdNEW-drakxid-doPartitionDisks-ph3\">the "
+"<citetitle xml:id=\"BId-drakxid-doPartitionDisks-ct1\">Managing Your "
+"Partitions</citetitle> section in the <citetitle>Starter Guide</citetitle></"
+"phrase><phrase condition=\"QSP\" xml:id=\"BIdNEW-drakxid-doPartitionDisks-"
+"ph4\">the <citetitle xml:id=\"BId-drakxid-doPartitionDisks-ct2\">Managing "
+"Your Partitions</citetitle> section in the <citetitle>Starter Guide</"
+"citetitle></phrase>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -5237,12 +5261,13 @@ msgstr ""
 #: en/drakx-exitInstal-sect1.xml:7
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-exitInstall.png\" "
-"format=\"PNG\" xml:id=\"BId-drakxid-exitInstall-im1\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakxid-exitInstall-im1\" revision=\"1\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><indexterm><primary>
-#: en/drakx-exitInstal-sect1.xml:13 en/drakx-misc-params-sect1.xml:225 en/drakx-MNF-chapter.xml:779
+#: en/drakx-exitInstal-sect1.xml:13 en/drakx-misc-params-sect1.xml:225
+#: en/drakx-MNF-chapter.xml:779
 msgid "boot"
 msgstr ""
 
@@ -5257,11 +5282,10 @@ msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/>There you are. The installation is "
 "now complete and your <application>GNU/Linux</application> system is ready "
 "to be used. Just click on <guibutton>Reboot</guibutton> to restart the "
-"system. Don't forget to remove the installation media "
-"(<acronym>CD-ROM</acronym> or floppy). The first thing you should see after "
-"your computer has finished doing its hardware tests is the bootloader menu, "
-"which allows you to choose between the <acronym>OS</acronym>es your system "
-"can boot."
+"system. Don't forget to remove the installation media (<acronym>CD-ROM</"
+"acronym> or floppy). The first thing you should see after your computer has "
+"finished doing its hardware tests is the bootloader menu, which allows you "
+"to choose between the <acronym>OS</acronym>es your system can boot."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -5300,7 +5324,9 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><indexterm><primary>
-#: en/drakx-exitInstal-sect1.xml:45 en/drakx-exitInstal-sect1.xml:52 en/drakx-exitInstal-sect1.xml:73 en/drakx-installUpdates-sect1.xml:13 en/drakx-selectInstallClass-sect1.xml:15
+#: en/drakx-exitInstal-sect1.xml:45 en/drakx-exitInstal-sect1.xml:52
+#: en/drakx-exitInstal-sect1.xml:73 en/drakx-installUpdates-sect1.xml:13
+#: en/drakx-selectInstallClass-sect1.xml:15
 msgid "installation"
 msgstr ""
 
@@ -5312,9 +5338,9 @@ msgstr ""
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakx-exitInstal-sect1.xml:44
 msgid ""
-"<placeholder type=\"indexterm\" "
-"id=\"0\"/><guibutton>Replay</guibutton>. This is a partially automated "
-"installation. The partitioning step is the only interactive procedure."
+"<placeholder type=\"indexterm\" id=\"0\"/><guibutton>Replay</guibutton>. "
+"This is a partially automated installation. The partitioning step is the "
+"only interactive procedure."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para><indexterm><secondary>
@@ -5325,19 +5351,18 @@ msgstr ""
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakx-exitInstal-sect1.xml:51
 msgid ""
-"<placeholder type=\"indexterm\" "
-"id=\"0\"/><guibutton>Automated</guibutton>. Fully automated installation: "
-"<emphasis>the hard disk is completely rewritten, all data is "
-"lost</emphasis>."
+"<placeholder type=\"indexterm\" id=\"0\"/><guibutton>Automated</guibutton>. "
+"Fully automated installation: <emphasis>the hard disk is completely "
+"rewritten, all data is lost</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakx-exitInstal-sect1.xml:62
 msgid ""
-"This feature is very handy when installing on a number of similar "
-"machines. See the <link xmlns:xlink=\"http://www.w3.org/1999/xlink\" "
-"xlink:href=\"http://www.mandrakelinux.com/drakx/auto_inst.html\">Auto "
-"install</link> section on our web site for more information."
+"This feature is very handy when installing on a number of similar machines. "
+"See the <link xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:href="
+"\"http://www.mandrakelinux.com/drakx/auto_inst.html\">Auto install</link> "
+"section on our web site for more information."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para><indexterm><secondary>
@@ -5348,22 +5373,20 @@ msgstr ""
 #. type: Content of: <section><section><orderedlist><listitem><para><footnote><para>
 #: en/drakx-exitInstal-sect1.xml:75
 msgid ""
-"If you chose to save on a floppy, you will need a "
-"<acronym>FAT</acronym>-formatted floppy. To create one under "
-"<application>GNU/Linux</application>, type <command>mformat a:</command> or, "
-"as root, <command>fdformat /dev/fd0</command> followed by <command>mkfs.vfat "
-"/dev/fd0</command>."
+"If you chose to save on a floppy, you will need a <acronym>FAT</acronym>-"
+"formatted floppy. To create one under <application>GNU/Linux</application>, "
+"type <command>mformat a:</command> or, as root, <command>fdformat /dev/fd0</"
+"command> followed by <command>mkfs.vfat /dev/fd0</command>."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakx-exitInstal-sect1.xml:72
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><guibutton>Save package "
-"selection</guibutton><placeholder type=\"footnote\" id=\"1\"/>: saves a list "
-"of the packages selected in this installation. The following screen shows "
-"you the possible media to use to save the package list onto: you might need "
-"to fill some parameters when you click on the <guilabel>Next</guilabel> "
-"button."
+"<placeholder type=\"indexterm\" id=\"0\"/><guibutton>Save package selection</"
+"guibutton><placeholder type=\"footnote\" id=\"1\"/>: saves a list of the "
+"packages selected in this installation. The following screen shows you the "
+"possible media to use to save the package list onto: you might need to fill "
+"some parameters when you click on the <guilabel>Next</guilabel> button."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
@@ -5393,9 +5416,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakx-formatPartitions-sect1.xml:15
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-formatPartitions.png\" format=\"PNG\" "
-"xml:id=\"BId-drakxid-formatPartitions-im1\" revision=\"1\" "
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-formatPartitions.png"
+"\" format=\"PNG\" xml:id=\"BId-drakxid-formatPartitions-im1\" revision=\"1\" "
 "width=\"11.5cm\"/> </imageobject>"
 msgstr ""
 
@@ -5421,8 +5443,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakx-formatPartitions-sect1.xml:26
 msgid ""
-"Please note that it's not necessary to reformat all <placeholder "
-"type=\"indexterm\" id=\"0\"/>pre-existing partitions. You must reformat the "
+"Please note that it's not necessary to reformat all <placeholder type="
+"\"indexterm\" id=\"0\"/>pre-existing partitions. You must reformat the "
 "partitions containing the operating system (such as <literal>/</literal>, "
 "<literal>/usr</literal> or <literal>/var</literal>) but not the partitions "
 "containing data you wish to keep (typically <literal>/home</literal>)."
@@ -5432,8 +5454,8 @@ msgstr ""
 #: en/drakx-formatPartitions-sect1.xml:35
 msgid ""
 "Please be careful when selecting partitions. After the formatting is "
-"completed, <emphasis>all data on the selected partitions will be "
-"deleted</emphasis> and you won't be able to recover it."
+"completed, <emphasis>all data on the selected partitions will be deleted</"
+"emphasis> and you won't be able to recover it."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -5487,9 +5509,9 @@ msgstr ""
 msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/> <placeholder type=\"indexterm\" "
 "id=\"1\"/>By the time you install <application>Mageia</application>, it's "
-"likely that some packages will have been updated since the initial "
-"release. Bugs may have been fixed, security issues resolved, etc. To allow "
-"you to benefit from these updates, you're now able to download them from the "
+"likely that some packages will have been updated since the initial release. "
+"Bugs may have been fixed, security issues resolved, etc. To allow you to "
+"benefit from these updates, you're now able to download them from the "
 "Internet. Select <guilabel>Yes</guilabel> if you have a working Internet "
 "connection and you want to install any updated packages now, or "
 "<guilabel>No</guilabel> if you prefer to install updated packages later."
@@ -5522,17 +5544,16 @@ msgstr ""
 #: en/drakx-intro.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link "
-"xlink:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">"
-"http://creativecommons.org/licenses/by-sa/3.0/</link>"
+"3.0 license <link xlink:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakx-intro.xml:15
 msgid ""
-"This manual was produced with the help of the <link "
-"xlink:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
-"xlink:href=\"http://www.neodoc.biz\">NeoDoc</link>"
+"This manual was produced with the help of the <link xlink:href=\"http://www."
+"calenco.com\">Calenco CMS</link> developed by <link xlink:href=\"http://www."
+"neodoc.biz\">NeoDoc</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -5544,8 +5565,8 @@ msgstr ""
 #: en/drakx-miscellaneous-sect1.xml:7
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-miscellaneous.png\" "
-"format=\"PNG\" xml:id=\"BId-drakxid-miscellaneous-im1\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakxid-miscellaneous-im1\" revision=\"1\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para><indexterm><primary>
@@ -5561,12 +5582,12 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakx-miscellaneous-sect1.xml:12
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/>At this point, "
-"<application>DrakX</application> allows you to choose your machine's "
-"security level. As a rule of thumb, the security level should be set higher "
-"if the machine is to contain crucial data, or if it's to be directly exposed "
-"to the Internet. The trade-off is that a higher security level is generally "
-"obtained at the expense of ease of use."
+"<placeholder type=\"indexterm\" id=\"0\"/>At this point, <application>DrakX</"
+"application> allows you to choose your machine's security level. As a rule "
+"of thumb, the security level should be set higher if the machine is to "
+"contain crucial data, or if it's to be directly exposed to the Internet. The "
+"trade-off is that a higher security level is generally obtained at the "
+"expense of ease of use."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -5599,26 +5620,31 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/drakx-misc-params-sect1.xml:10
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-summary.png\" "
-"format=\"PNG\" xml:id=\"BId-drakx-misc-params-im1\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-summary.png\" format="
+"\"PNG\" xml:id=\"BId-drakx-misc-params-im1\" revision=\"1\" width=\"11.5cm\"/"
+"> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para><indexterm><secondary>
-#: en/drakx-misc-params-sect1.xml:16 en/drakx-misc-params-sect1.xml:29 en/drakx-misc-params-sect1.xml:38 en/drakx-misc-params-sect1.xml:57 en/drakx-misc-params-sect1.xml:68 en/drakx-misc-params-sect1.xml:74 en/drakx-misc-params-sect1.xml:95 en/drakx-misc-params-sect1.xml:118 en/drakx-misc-params-sect1.xml:134 en/drakx-misc-params-sect1.xml:153 en/drakx-misc-params-sect1.xml:161
+#: en/drakx-misc-params-sect1.xml:16 en/drakx-misc-params-sect1.xml:29
+#: en/drakx-misc-params-sect1.xml:38 en/drakx-misc-params-sect1.xml:57
+#: en/drakx-misc-params-sect1.xml:68 en/drakx-misc-params-sect1.xml:74
+#: en/drakx-misc-params-sect1.xml:95 en/drakx-misc-params-sect1.xml:118
+#: en/drakx-misc-params-sect1.xml:134 en/drakx-misc-params-sect1.xml:153
+#: en/drakx-misc-params-sect1.xml:161
 msgid "configuration"
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/drakx-misc-params-sect1.xml:15
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/>As a review, "
-"<application>DrakX</application> will present a summary of information it "
-"has gathered about your system. Depending on the hardware installed on your "
-"machine, you may have some or all of the following entries. Each entry is "
-"made up of the hardware item to be configured, followed by a quick summary "
-"of the current configuration. Click on the corresponding "
-"<guibutton>Configure</guibutton> button to make any changes."
+"<placeholder type=\"indexterm\" id=\"0\"/>As a review, <application>DrakX</"
+"application> will present a summary of information it has gathered about "
+"your system. Depending on the hardware installed on your machine, you may "
+"have some or all of the following entries. Each entry is made up of the "
+"hardware item to be configured, followed by a quick summary of the current "
+"configuration. Click on the corresponding <guibutton>Configure</guibutton> "
+"button to make any changes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para><indexterm><primary>
@@ -5631,8 +5657,8 @@ msgstr ""
 msgid ""
 "<guilabel>Timezone</guilabel>: <placeholder type=\"indexterm\" id=\"0\"/>by "
 "default, <application>DrakX</application> deduces your time zone based on "
-"the country you have chosen. You can click on the "
-"<guibutton>Configure</guibutton> button here if this is not correct."
+"the country you have chosen. You can click on the <guibutton>Configure</"
+"guibutton> button here if this is not correct."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para><indexterm><primary>
@@ -5643,9 +5669,9 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakx-misc-params-sect1.xml:37
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><guilabel>Country / "
-"Region</guilabel>: check the current country selection. If you're not in the "
-"country selected by <application>DrakX</application>, click on the "
+"<placeholder type=\"indexterm\" id=\"0\"/><guilabel>Country / Region</"
+"guilabel>: check the current country selection. If you're not in the country "
+"selected by <application>DrakX</application>, click on the "
 "<guibutton>Configure</guibutton> button and choose another. If your country "
 "isn't in the list shown, click on the <guibutton>Other Countries</guibutton> "
 "button to get a complete country list."
@@ -5655,14 +5681,14 @@ msgstr ""
 #: en/drakx-misc-params-sect1.xml:48
 msgid ""
 "<guilabel>Bootloader</guilabel>: if you wish to change your bootloader "
-"configuration, click this button. This should be reserved to advanced "
-"users. Refer to the printed documentation or the in-line help about "
-"bootloader configuration in the <application>Mageia Control "
-"Center</application>."
+"configuration, click this button. This should be reserved to advanced users. "
+"Refer to the printed documentation or the in-line help about bootloader "
+"configuration in the <application>Mageia Control Center</application>."
 msgstr ""
 
 #. type: Content of: <section><section><para><indexterm><secondary>
-#: en/drakx-misc-params-sect1.xml:57 en/drakx-misc-params-sect1.xml:223 en/drakx-misc-params-sect1.xml:225
+#: en/drakx-misc-params-sect1.xml:57 en/drakx-misc-params-sect1.xml:223
+#: en/drakx-misc-params-sect1.xml:225
 msgid "services"
 msgstr ""
 
@@ -5676,7 +5702,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><indexterm><secondary>
-#: en/drakx-misc-params-sect1.xml:67 en/drakx-MNF-chapter.xml:324 en/drakx-selectKeyboard-sect1.xml:16 en/drakx-selectKeyboard-sect1.xml:18
+#: en/drakx-misc-params-sect1.xml:67 en/drakx-MNF-chapter.xml:324
+#: en/drakx-selectKeyboard-sect1.xml:16 en/drakx-selectKeyboard-sect1.xml:18
 msgid "keyboard"
 msgstr ""
 
@@ -5688,7 +5715,9 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><indexterm><primary>
-#: en/drakx-misc-params-sect1.xml:73 en/drakx-MNF-chapter.xml:275 en/drakx-MNF-chapter.xml:297 en/drakx-selectMouse-sect1.xml:12 en/drakx-selectMouse-sect1.xml:49
+#: en/drakx-misc-params-sect1.xml:73 en/drakx-MNF-chapter.xml:275
+#: en/drakx-MNF-chapter.xml:297 en/drakx-selectMouse-sect1.xml:12
+#: en/drakx-selectMouse-sect1.xml:49
 msgid "mouse"
 msgstr ""
 
@@ -5722,15 +5751,15 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakx-misc-params-sect1.xml:116
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><guilabel>Graphical "
-"Interface</guilabel>: by default, <application>DrakX</application> "
-"configures your graphical interface with a resolution that best matches your "
-"video card and monitor combination. If that doesn't suit you, or "
-"<application>DrakX</application> could not automatically configure it "
-"(<guilabel>not configured</guilabel> is displayed), click on "
-"<guibutton>Configure</guibutton> to reconfigure your graphical "
-"interface. You can click on <guibutton>Help</guibutton> from within the "
-"configuration wizard to benefit from full in-line help."
+"<placeholder type=\"indexterm\" id=\"0\"/><guilabel>Graphical Interface</"
+"guilabel>: by default, <application>DrakX</application> configures your "
+"graphical interface with a resolution that best matches your video card and "
+"monitor combination. If that doesn't suit you, or <application>DrakX</"
+"application> could not automatically configure it (<guilabel>not configured</"
+"guilabel> is displayed), click on <guibutton>Configure</guibutton> to "
+"reconfigure your graphical interface. You can click on <guibutton>Help</"
+"guibutton> from within the configuration wizard to benefit from full in-line "
+"help."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para><indexterm><primary>
@@ -5765,11 +5794,10 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakx-misc-params-sect1.xml:151
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><guilabel>Security "
-"Level</guilabel>: this entry allows you to redefine the security "
-"level<phrase condition=\"Starter\" xml:id=\"BId-drakx-misc-params-ph1\"> as "
-"set in a previous step (see <xref "
-"linkend=\"drakxidmiscellaneous\"/>)</phrase>."
+"<placeholder type=\"indexterm\" id=\"0\"/><guilabel>Security Level</"
+"guilabel>: this entry allows you to redefine the security level<phrase "
+"condition=\"Starter\" xml:id=\"BId-drakx-misc-params-ph1\"> as set in a "
+"previous step (see <xref linkend=\"drakxidmiscellaneous\"/>)</phrase>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para><indexterm><primary>
@@ -5784,10 +5812,9 @@ msgid ""
 "you plan to connect your machine to the Internet, it's a good idea to "
 "protect yourself from intrusions by setting up a firewall. Consult <phrase "
 "condition=\"Discovery\" xml:id=\"BIdNEW-drakx-misc-params-ph5\">the "
-"corresponding chapter of the <citetitle>Starter "
-"Guide</citetitle></phrase><phrase condition=\"Startonly\" "
-"xml:id=\"BIdNEW-drakx-misc-params-ph6\" revision=\"2\"><xref "
-"linkend=\"tinyfirewall\"/></phrase><phrase "
+"corresponding chapter of the <citetitle>Starter Guide</citetitle></"
+"phrase><phrase condition=\"Startonly\" xml:id=\"BIdNEW-drakx-misc-params-"
+"ph6\" revision=\"2\"><xref linkend=\"tinyfirewall\"/></phrase><phrase "
 "condition=\"only-in-ML-Full-Manual\" xml:id=\"BIdNEW-drakx-misc-params-ph7\" "
 "revision=\"2\"><xref linkend=\"tinyfirewall\"/></phrase> for details about "
 "firewall settings."
@@ -5801,18 +5828,17 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/drakx-misc-params-sect1.xml:179
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-configureTimezoneGMT.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-misc-params-im2\" revision=\"2\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-configureTimezoneGMT."
+"png\" format=\"PNG\" xml:id=\"BId-drakx-misc-params-im2\" revision=\"2\" "
+"width=\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/drakx-misc-params-sect1.xml:184
 msgid ""
-"This dialog appears after selecting a new time zone in the time zones "
-"list. After you've chosen the location nearest to your time zone, two more "
-"options are shown."
+"This dialog appears after selecting a new time zone in the time zones list. "
+"After you've chosen the location nearest to your time zone, two more options "
+"are shown."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -5821,10 +5847,10 @@ msgid ""
 "<application>GNU/Linux</application> manages time in <acronym>GMT</acronym> "
 "(Greenwich Mean Time) and translates it to local time according to the time "
 "zone you selected. If the clock on your motherboard is set to local time, "
-"you may deactivate this by deselecting <guilabel>Hardware clock set to "
-"GMT</guilabel>, which will let <application>GNU/Linux</application> know "
-"that the system clock and the hardware clock are in the same time zone. This "
-"is useful when the machine also hosts another operating system."
+"you may deactivate this by deselecting <guilabel>Hardware clock set to GMT</"
+"guilabel>, which will let <application>GNU/Linux</application> know that the "
+"system clock and the hardware clock are in the same time zone. This is "
+"useful when the machine also hosts another operating system."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -5847,17 +5873,16 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/drakx-misc-params-sect1.xml:218
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-configureServices.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-misc-params-im5\" revision=\"2\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-configureServices.png"
+"\" format=\"PNG\" xml:id=\"BId-drakx-misc-params-im5\" revision=\"2\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/drakx-misc-params-sect1.xml:223
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" "
-"id=\"1\"/>This dialog is used to select which services you wish to start at "
+"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id="
+"\"1\"/>This dialog is used to select which services you wish to start at "
 "boot time."
 msgstr ""
 
@@ -5881,10 +5906,10 @@ msgstr ""
 #: en/drakx-misc-params-sect1.xml:242
 msgid ""
 "At this stage, be very careful if you intend to use your machine as a "
-"server: you probably don't want to start any services which you don't "
-"need. Please remember that some services can be dangerous if they're enabled "
-"on a server. In general, select only those services you "
-"<emphasis>really</emphasis> need."
+"server: you probably don't want to start any services which you don't need. "
+"Please remember that some services can be dangerous if they're enabled on a "
+"server. In general, select only those services you <emphasis>really</"
+"emphasis> need."
 msgstr ""
 
 #. type: Content of: <chapter><info><title>
@@ -5907,8 +5932,8 @@ msgid ""
 "required.  With <application>DrakX</application>, it doesn't matter whether "
 "you're a new user to <application>Mandrakesecurity</application> or an old "
 "pro – <application>DrakX</application>'s job is to give you a smooth "
-"installation and an easy transition into "
-"<application>Mandrakesecurity</application>."
+"installation and an easy transition into <application>Mandrakesecurity</"
+"application>."
 msgstr ""
 
 #. type: Content of: <chapter><section><figure><info><title>
@@ -5919,10 +5944,9 @@ msgstr ""
 #. type: Content of: <chapter><section><figure><mediaobject>
 #: en/drakx-MNF-chapter.xml:28
 msgid ""
-"  <imageobject> <imagedata align=\"center\" "
-"fileref=\"../dx-MNF-welcome.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im1\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"  <imageobject> <imagedata align=\"center\" fileref=\"../dx-MNF-welcome.png"
+"\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im1\" revision=\"1\" width=\"11.5cm"
+"\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -5943,7 +5967,9 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para><indexterm><primary>
-#: en/drakx-MNF-chapter.xml:49 en/drakx-MNF-chapter.xml:60 en/drakx-MNF-chapter.xml:70 en/drakx-MNF-chapter.xml:72 en/drakx-MNF-chapter.xml:96
+#: en/drakx-MNF-chapter.xml:49 en/drakx-MNF-chapter.xml:60
+#: en/drakx-MNF-chapter.xml:70 en/drakx-MNF-chapter.xml:72
+#: en/drakx-MNF-chapter.xml:96
 msgid "installation options"
 msgstr ""
 
@@ -5961,8 +5987,8 @@ msgid ""
 "run the installation in low resolution mode. This happens with certain types "
 "of graphics cards, so with <application>Mandrakesecurity</application> we "
 "give you a number of options to work around problems with older hardware.  "
-"To try the installation in low resolution mode, type "
-"<userinput>vgalo</userinput> at the prompt."
+"To try the installation in low resolution mode, type <userinput>vgalo</"
+"userinput> at the prompt."
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para><indexterm><secondary>
@@ -5999,11 +6025,11 @@ msgstr ""
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: en/drakx-MNF-chapter.xml:70
 msgid ""
-"<literal>expert</literal>: <placeholder type=\"indexterm\" "
-"id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>in some rare cases, your "
-"PC may appear to freeze or lock-up during the hardware detection phase.  If "
-"that happens, then adding the word <literal>expert</literal> as a parameter "
-"will tell the install program to bypass hardware detection.  Because "
+"<literal>expert</literal>: <placeholder type=\"indexterm\" id=\"0\"/"
+"><placeholder type=\"indexterm\" id=\"1\"/>in some rare cases, your PC may "
+"appear to freeze or lock-up during the hardware detection phase.  If that "
+"happens, then adding the word <literal>expert</literal> as a parameter will "
+"tell the install program to bypass hardware detection.  Because "
 "<application>DrakX</application> will not scan for hardware, you will need "
 "to manually specify hardware parameters later in the installation.  The "
 "<literal>expert</literal> parameter can be added to the previous modes, so "
@@ -6044,12 +6070,12 @@ msgstr ""
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
 #: en/drakx-MNF-chapter.xml:95
 msgid ""
-"<literal>kernel options</literal>: <placeholder type=\"indexterm\" "
-"id=\"0\"/>Kernel options usually aren't required for most machines.  There "
-"are a few cases of motherboards incorrectly reporting the amount of memory "
-"installed due to bugs in the design or in the BIOS.  If you need to manually "
-"specify the amount of DRAM installed in your PC, use the <placeholder "
-"type=\"indexterm\" id=\"1\"/> <command>mem= xxxM</command> parameter. For "
+"<literal>kernel options</literal>: <placeholder type=\"indexterm\" id=\"0\"/"
+">Kernel options usually aren't required for most machines.  There are a few "
+"cases of motherboards incorrectly reporting the amount of memory installed "
+"due to bugs in the design or in the BIOS.  If you need to manually specify "
+"the amount of DRAM installed in your PC, use the <placeholder type="
+"\"indexterm\" id=\"1\"/> <command>mem= xxxM</command> parameter. For "
 "example, to start the installation in normal mode with a computer having 256 "
 "<acronym>MB</acronym> of memory, your command line would look like this: "
 "<placeholder type=\"screen\" id=\"2\"/>"
@@ -6060,11 +6086,11 @@ msgstr ""
 msgid ""
 "Now that we've gone over what <emphasis>might</emphasis> go wrong, let's "
 "move on to the actual installation process.  When the installer starts, "
-"you'll see a nice graphical interface ( <xref "
-"linkend=\"selectLanguage-fig\"/> ). On the left will be the various "
-"installation steps. Depending on the installation's progress level, some "
-"stages may or may not be available.  If a particular stage is available it "
-"will be highlighted when you move the mouse pointer over it."
+"you'll see a nice graphical interface ( <xref linkend=\"selectLanguage-fig\"/"
+"> ). On the left will be the various installation steps. Depending on the "
+"installation's progress level, some stages may or may not be available.  If "
+"a particular stage is available it will be highlighted when you move the "
+"mouse pointer over it."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6117,14 +6143,14 @@ msgstr ""
 #. type: Content of: <chapter><section><figure><mediaobject>
 #: en/drakx-MNF-chapter.xml:161
 msgid ""
-"  <imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-selectLanguage.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im2\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"  <imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-selectLanguage."
+"png\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im2\" revision=\"1\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><indexterm><primary>
-#: en/drakx-MNF-chapter.xml:167 en/drakx-MNF-chapter.xml:187 en/drakx-selectKeyboard-sect1.xml:18 en/drakx-selectLanguage-sect1.xml:21
+#: en/drakx-MNF-chapter.xml:167 en/drakx-MNF-chapter.xml:187
+#: en/drakx-selectKeyboard-sect1.xml:18 en/drakx-selectLanguage-sect1.xml:21
 msgid "language"
 msgstr ""
 
@@ -6176,8 +6202,8 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:199
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-license.png\" "
-"format=\"PNG\" xml:id=\"BId-drakx-MNF-im3\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakx-MNF-im3\" revision=\"1\" width=\"11.5cm\"/"
+"> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6186,8 +6212,8 @@ msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/>Before continuing, you should "
 "carefully read the terms of the license. It covers the entire "
 "<application>Mandrakesecurity</application> distribution, and if you do not "
-"agree with all the terms in it you should click on the <guibutton>Refuse "
-"</guibutton> button.  This will immediately terminate the installation.  "
+"agree with all the terms in it you should click on the <guibutton>Refuse </"
+"guibutton> button.  This will immediately terminate the installation.  "
 "Clicking on the <guibutton>Accept</guibutton> button will continue the "
 "installation."
 msgstr ""
@@ -6201,8 +6227,8 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:221
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-setupSCSI.png\" "
-"format=\"PNG\" xml:id=\"BId-drakx-MNF-im4\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakx-MNF-im4\" revision=\"1\" width=\"11.5cm\"/"
+"> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><indexterm><primary>
@@ -6228,38 +6254,37 @@ msgstr ""
 #. type: Content of: <chapter><section><para>
 #: en/drakx-MNF-chapter.xml:226
 msgid ""
-"<application>DrakX</application> will first detect any <placeholder "
-"type=\"indexterm\" id=\"0\"/> IDE devices present in your computer. It will "
-"also scan for one or more <placeholder type=\"indexterm\" "
-"id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/> PCI SCSI cards on your "
-"system. If a SCSI card is found, <application>DrakX</application> will "
-"automatically install the appropriate driver."
+"<application>DrakX</application> will first detect any <placeholder type="
+"\"indexterm\" id=\"0\"/> IDE devices present in your computer. It will also "
+"scan for one or more <placeholder type=\"indexterm\" id=\"1\"/><placeholder "
+"type=\"indexterm\" id=\"2\"/> PCI SCSI cards on your system. If a SCSI card "
+"is found, <application>DrakX</application> will automatically install the "
+"appropriate driver."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 #: en/drakx-MNF-chapter.xml:234
 msgid ""
-"Because hardware detection is not foolproof, "
-"<application>DrakX</application> will ask you if you have a PCI SCSI "
-"installed. Clicking <guibutton>Yes</guibutton> will display a list of SCSI "
-"cards to choose from. Click <guibutton>No</guibutton> if you know that you "
-"have no SCSI hardware in your machine. If you're not sure, you can check the "
-"list of hardware detected in your machine by selecting <guilabel>See "
-"hardware info </guilabel> and clicking the "
-"<guibutton>OK</guibutton>. Examine the list of hardware and then click on "
-"the <guibutton>OK</guibutton> button to return to the SCSI interface "
-"question."
+"Because hardware detection is not foolproof, <application>DrakX</"
+"application> will ask you if you have a PCI SCSI installed. Clicking "
+"<guibutton>Yes</guibutton> will display a list of SCSI cards to choose from. "
+"Click <guibutton>No</guibutton> if you know that you have no SCSI hardware "
+"in your machine. If you're not sure, you can check the list of hardware "
+"detected in your machine by selecting <guilabel>See hardware info </"
+"guilabel> and clicking the <guibutton>OK</guibutton>. Examine the list of "
+"hardware and then click on the <guibutton>OK</guibutton> button to return to "
+"the SCSI interface question."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 #: en/drakx-MNF-chapter.xml:245
 msgid ""
-"If you had to manually specify your PCI SCSI adapter, "
-"<application>DrakX</application> will ask if you want to configure options "
-"for it. You should allow <application>DrakX</application> to probe the "
-"hardware for the card-specific options which are needed to initialize the "
-"adapter. Most of the time, <application>DrakX</application> will get through "
-"this step without any issues."
+"If you had to manually specify your PCI SCSI adapter, <application>DrakX</"
+"application> will ask if you want to configure options for it. You should "
+"allow <application>DrakX</application> to probe the hardware for the card-"
+"specific options which are needed to initialize the adapter. Most of the "
+"time, <application>DrakX</application> will get through this step without "
+"any issues."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6284,22 +6309,21 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:270
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-selectMouse.png\" "
-"format=\"PNG\" xml:id=\"BId-drakx-MNF-im5\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakx-MNF-im5\" revision=\"1\" width=\"11.5cm\"/"
+"> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 #: en/drakx-MNF-chapter.xml:275
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/> Usually, "
-"<application>DrakX</application> has no problems detecting the number of "
-"buttons on your mouse. If it does, it assumes you have a two-button mouse "
-"and will configure it for third-button emulation. The third-button mouse "
-"button of a two-button mouse can be <quote>pressed </quote> by "
-"simultaneously clicking the left and right mouse "
-"buttons. <application>DrakX</application> will automatically know whether "
-"your mouse uses a <acronym>PS/2</acronym>, serial or <acronym>USB</acronym> "
-"interface."
+"<placeholder type=\"indexterm\" id=\"0\"/> Usually, <application>DrakX</"
+"application> has no problems detecting the number of buttons on your mouse. "
+"If it does, it assumes you have a two-button mouse and will configure it for "
+"third-button emulation. The third-button mouse button of a two-button mouse "
+"can be <quote>pressed </quote> by simultaneously clicking the left and right "
+"mouse buttons. <application>DrakX</application> will automatically know "
+"whether your mouse uses a <acronym>PS/2</acronym>, serial or <acronym>USB</"
+"acronym> interface."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6315,9 +6339,8 @@ msgid ""
 "If you choose a mouse other than the default, a test screen will be "
 "displayed. Use the buttons and wheel to verify that the settings are correct "
 "and that the mouse is working correctly. If the mouse is not working well, "
-"press the space bar or <keycap> Return</keycap> key to "
-"<guibutton>Cancel</guibutton> the test and to go back to the list of "
-"choices."
+"press the space bar or <keycap> Return</keycap> key to <guibutton>Cancel</"
+"guibutton> the test and to go back to the list of choices."
 msgstr ""
 
 #. type: Content of: <chapter><section><note><para><indexterm><secondary>
@@ -6329,14 +6352,13 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:297
 msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/>Wheel mice are occasionally not "
-"detected automatically, so you will need to select your mouse from a "
-"list. Be sure to select the one corresponding to the port that your mouse is "
-"attached to.  After selecting a mouse and pressing the "
-"<guibutton>OK</guibutton> button, a mouse image is displayed "
-"on-screen. Scroll the mouse wheel to ensure that it is activated "
-"correctly. Once you see the on-screen scroll wheel moving as you scroll your "
-"mouse wheel, test the buttons and check that the mouse pointer moves "
-"on-screen as you move your mouse."
+"detected automatically, so you will need to select your mouse from a list. "
+"Be sure to select the one corresponding to the port that your mouse is "
+"attached to.  After selecting a mouse and pressing the <guibutton>OK</"
+"guibutton> button, a mouse image is displayed on-screen. Scroll the mouse "
+"wheel to ensure that it is activated correctly. Once you see the on-screen "
+"scroll wheel moving as you scroll your mouse wheel, test the buttons and "
+"check that the mouse pointer moves on-screen as you move your mouse."
 msgstr ""
 
 #. type: Content of: <chapter><section><info><title>
@@ -6347,25 +6369,23 @@ msgstr ""
 #. type: Content of: <chapter><section><mediaobject>
 #: en/drakx-MNF-chapter.xml:318
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-selectKeyboard.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im6\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-selectKeyboard.png"
+"\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im6\" revision=\"1\" width=\"11.5cm"
+"\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 #: en/drakx-MNF-chapter.xml:323
 msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/>Depending on the default language "
-"you chose in <xref linkend=\"drakxid-selectLanguage\"/>, "
-"<application>DrakX</application> will automatically select a particular type "
-"of keyboard configuration. However, you might not have a keyboard that "
-"corresponds exactly to your language: for example, if you are an English "
-"speaking Swiss person, you may have a Swiss keyboard. Or if you speak "
-"English but are located in Québec, you may find yourself in the same "
-"situation where your native language and keyboard do not match. In either "
-"case, this installation step will allow you to select an appropriate "
-"keyboard from a list."
+"you chose in <xref linkend=\"drakxid-selectLanguage\"/>, <application>DrakX</"
+"application> will automatically select a particular type of keyboard "
+"configuration. However, you might not have a keyboard that corresponds "
+"exactly to your language: for example, if you are an English speaking Swiss "
+"person, you may have a Swiss keyboard. Or if you speak English but are "
+"located in Québec, you may find yourself in the same situation where your "
+"native language and keyboard do not match. In either case, this installation "
+"step will allow you to select an appropriate keyboard from a list."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6383,10 +6403,9 @@ msgstr ""
 #. type: Content of: <chapter><section><mediaobject>
 #: en/drakx-MNF-chapter.xml:346
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-doPartitionDisks.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im7\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-doPartitionDisks."
+"png\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im7\" revision=\"1\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6452,11 +6471,10 @@ msgstr ""
 msgid ""
 "<guibutton>Use the free space on the Windows partition</guibutton>: if "
 "<application>Microsoft</application><superscript>®</superscript> "
-"<application>Windows<superscript>®</superscript></application><superscript>©<"
-"/superscript> "
-"is installed on your hard drive and takes all the space available on it, you "
-"have to create free space for Linux data. To do so, you can delete your "
-"<application>Microsoft</application> "
+"<application>Windows<superscript>®</superscript></"
+"application><superscript>©</superscript> is installed on your hard drive and "
+"takes all the space available on it, you have to create free space for Linux "
+"data. To do so, you can delete your <application>Microsoft</application> "
 "<application>Windows<superscript>®</superscript></application> partition and "
 "data (see <quote> Erase entire disk</quote> or <quote>Expert mode</quote> "
 "solutions) or resize your <application>Microsoft</application> "
@@ -6464,12 +6482,11 @@ msgid ""
 "partition. Resizing can be performed without the loss of any data, "
 "<emphasis>provided you previously defragment the "
 "<application>Windows<superscript>®</superscript></application> partition and "
-"that it uses the FAT format. Backing up your data is strongly "
-"recommended.</emphasis>. Using this option is recommended if you want to use "
-"both <application>Mandrakesecurity</application> and "
-"<application>Microsoft</application> "
-"<application>Windows<superscript>®</superscript></application> on the same "
-"computer."
+"that it uses the FAT format. Backing up your data is strongly recommended.</"
+"emphasis>. Using this option is recommended if you want to use both "
+"<application>Mandrakesecurity</application> and <application>Microsoft</"
+"application> <application>Windows<superscript>®</superscript></application> "
+"on the same computer."
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><para>
@@ -6479,9 +6496,8 @@ msgid ""
 "the size of your <application>Microsoft</application> "
 "<application>Windows<superscript>®</superscript></application> partition "
 "will be smaller then when you started. You will have less free space under "
-"<application>Microsoft</application> "
-"<application>Windows<superscript>®</superscript></application> to store your "
-"data or to install new software."
+"<application>Microsoft</application> <application>Windows<superscript>®</"
+"superscript></application> to store your data or to install new software."
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><para>
@@ -6497,8 +6513,8 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:432
 msgid ""
 "<guibutton>Remove Windows</guibutton>: this will simply erase everything on "
-"the drive and begin fresh, partitioning everything from "
-"scratch. <emphasis>All</emphasis> data on your disk will be lost."
+"the drive and begin fresh, partitioning everything from scratch. "
+"<emphasis>All</emphasis> data on your disk will be lost."
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><para><indexterm><secondary>
@@ -6526,11 +6542,10 @@ msgid ""
 "choice and you can very easily lose all your data. That's why this option is "
 "really only recommended if you have done something like this before and have "
 "some experience. For more instructions on how to use the "
-"<application>DiskDrake</application> utility, refer to the <link "
-"xmlns:xlink=\"http://www.w3.org/1999/xlink\" "
-"xlink:href=\"http://www.mandrakelinux.com/en/doc/82/en/user.html/diskdrake.htm"
-"l\">online "
-"documentation for <application>DiskDrake</application></link>."
+"<application>DiskDrake</application> utility, refer to the <link xmlns:xlink="
+"\"http://www.w3.org/1999/xlink\" xlink:href=\"http://www.mandrakelinux.com/"
+"en/doc/82/en/user.html/diskdrake.html\">online documentation for "
+"<application>DiskDrake</application></link>."
 msgstr ""
 
 #. type: Content of: <chapter><section><info><title>
@@ -6541,10 +6556,9 @@ msgstr ""
 #. type: Content of: <chapter><section><mediaobject>
 #: en/drakx-MNF-chapter.xml:467
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-formatPartitions.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im8\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-formatPartitions."
+"png\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im8\" revision=\"1\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6566,8 +6580,8 @@ msgstr ""
 #. type: Content of: <chapter><section><para>
 #: en/drakx-MNF-chapter.xml:481
 msgid ""
-"Please note that it is not necessary to reformat all <placeholder "
-"type=\"indexterm\" id=\"0\"/>pre-existing partitions. You must reformat the "
+"Please note that it is not necessary to reformat all <placeholder type="
+"\"indexterm\" id=\"0\"/>pre-existing partitions. You must reformat the "
 "partitions containing the operating system (such as <literal>/</literal>, "
 "<literal>/usr</literal> or <literal>/var</literal>) but you do not have to "
 "reformat partitions containing data that you wish to keep (typically "
@@ -6627,14 +6641,14 @@ msgstr ""
 #. type: Content of: <chapter><section><mediaobject>
 #: en/drakx-MNF-chapter.xml:525
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-setRootPassword.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im9\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-setRootPassword."
+"png\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im9\" revision=\"1\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><indexterm><primary>
-#: en/drakx-MNF-chapter.xml:533 en/drakx-MNF-chapter.xml:533 en/drakx-setRootPassword-sect1.xml:16 en/drakx-setRootPassword-sect1.xml:20
+#: en/drakx-MNF-chapter.xml:533 en/drakx-setRootPassword-sect1.xml:16
+#: en/drakx-setRootPassword-sect1.xml:20
 msgid "password"
 msgstr ""
 
@@ -6661,11 +6675,11 @@ msgstr ""
 #. type: Content of: <chapter><section><note><para>
 #: en/drakx-MNF-chapter.xml:549
 msgid ""
-"The <application>msec</application> security level is set to "
-"<literal>4</literal> (<quote>high</quote>) by default. The password should "
-"be a mixture of alphanumeric characters and must be at least 8 characters "
-"long. Never write down the <literal>root</literal> password –– it makes it "
-"too easy to compromise a system."
+"The <application>msec</application> security level is set to <literal>4</"
+"literal> (<quote>high</quote>) by default. The password should be a mixture "
+"of alphanumeric characters and must be at least 8 characters long. Never "
+"write down the <literal>root</literal> password –– it makes it too easy to "
+"compromise a system."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6711,8 +6725,8 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:588
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-addUser.png\" "
-"format=\"PNG\" xml:id=\"BId-drakx-MNF-im10\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakx-MNF-im10\" revision=\"1\" width=\"11.5cm\"/"
+"> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6729,15 +6743,15 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:600
 msgid ""
 "The first field asks you for a real name. Of course, this is not "
-"mandatory –– you can actually enter whatever you "
-"like. <application>DrakX</application> will use the first word you typed in "
-"and copy it to the <guimenu>User name</guimenu> field, which is the name "
-"this user will enter to log onto the system. If you like, you may override "
-"the default and change the username. The next step is to enter a "
-"password. From a security point of view, a non-privileged (regular) user "
-"password is not as crucial as the <literal>root</literal> password, but that "
-"is no reason to neglect it by making it blank or too simple: after all, "
-"<emphasis>your</emphasis> files could be the ones at risk."
+"mandatory –– you can actually enter whatever you like. <application>DrakX</"
+"application> will use the first word you typed in and copy it to the "
+"<guimenu>User name</guimenu> field, which is the name this user will enter "
+"to log onto the system. If you like, you may override the default and change "
+"the username. The next step is to enter a password. From a security point of "
+"view, a non-privileged (regular) user password is not as crucial as the "
+"<literal>root</literal> password, but that is no reason to neglect it by "
+"making it blank or too simple: after all, <emphasis>your</emphasis> files "
+"could be the ones at risk."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6763,10 +6777,9 @@ msgstr ""
 #. type: Content of: <chapter><section><mediaobject>
 #: en/drakx-MNF-chapter.xml:636
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-configureNetwork.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im11\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-configureNetwork."
+"png\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im11\" revision=\"1\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6792,8 +6805,8 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:656
 msgid ""
 "We will not detail each configuration option –  just make sure that you have "
-"all the parameters, such as IP address, default gateway, DNS servers, "
-"etc. from your Internet Service Provider or system administrator."
+"all the parameters, such as IP address, default gateway, DNS servers, etc. "
+"from your Internet Service Provider or system administrator."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6812,9 +6825,9 @@ msgstr ""
 #. type: Content of: <chapter><section><mediaobject>
 #: en/drakx-MNF-chapter.xml:676
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-setupBootloaderBeginner.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im12\" width=\"11.5cm\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-"
+"setupBootloaderBeginner.png\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im12\" "
+"width=\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6846,25 +6859,26 @@ msgstr ""
 #. type: Content of: <chapter><section><mediaobject>
 #: en/drakx-MNF-chapter.xml:698
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-createBootdisk.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im13\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-createBootdisk.png"
+"\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im13\" revision=\"1\" width=\"11.5cm"
+"\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
 #: en/drakx-MNF-chapter.xml:703
 msgid ""
 "The <application>Mandrakesecurity</application> <acronym>CD-ROM</acronym> "
-"has a built-in rescue mode. You can access it by booting the "
-"<acronym>CD-ROM</acronym>, pressing the <userinput>F1</userinput> key at "
-"boot and typing <userinput>rescue</userinput> at the prompt.  If your "
-"computer cannot boot from the <acronym>CD-ROM</acronym>, there are at least "
-"two situations where having a boot floppy is critical:"
+"has a built-in rescue mode. You can access it by booting the <acronym>CD-"
+"ROM</acronym>, pressing the <userinput>F1</userinput> key at boot and typing "
+"<userinput>rescue</userinput> at the prompt.  If your computer cannot boot "
+"from the <acronym>CD-ROM</acronym>, there are at least two situations where "
+"having a boot floppy is critical:"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para><indexterm><primary>
-#: en/drakx-MNF-chapter.xml:712 en/drakx-MNF-chapter.xml:805 en/drakx-setupBootloaderBeginne-sect1.xml:17 en/drakx-setupBootloaderBeginne-sect1.xml:21 en/uninstall-linux.xml:42
+#: en/drakx-MNF-chapter.xml:712 en/drakx-MNF-chapter.xml:805
+#: en/drakx-setupBootloaderBeginne-sect1.xml:17
+#: en/drakx-setupBootloaderBeginne-sect1.xml:21 en/uninstall-linux.xml:42
 msgid "bootloader"
 msgstr ""
 
@@ -6886,19 +6900,18 @@ msgid ""
 "system). If at some point you need to reinstall "
 "<application>Windows<superscript>®</superscript></application>, the "
 "<application>Microsoft</application> install process will rewrite the boot "
-"sector and remove your ability to start "
-"<application>GNU/Linux</application>!"
+"sector and remove your ability to start <application>GNU/Linux</application>!"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><para>
 #: en/drakx-MNF-chapter.xml:724
 msgid ""
-"if a problem arises and you cannot start "
-"<application>GNU/Linux</application> from the hard disk, this <placeholder "
-"type=\"indexterm\" id=\"0\"/>floppy will be the only means of starting up "
-"<application>GNU/Linux</application>. It contains a fair number of system "
-"tools for restoring a system that has crashed due to a power failure, an "
-"unfortunate typing error, a forgotten root password, or any other reason."
+"if a problem arises and you cannot start <application>GNU/Linux</"
+"application> from the hard disk, this <placeholder type=\"indexterm\" id="
+"\"0\"/>floppy will be the only means of starting up <application>GNU/Linux</"
+"application>. It contains a fair number of system tools for restoring a "
+"system that has crashed due to a power failure, an unfortunate typing error, "
+"a forgotten root password, or any other reason."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6918,10 +6931,9 @@ msgstr ""
 #. type: Content of: <chapter><section><mediaobject>
 #: en/drakx-MNF-chapter.xml:744
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-MNF-installUpdates.png\" format=\"PNG\" "
-"xml:id=\"BId-drakx-MNF-im14\" revision=\"1\" width=\"11.5cm\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-installUpdates.png"
+"\" format=\"PNG\" xml:id=\"BId-drakx-MNF-im14\" revision=\"1\" width=\"11.5cm"
+"\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6941,9 +6953,9 @@ msgstr ""
 msgid ""
 "Choosing <guibutton>Yes</guibutton> displays a list of places from which "
 "updates can be retrieved. Choose the one nearest you. A package-selection "
-"tree will appear: review the selection, and press "
-"<guibutton>Install</guibutton> to retrieve and install the selected "
-"package(s), or <guibutton>Cancel</guibutton> to abort."
+"tree will appear: review the selection, and press <guibutton>Install</"
+"guibutton> to retrieve and install the selected package(s), or "
+"<guibutton>Cancel</guibutton> to abort."
 msgstr ""
 
 #. type: Content of: <chapter><section><info><title>
@@ -6955,8 +6967,8 @@ msgstr ""
 #: en/drakx-MNF-chapter.xml:774
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-MNF-exitInstall.png\" "
-"format=\"PNG\" xml:id=\"BId-drakx-MNF-im15\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakx-MNF-im15\" revision=\"1\" width=\"11.5cm\"/"
+"> </imageobject>"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
@@ -6989,7 +7001,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para><indexterm><secondary>
-#: en/drakx-MNF-chapter.xml:806 en/uninstall-linux.xml:7 en/uninstall-linux.xml:11 en/uninstall-linux.xml:44
+#: en/drakx-MNF-chapter.xml:806 en/uninstall-linux.xml:7
+#: en/uninstall-linux.xml:11 en/uninstall-linux.xml:44
 msgid "uninstall"
 msgstr ""
 
@@ -6998,9 +7011,8 @@ msgstr ""
 msgid ""
 "Uninstall the <placeholder type=\"indexterm\" id=\"0\"/> bootloader "
 "(generally <application>GRUB</application>) from the Master Boot Record "
-"(<acronym>MBR</acronym>). To do so, boot under "
-"<application>DOS</application> and run the <command>fdisk /mbr</command> "
-"command."
+"(<acronym>MBR</acronym>). To do so, boot under <application>DOS</"
+"application> and run the <command>fdisk /mbr</command> command."
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
@@ -7013,8 +7025,7 @@ msgstr ""
 #. type: Content of: <chapter><section><para>
 #: en/drakx-MNF-chapter.xml:816
 msgid ""
-"Goodbye, and thank you for using "
-"<application>Mandrakesecurity</application>!"
+"Goodbye, and thank you for using <application>Mandrakesecurity</application>!"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -7284,10 +7295,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakx-selectInstallClass-sect1.xml:10
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx-selectInstallClass.png\" format=\"PNG\" "
-"xml:id=\"BId-drakxid-selectInstallClass-im1\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-selectInstallClass.png"
+"\" format=\"PNG\" xml:id=\"BId-drakxid-selectInstallClass-im1\" revision="
+"\"1\" width=\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><indexterm><secondary>
@@ -7356,27 +7366,26 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakx-selectKeyboard-sect1.xml:16
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" "
-"id=\"1\"/>Depending on the language you chose (see <xref "
-"linkend=\"drakxid-selectLanguage\"/>), <application>DrakX</application> "
-"automatically selects a particular type of keyboard configuration. Verify "
-"that the selection suits you or choose another keyboard layout. If you don't "
-"know which layout your keyboard has, look in the specifications that came "
-"with your system, or ask the computer vendor. You can also look here: <link "
-"xmlns:xlink=\"http://www.w3.org/1999/xlink\" "
-"xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">"
-"en.wikipedia.org/wiki/Keyboard_layout</link>"
+"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id="
+"\"1\"/>Depending on the language you chose (see <xref linkend=\"drakxid-"
+"selectLanguage\"/>), <application>DrakX</application> automatically selects "
+"a particular type of keyboard configuration. Verify that the selection suits "
+"you or choose another keyboard layout. If you don't know which layout your "
+"keyboard has, look in the specifications that came with your system, or ask "
+"the computer vendor. You can also look here: <link xmlns:xlink=\"http://www."
+"w3.org/1999/xlink\" xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout"
+"\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakx-selectKeyboard-sect1.xml:24
 msgid ""
-"If your keyboard isn't in the list shown, click on <guibutton "
-"revision=\"1\">More</guibutton> to get a full list, and select your keyboard "
-"there. Note that after having chosen your keyboard, you will return to the "
-"first screen and it'll seem that a keyboard from this first screen was "
-"chosen. You can safely ignore this and go on, the keyboard you chose from "
-"the full list will now be configured!"
+"If your keyboard isn't in the list shown, click on <guibutton revision="
+"\"1\">More</guibutton> to get a full list, and select your keyboard there. "
+"Note that after having chosen your keyboard, you will return to the first "
+"screen and it'll seem that a keyboard from this first screen was chosen. You "
+"can safely ignore this and go on, the keyboard you chose from the full list "
+"will now be configured!"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7415,9 +7424,9 @@ msgstr ""
 #: en/drakx-selectLanguage-sect1.xml:19
 msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/>First open the tree relative to "
-"the continent you are located in, and then choose the language you "
-"speak. Your language choice will affect the installer, the documentation, "
-"and the system in general."
+"the continent you are located in, and then choose the language you speak. "
+"Your language choice will affect the installer, the documentation, and the "
+"system in general."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7480,8 +7489,7 @@ msgid ""
 "To switch between the various languages installed on your system, you can "
 "launch the <command>localedrake</command> command as <literal>root</literal> "
 "to change the language used by the entire system. Running the command as a "
-"regular user will only change the language settings for that particular "
-"user."
+"regular user will only change the language settings for that particular user."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -7493,32 +7501,31 @@ msgstr ""
 #: en/drakx-selectMouse-sect1.xml:7
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-selectMouse.png\" "
-"format=\"PNG\" xml:id=\"BId-drakxid-selectMouse-im1\" revision=\"1\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakxid-selectMouse-im1\" revision=\"1\" width="
+"\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakx-selectMouse-sect1.xml:12
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/>Usually, "
-"<application>DrakX</application> has no problems detecting the number of "
-"buttons on your mouse. If it fails to properly recognize it, it assumes you "
-"have a two-button mouse and will configure it for third-button "
-"emulation. The third-button mouse button of a two-button mouse can be "
-"obtained by simultaneously clicking the left and right mouse "
-"buttons. <application>DrakX</application> will automatically know whether "
-"your mouse uses a <acronym>PS/2</acronym>, serial or <acronym>USB</acronym> "
-"interface."
+"<placeholder type=\"indexterm\" id=\"0\"/>Usually, <application>DrakX</"
+"application> has no problems detecting the number of buttons on your mouse. "
+"If it fails to properly recognize it, it assumes you have a two-button mouse "
+"and will configure it for third-button emulation. The third-button mouse "
+"button of a two-button mouse can be obtained by simultaneously clicking the "
+"left and right mouse buttons. <application>DrakX</application> will "
+"automatically know whether your mouse uses a <acronym>PS/2</acronym>, serial "
+"or <acronym>USB</acronym> interface."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/drakx-selectMouse-sect1.xml:22
 msgid ""
 "If you have a 3-button mouse without a wheel, you can choose a "
-"<guilabel>with Wheel emulation</guilabel> "
-"mouse. <application>DrakX</application> will then configure your mouse so "
-"that you can simulate the wheel with it: to do so, press the middle button "
-"and move your mouse pointer up and down."
+"<guilabel>with Wheel emulation</guilabel> mouse. <application>DrakX</"
+"application> will then configure your mouse so that you can simulate the "
+"wheel with it: to do so, press the middle button and move your mouse pointer "
+"up and down."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7560,8 +7567,8 @@ msgid ""
 "pressing the <guibutton>Next</guibutton> button, a mouse image will be "
 "displayed on-screen. Scroll the mouse wheel to ensure that it is correctly "
 "activated. As you scroll your mouse wheel, you will see the on-screen scroll "
-"wheel moving. Test the buttons and check that the mouse pointer moves "
-"on-screen as you move your mouse about."
+"wheel moving. Test the buttons and check that the mouse pointer moves on-"
+"screen as you move your mouse about."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7585,16 +7592,16 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/drakxservices.xml:7
 msgid ""
-"<imageobject> <imagedata width=\"80%\" xml:id=\"drakxservices-im1\" "
-"revision=\"1\" align=\"center\" format=\"PNG\" "
-"fileref=\"drakxservices.png\"/> </imageobject>"
+"<imageobject> <imagedata width=\"80%\" xml:id=\"drakxservices-im1\" revision="
+"\"1\" align=\"center\" format=\"PNG\" fileref=\"drakxservices.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakxservices.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakxservices</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakxservices</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -7606,8 +7613,8 @@ msgstr ""
 #: en/drakx-setRootPassword-sect1.xml:8
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx-setRootPassword.png\" "
-"width=\"11.5cm\" align=\"center\" format=\"PNG\" "
-"xml:id=\"BId-drakxid-setRootPassword-im1\"></imagedata> </imageobject>"
+"width=\"11.5cm\" align=\"center\" format=\"PNG\" xml:id=\"BId-drakxid-"
+"setRootPassword-im1\"></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7617,16 +7624,16 @@ msgid ""
 "<application>GNU/Linux</application> system: you must enter the "
 "<literal>root</literal> password. <literal>Root</literal> is the system "
 "administrator and is the only user authorized to make updates, add users, "
-"change the overall system configuration, and so on. In short, "
-"<literal>root</literal> can do everything! That's why you must choose a "
-"password which is difficult to guess: <application>DrakX</application> will "
-"tell you if the password you chose is too simple. You're not forced to enter "
-"a password, but we <emphasis>strongly</emphasis> encourage you to do so.  "
-"<application>GNU/Linux</application> is just as prone to operator error as "
-"any other operating system. Since <literal>root</literal> can overcome all "
-"limitations and unintentionally erase all data on partitions by carelessly "
-"accessing the partitions themselves, it is important that it be difficult to "
-"become <literal>root</literal>."
+"change the overall system configuration, and so on. In short, <literal>root</"
+"literal> can do everything! That's why you must choose a password which is "
+"difficult to guess: <application>DrakX</application> will tell you if the "
+"password you chose is too simple. You're not forced to enter a password, but "
+"we <emphasis>strongly</emphasis> encourage you to do so.  <application>GNU/"
+"Linux</application> is just as prone to operator error as any other "
+"operating system. Since <literal>root</literal> can overcome all limitations "
+"and unintentionally erase all data on partitions by carelessly accessing the "
+"partitions themselves, it is important that it be difficult to become "
+"<literal>root</literal>."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7650,8 +7657,8 @@ msgid ""
 "The password won't be displayed on screen as you type it. To reduce the "
 "chance of a blind typing error you will need to enter the password twice. If "
 "you do happen to make the same typing error twice, you will have to use this "
-"<quote>incorrect</quote> password when you try to connect as "
-"<literal>root</literal>, at least for the first time."
+"<quote>incorrect</quote> password when you try to connect as <literal>root</"
+"literal>, at least for the first time."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7675,16 +7682,18 @@ msgid "LDAP"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para><indexterm><primary>
-#: en/drakx-setRootPassword-sect1.xml:73 en/drakx-setRootPassword-sect1.xml:86 en/drakx-setRootPassword-sect1.xml:103 en/drakx-setRootPassword-sect1.xml:107
+#: en/drakx-setRootPassword-sect1.xml:73 en/drakx-setRootPassword-sect1.xml:86
+#: en/drakx-setRootPassword-sect1.xml:103
+#: en/drakx-setRootPassword-sect1.xml:107
 msgid "authentication"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/drakx-setRootPassword-sect1.xml:70
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" "
-"id=\"1\"/><guilabel>LDAP</guilabel>. Use an <acronym>LDAP</acronym> server "
-"for some or all authentication needs. An <acronym>LDAP</acronym> directory "
+"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id="
+"\"1\"/><guilabel>LDAP</guilabel>. Use an <acronym>LDAP</acronym> server for "
+"some or all authentication needs. An <acronym>LDAP</acronym> directory "
 "consolidates certain types of information within your organization."
 msgstr ""
 
@@ -7696,11 +7705,10 @@ msgstr ""
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/drakx-setRootPassword-sect1.xml:83
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" "
-"id=\"1\"/><guilabel>NIS</guilabel>. Authenticates users against a "
-"<acronym>NIS</acronym> domain. This allows you to run a group of computers "
-"in the same <acronym>NIS</acronym> domain using a common password and group "
-"file."
+"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id="
+"\"1\"/><guilabel>NIS</guilabel>. Authenticates users against a <acronym>NIS</"
+"acronym> domain. This allows you to run a group of computers in the same "
+"<acronym>NIS</acronym> domain using a common password and group file."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -7723,8 +7731,8 @@ msgstr ""
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/drakx-setRootPassword-sect1.xml:102
 msgid ""
-"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" "
-"id=\"1\"/><guilabel>Windows Domain</guilabel>. Uses a "
+"<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id="
+"\"1\"/><guilabel>Windows Domain</guilabel>. Uses a "
 "<application>Windows<superscript>®</superscript></application> domain "
 "controller to provide authentication services through <application>Active "
 "Directory</application>, <application>Microsoft</application>'s "
@@ -7745,9 +7753,9 @@ msgstr ""
 msgid ""
 "If you happen to have problems remembering passwords, or if your computer "
 "will never be connected to the Internet and you absolutely trust everybody "
-"who uses your computer, you can choose to have <guibutton>No "
-"password</guibutton>.  Please bear in mind that this is an insecure option, "
-"and it is not recommended."
+"who uses your computer, you can choose to have <guibutton>No password</"
+"guibutton>.  Please bear in mind that this is an insecure option, and it is "
+"not recommended."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -7759,17 +7767,19 @@ msgstr ""
 #: en/drakx-setupBootloaderBeginne-sect1.xml:11
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-setupBootloader.png\" "
-"format=\"PNG\" xml:id=\"BId-drakxid-setupBootloaderBeginner-im1\" "
-"revision=\"1\" width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakxid-setupBootloaderBeginner-im1\" revision="
+"\"1\" width=\"11.5cm\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><indexterm><primary>
-#: en/drakx-setupBootloaderBeginne-sect1.xml:18 en/drakx-setupBootloaderBeginne-sect1.xml:25
+#: en/drakx-setupBootloaderBeginne-sect1.xml:18
+#: en/drakx-setupBootloaderBeginne-sect1.xml:25
 msgid "LILO"
 msgstr ""
 
 #. type: Content of: <section><indexterm><primary>
-#: en/drakx-setupBootloaderBeginne-sect1.xml:22 en/drakx-setupBootloaderBeginne-sect1.xml:28
+#: en/drakx-setupBootloaderBeginne-sect1.xml:22
+#: en/drakx-setupBootloaderBeginne-sect1.xml:28
 msgid "GRUB"
 msgstr ""
 
@@ -7778,28 +7788,27 @@ msgstr ""
 msgid ""
 "A bootloader is a small program which is started by the computer at boot "
 "time. It's responsible for starting up the whole system. Normally, the "
-"bootloader installation is totally "
-"automated. <application>DrakX</application> will analyze the disk boot "
-"sector and act according to what it finds there:"
+"bootloader installation is totally automated. <application>DrakX</"
+"application> will analyze the disk boot sector and act according to what it "
+"finds there:"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/drakx-setupBootloaderBeginne-sect1.xml:40
 msgid ""
 "If a <application>Windows<superscript>®</superscript></application> boot "
-"sector is found, it will replace it with a "
-"<application>GRUB</application>/<application>LILO</application> boot "
-"sector. This way you will be able to load either "
-"<application>GNU/Linux</application> or any other <acronym>OS</acronym> "
-"installed on your machine."
+"sector is found, it will replace it with a <application>GRUB</application>/"
+"<application>LILO</application> boot sector. This way you will be able to "
+"load either <application>GNU/Linux</application> or any other <acronym>OS</"
+"acronym> installed on your machine."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/drakx-setupBootloaderBeginne-sect1.xml:49
 msgid ""
-"In any other case it will ask you where it should place the boot "
-"loader. Generally, the <guilabel>First sector of the drive (MBR)</guilabel> "
-"is the safest place."
+"In any other case it will ask you where it should place the boot loader. "
+"Generally, the <guilabel>First sector of the drive (MBR)</guilabel> is the "
+"safest place."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7827,20 +7836,19 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakx-setupSCSI.xml:14
 msgid ""
-"However, because hardware detection is not foolproof, "
-"<application>DrakX</application> may fail to detect your "
-"<acronym>SCSI</acronym> hard drives. If so, you mayl need to specify your "
-"hardware."
+"However, because hardware detection is not foolproof, <application>DrakX</"
+"application> may fail to detect your <acronym>SCSI</acronym> hard drives. If "
+"so, you mayl need to specify your hardware."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakx-setupSCSI.xml:19
 msgid ""
-"If you have had to specify your <acronym>PCI</acronym> "
-"<acronym>SCSI</acronym> adapter(s), <application>DrakX</application> will "
-"ask if you want to pass configuration options to it. Allow "
-"<application>DrakX</application> to probe the hardware to determine any "
-"card-specific options needed to initialize the adapter."
+"If you have had to specify your <acronym>PCI</acronym> <acronym>SCSI</"
+"acronym> adapter(s), <application>DrakX</application> will ask if you want "
+"to pass configuration options to it. Allow <application>DrakX</application> "
+"to probe the hardware to determine any card-specific options needed to "
+"initialize the adapter."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7873,8 +7881,8 @@ msgstr ""
 #: en/drakx-setupX-sect1.xml:8
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-configureX.png\" "
-"format=\"PNG\" xml:id=\"BId-drakx-setupX-im3\" revision=\"2\" "
-"width=\"11.5cm\"/> </imageobject>"
+"format=\"PNG\" xml:id=\"BId-drakx-setupX-im3\" revision=\"2\" width=\"11.5cm"
+"\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><indexterm><primary>
@@ -7889,9 +7897,8 @@ msgid ""
 "X Window System) is the heart of the <application>GNU/Linux</application> "
 "graphical interface on which all the graphical environments "
 "(<application>KDE</application>, <application>GNOME</application>, "
-"<application>AfterStep</application>, "
-"<application>WindowMaker</application>, etc.) bundled with "
-"<application>Mageia</application> rely on."
+"<application>AfterStep</application>, <application>WindowMaker</"
+"application>, etc.) bundled with <application>Mageia</application> rely on."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7972,8 +7979,7 @@ msgid ""
 "This step allows you to choose whether you want your machine to "
 "automatically switch to a graphical interface at boot. Obviously, you may "
 "want to select the <guilabel>No</guilabel> option if your machine is to act "
-"as a server, or if you were not successful in getting the display "
-"configured."
+"as a server, or if you were not successful in getting the display configured."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -8027,15 +8033,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/harddrake2.xml:16
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"harddrake2.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"harddrake2-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"harddrake2.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"harddrake2-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/harddrake2.xml:23
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">harddrake2</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">harddrake2</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8044,8 +8050,8 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> gives a general view of "
 "the hardware of your computer. When the tool is launched, it executes a job "
 "to look for every element of the hardware. For that, it uses the command "
-"<code>ldetect </code>which refers to a list of hardware in "
-"<code>ldetect-lst</code> package."
+"<code>ldetect </code>which refers to a list of hardware in <code>ldetect-"
+"lst</code> package."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -8139,25 +8145,25 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/keyboarddrake.xml:11
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"fileref=\"keyboarddrake.png\" xml:id=\"keyboarddrake-im1\" format=\"PNG\"/> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref="
+"\"keyboarddrake.png\" xml:id=\"keyboarddrake-im1\" format=\"PNG\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/keyboarddrake.xml:20
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">keyboarddrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">keyboarddrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/keyboarddrake.xml:19
 msgid ""
 "The keyboarddrake tool<placeholder type=\"footnote\" id=\"0\"/> helps you "
-"configure the basic layout for the keyboard that you wish to use on "
-"Mageia. It affects the keyboard layout for all users on the system. It can "
-"be found in the Hardware section of the Mageia Control Center (MCC) labelled "
+"configure the basic layout for the keyboard that you wish to use on Mageia. "
+"It affects the keyboard layout for all users on the system. It can be found "
+"in the Hardware section of the Mageia Control Center (MCC) labelled "
 "\"Configure mouse and keyboard\"."
 msgstr ""
 
@@ -8199,15 +8205,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/localedrake.xml:17
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"localedrake.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"localedrake-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"localedrake.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"localedrake-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/localedrake.xml:24
 msgid ""
-"You can also start this tool from the command line, by typing <emphasis "
-"role=\"bold\">localedrake</emphasis> as root."
+"You can also start this tool from the command line, by typing <emphasis role="
+"\"bold\">localedrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8282,24 +8288,23 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/logdrake.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"xml:id=\"logdrake-im1\" format=\"PNG\" fileref=\"logdrake.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"logdrake-"
+"im1\" format=\"PNG\" fileref=\"logdrake.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/logdrake.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">logdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">logdrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/logdrake.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
-"Control Center System tab, labelled \"<guilabel>View and search system "
-"logs</guilabel>\"."
+"Control Center System tab, labelled \"<guilabel>View and search system logs</"
+"guilabel>\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -8310,18 +8315,18 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:24
 msgid ""
-"First, enter the key string you want to look for in the <emphasis "
-"role=\"bold\">Matching</emphasis> field and/or the key string you want to "
-"<emphasis>do not</emphasis> wish to see amongst the answers in the field "
-"<emphasis role=\"bold\">but not matching</emphasis>. Then select the file(s)  "
-"to search in the <guilabel>Choose file</guilabel> field. Optionally, it is "
-"possible to limit the search to only one day. Select it in the <emphasis "
-"role=\"bold\">Calendar</emphasis>, using the little arrows on each side of "
-"the month and year, and check \"<guibutton>Show only for the selected "
-"day</guibutton>\". At last, click on the <guibutton>search</guibutton> "
-"button to see the results in the window called <guilabel>Content of the "
-"file</guilabel>. It is possible to save the results in the .txt format by "
-"clicking on the <emphasis role=\"bold\">Save</emphasis> button."
+"First, enter the key string you want to look for in the <emphasis role=\"bold"
+"\">Matching</emphasis> field and/or the key string you want to <emphasis>do "
+"not</emphasis> wish to see amongst the answers in the field <emphasis role="
+"\"bold\">but not matching</emphasis>. Then select the file(s)  to search in "
+"the <guilabel>Choose file</guilabel> field. Optionally, it is possible to "
+"limit the search to only one day. Select it in the <emphasis role=\"bold"
+"\">Calendar</emphasis>, using the little arrows on each side of the month "
+"and year, and check \"<guibutton>Show only for the selected day</guibutton>"
+"\". At last, click on the <guibutton>search</guibutton> button to see the "
+"results in the window called <guilabel>Content of the file</guilabel>. It is "
+"possible to save the results in the .txt format by clicking on the <emphasis "
+"role=\"bold\">Save</emphasis> button."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
@@ -8348,11 +8353,11 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:49
 msgid ""
-"To configure this tool, click on the <emphasis role=\"bold\">Mail "
-"Alert</emphasis> button and then, in the next screen, on the<guibutton> "
-"Configure the mail alert system</guibutton> drop down button. Here, all the "
-"running services are displayed and you can choose which ones you want to "
-"look watch. (See screenshot above)."
+"To configure this tool, click on the <emphasis role=\"bold\">Mail Alert</"
+"emphasis> button and then, in the next screen, on the<guibutton> Configure "
+"the mail alert system</guibutton> drop down button. Here, all the running "
+"services are displayed and you can choose which ones you want to look watch. "
+"(See screenshot above)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -8477,33 +8482,35 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/MageiaUpdate.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"MageiaUpdate-im1\" "
-"align=\"center\" fileref=\"MageiaUpdate.png\" format=\"PNG\" /> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"MageiaUpdate-im1\" align="
+"\"center\" fileref=\"MageiaUpdate.png\" format=\"PNG\" /> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/MageiaUpdate.xml:14
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">MageiaUpdate</emphasis> or <emphasis "
-"role=\"bold\">drakrpm-update</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">MageiaUpdate</emphasis> or <emphasis role=\"bold\">drakrpm-update</"
+"emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
-"Control Center under the tab <emphasis role=\"bold\">Software "
-"management.</emphasis>¶"
+"Control Center under the tab <emphasis role=\"bold\">Software management.</"
+"emphasis>"
 msgstr ""
+"Dit gereedschap<placeholder type=\"footnote\" id=\"0\"/> vindt u in het "
+"Mageia Configuratiecentrum, onder de <emphasis role=\"bold\">Softwarebeheer</"
+"emphasis> tab"
 
 #. type: Content of: <section><para><note><para>
 #: en/MageiaUpdate.xml:18
 msgid ""
-"To work, MageiaUpdate needs the repositories to be configured with "
-"rpmdrake-edit-media with some media checked as updates. If they are not, you "
-"are prompted to do so."
+"To work, MageiaUpdate needs the repositories to be configured with rpmdrake-"
+"edit-media with some media checked as updates. If they are not, you are "
+"prompted to do so."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8532,8 +8539,8 @@ msgstr ""
 #: en/MageiaUpdate.xml:33
 msgid ""
 "When updates are available, an applet in the system tray warns you by "
-"displaying this red icon <placeholder type=\"inlinemediaobject\" id=\"0\"/> "
-". Just click and enter the user password to update the system alike."
+"displaying this red icon <placeholder type=\"inlinemediaobject\" id=\"0\"/"
+"> . Just click and enter the user password to update the system alike."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -8544,8 +8551,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/mcc-boot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"mcc-boot.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"mcc-boot-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"mcc-boot.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"mcc-boot-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8602,8 +8609,8 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:22
 msgid ""
-"<xref linkend=\"harddrake2\"/><emphasis> = Browse and configure "
-"hardware</emphasis>"
+"<xref linkend=\"harddrake2\"/><emphasis> = Browse and configure hardware</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
@@ -8619,8 +8626,8 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:36
 msgid ""
-"<xref linkend=\"drak3d\"/><emphasis> = Configure 3D Desktop "
-"effects</emphasis>"
+"<xref linkend=\"drak3d\"/><emphasis> = Configure 3D Desktop effects</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
@@ -8712,9 +8719,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/mcc-localdisks.xml:10
 msgid ""
-"<imageobject> <imagedata xml:id=\"mcc-localdisks-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"mcc-localdisks.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"mcc-localdisks-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"mcc-localdisks.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8747,9 +8753,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/mcc-networkservices.xml:8
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"mcc-networkservices.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"mcc-networkservices-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"mcc-networkservices.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"mcc-networkservices-im1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8795,8 +8801,8 @@ msgstr ""
 #: en/mcc-networksharing.xml:8
 msgid ""
 "<imageobject> <imagedata xml:id=\"mcc-networksharing-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"mcc-networksharing.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"mcc-networksharing.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8971,8 +8977,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/mcc-sharing.xml:8
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"mcc-sharing.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"mcc-sharing-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"mcc-sharing.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"mcc-sharing-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -9002,9 +9008,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/mcc-system.xml:8
 msgid ""
-"<imageobject> <imagedata fileref=\"mcc-system.png\" "
-"xml:id=\"mcc-system-im1\" revision=\"1\" align=\"center\" format=\"PNG\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"mcc-system.png\" xml:id=\"mcc-system-"
+"im1\" revision=\"1\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -9067,8 +9072,8 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:58
 msgid ""
-"<xref linkend=\"userdrake\"></xref><emphasis> = Manage users on "
-"system</emphasis>"
+"<xref linkend=\"userdrake\"></xref><emphasis> = Manage users on system</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
@@ -9090,25 +9095,24 @@ msgstr ""
 #: en/MCC.xml:6
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link "
-"ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">"
-"http://creativecommons.org/licenses/by-sa/3.0/</link>."
+"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:9
 msgid ""
-"This manual was produced with the help of the <link "
-"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
-"ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>."
+"This manual was produced with the help of the <link ns6:href=\"http://www."
+"calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
+"neodoc.biz\">NeoDoc</link>."
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:11
 msgid ""
-"It was written by volunteers in their free time. Please contact <link "
-"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
-"Team</link>, if you would like to help improve this manual."
+"It was written by volunteers in their free time. Please contact <link ns6:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
+"link>, if you would like to help improve this manual."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -9124,26 +9128,25 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/mgaapplet-config.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"xml:id=\"mgaapplet-config-im1\" format=\"PNG\" "
-"fileref=\"mgaapplet-config.png\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"mgaapplet-"
+"config-im1\" format=\"PNG\" fileref=\"mgaapplet-config.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/mgaapplet-config.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">mgaapplet-config</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">mgaapplet-config</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
-"Control Center under the tab <emphasis role=\"bold\">Software "
-"management</emphasis>. It is also available by a <guimenu>right click / "
-"Updates configuration</guimenu> on the red icon <placeholder "
-"type=\"inlinemediaobject\" id=\"1\"/> in the system tray."
+"Control Center under the tab <emphasis role=\"bold\">Software management</"
+"emphasis>. It is also available by a <guimenu>right click / Updates "
+"configuration</guimenu> on the red icon <placeholder type=\"inlinemediaobject"
+"\" id=\"1\"/> in the system tray."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -9151,8 +9154,7 @@ msgstr ""
 msgid ""
 "The first slider allows you to change how frequently Mageia will check for "
 "updates and the second the delay after booting before the first check.  The "
-"check box gives you the option to be warned when a new Mageia release is "
-"out."
+"check box gives you the option to be warned when a new Mageia release is out."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -9168,15 +9170,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/mousedrake.xml:10
 msgid ""
-"<imageobject> <imagedata xml:id=\"mousedrake-im1\" revision=\"1\" "
-"fileref=\"mousedrake.png\" align=\"center\" format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata xml:id=\"mousedrake-im1\" revision=\"1\" fileref="
+"\"mousedrake.png\" align=\"center\" format=\"PNG\" /> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/mousedrake.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">mousedrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">mousedrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -9215,15 +9217,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/msecgui.xml:7
 msgid ""
-"<imageobject> <imagedata xml:id=\"msecgui-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"msecgui.png\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"msecgui-im1\" revision=\"1\" align=\"center"
+"\" format=\"PNG\" fileref=\"msecgui.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/msecgui.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">msecgui</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">msecgui</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -9239,8 +9241,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/rpmdrake.xml:10
 msgid ""
-"<imageobject> <imagedata xml:id=\"rpmdrake-im1\" revision=\"1\" "
-"fileref=\"rpmdrake.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"rpmdrake-im1\" revision=\"1\" fileref="
+"\"rpmdrake.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -9251,8 +9253,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/rpmdrake.xml:21
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">rpmdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">rpmdrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -9274,8 +9276,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/rpmdrake.xml:35
 msgid ""
-"To work, rpmdrake needs the repositories to be configured with <xref "
-"linkend=\"drakrpm-edit-media\"/> ."
+"To work, rpmdrake needs the repositories to be configured with <xref linkend="
+"\"drakrpm-edit-media\"/> ."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -9315,8 +9317,8 @@ msgstr ""
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/rpmdrake.xml:70
 msgid ""
-"<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> "
-"</firstterm>"
+"<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
+"firstterm>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
@@ -9404,8 +9406,8 @@ msgid ""
 "list of packages fulfilling your query and, don't forget, the chosen medium "
 "is shown with different status markers according to whether each package is "
 "installed/not installed/an update... To change this status, just check or "
-"uncheck the box before the package name and click on "
-"<guibutton>Apply</guibutton>."
+"uncheck the box before the package name and click on <guibutton>Apply</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
@@ -9585,9 +9587,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/sample-page-picture.xml:30
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-license.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"acceptLicense-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-license.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"acceptLicense-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -9613,8 +9615,7 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/sample-page-sections.xml:21
 msgid ""
-"In html you can link to it by adding #second-section to the link to this "
-"page"
+"In html you can link to it by adding #second-section to the link to this page"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -9625,8 +9626,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/sample-page-sections.xml:27
 msgid ""
-"And this section will be shown when going to "
-"<code>/sample-page-sections#third-section</code>"
+"And this section will be shown when going to <code>/sample-page-"
+"sections#third-section</code>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -9686,9 +9687,9 @@ msgstr ""
 #: en/scannerdrake.xml:21
 msgid ""
 "This tool <placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
-"a single scanner device or a multifunction device which includes "
-"scanning. It also allows you to share local devices connected to this "
-"computer with a remote computer or to access remote scanners."
+"a single scanner device or a multifunction device which includes scanning. "
+"It also allows you to share local devices connected to this computer with a "
+"remote computer or to access remote scanners."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -9712,9 +9713,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:38
 msgid ""
-"Choose <emphasis>Yes</emphasis> to continue. It will install "
-"<code>scanner-gui</code> and <code>task-scanning</code> if they are not yet "
-"installed."
+"Choose <emphasis>Yes</emphasis> to continue. It will install <code>scanner-"
+"gui</code> and <code>task-scanning</code> if they are not yet installed."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
@@ -9736,8 +9736,8 @@ msgstr ""
 #: en/scannerdrake.xml:55
 msgid ""
 "In that case, you might now want to want to configure the <emphasis>Scanner "
-"sharing</emphasis> option. You can read about it in the <xref "
-"linkend=\"scannersharing\"/>."
+"sharing</emphasis> option. You can read about it in the <xref linkend="
+"\"scannersharing\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -9766,17 +9766,17 @@ msgstr ""
 #. type: Content of: <section><section><note><para>
 #: en/scannerdrake.xml:76
 msgid ""
-"If you can't find your scanner in the list, then click "
-"<emphasis>Cancel</emphasis>"
+"If you can't find your scanner in the list, then click <emphasis>Cancel</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/scannerdrake.xml:79
 msgid ""
-"Please check whether your scanner is supported on the <link "
-"xlink:href=\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: "
-"Supported Devices</link> page and ask for help in the <link "
-"xlink:href=\"http://forums.mageia.org/en/\">forums</link>."
+"Please check whether your scanner is supported on the <link xlink:href="
+"\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: Supported "
+"Devices</link> page and ask for help in the <link xlink:href=\"http://forums."
+"mageia.org/en/\">forums</link>."
 msgstr ""
 
 #. type: Content of: <section><section><figure><info><title>
@@ -9794,9 +9794,9 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:97
 msgid ""
-"You can leave this setting to <emphasis>Auto-detect available "
-"ports</emphasis> unless your scanner's interface is a parallel port. In that "
-"case, select <emphasis>/dev/parport0</emphasis> if you have only one."
+"You can leave this setting to <emphasis>Auto-detect available ports</"
+"emphasis> unless your scanner's interface is a parallel port. In that case, "
+"select <emphasis>/dev/parport0</emphasis> if you have only one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -9809,8 +9809,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:104
 msgid ""
-"If you don't get that screen, then please read the <xref "
-"linkend=\"scannerextrasteps\"/>."
+"If you don't get that screen, then please read the <xref linkend="
+"\"scannerextrasteps\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
@@ -9933,8 +9933,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:193
 msgid ""
-"It will also configure <emphasis>saned</emphasis> and "
-"<emphasis>xinetd</emphasis> to be started on boot."
+"It will also configure <emphasis>saned</emphasis> and <emphasis>xinetd</"
+"emphasis> to be started on boot."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -9952,8 +9952,8 @@ msgstr ""
 msgid ""
 "Most HP scanners are managed from <emphasis>HP Device Manager</emphasis> "
 "(hplip) which also manages printers. In this case, this tool does not allow "
-"you to configure it and invites you to use <emphasis>HP Device "
-"Manager</emphasis>."
+"you to configure it and invites you to use <emphasis>HP Device Manager</"
+"emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -9964,11 +9964,9 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:216
 msgid ""
-"Drivers are available from <link "
-"xlink:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">"
-"this "
-"page</link>. When indicated, you must install the "
-"<emphasis>iscan-data</emphasis> package first, then "
+"Drivers are available from <link xlink:href=\"http://download.ebz.epson.net/"
+"dsc/search/01/search/?OSC=LX\">this page</link>. When indicated, you must "
+"install the <emphasis>iscan-data</emphasis> package first, then "
 "<emphasis>iscan</emphasis> (in this order). It is possible that the "
 "<emphasis>iscan</emphasis> package will generate a warning about a conflict "
 "with <emphasis>sane</emphasis>. Users have reported that this warning can be "
@@ -10008,16 +10006,16 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:246
 msgid ""
-"Also, you may get a screen telling you to adjust the "
-"<emphasis>/etc/sane.d/\"name_of_your_SANE_backend\".conf file.</emphasis>"
+"Also, you may get a screen telling you to adjust the <emphasis>/etc/sane.d/"
+"\"name_of_your_SANE_backend\".conf file.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:250
 msgid ""
 "Read those or other instructions you get carefully and if you don't know "
-"what to do, feel free to ask for help in the <link "
-"xlink:href=\"http://forums.mageia.org/en/\">forums</link>."
+"what to do, feel free to ask for help in the <link xlink:href=\"http://"
+"forums.mageia.org/en/\">forums</link>."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><title>
@@ -10029,15 +10027,15 @@ msgstr ""
 #: en/software-management.xml:9
 msgid ""
 "<imageobject> <imagedata xml:id=\"software-management-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"software-management.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"software-management.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/software-management.xml:14
 msgid ""
-"In this screen you can choose between several tools for software "
-"management. Click on a link below to learn more."
+"In this screen you can choose between several tools for software management. "
+"Click on a link below to learn more."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
@@ -10048,8 +10046,8 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:20
 msgid ""
-"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Update your "
-"system</emphasis>"
+"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Update your system</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
@@ -10077,9 +10075,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/system-config-printer.xml:15
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"xml:id=\"system-config-printer-im1\" format=\"PNG\" "
-"fileref=\"system-config-printer.png\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"system-"
+"config-printer-im1\" format=\"PNG\" fileref=\"system-config-printer.png\"/> "
+"</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10103,9 +10101,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/system-config-printer.xml:37
 msgid ""
-"You can start this tool from the command line, by typing "
-"<emphasis>system-config-printer</emphasis>. The root password will be asked "
-"for."
+"You can start this tool from the command line, by typing <emphasis>system-"
+"config-printer</emphasis>. The root password will be asked for."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10113,8 +10110,8 @@ msgstr ""
 msgid ""
 "Printer installation is carried out in the <guilabel>Hardware</guilabel> "
 "section of the Mageia Control Centre. Select the <guilabel>Configure "
-"printing and scanning</guilabel> tool<placeholder type=\"footnote\" "
-"id=\"0\"/>."
+"printing and scanning</guilabel> tool<placeholder type=\"footnote\" id=\"0\"/"
+">."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10158,8 +10155,8 @@ msgstr ""
 #: en/system-config-printer.xml:63
 msgid ""
 "This usually refers to USB printers. The utility automatically finds the "
-"name of the printer and displays it. Select the printer and then click "
-"\"Next\". If there is a known driver associated for the printer, it will be "
+"name of the printer and displays it. Select the printer and then click \"Next"
+"\". If there is a known driver associated for the printer, it will be "
 "automatically installed. If there is more than one driver or no known "
 "drivers, a window will ask you to select or furnish one, as explained in the "
 "next paragraph. Continue with <xref linkend=\"terminate\"/>"
@@ -10296,11 +10293,11 @@ msgid ""
 "JetDirect. It allows access to a printer directly connected to the network "
 "via an Ethernet port. You must know the IP-address at which the printer is "
 "known on the network. This technique is also used inside some ADSL-routers "
-"which contain an USB port to connect the printer. In this case, the "
-"IP-address is that of the router. Note that the tool \"Hp Device manager\" "
-"can manage dynamically configured IP-adress, setting an URI like "
-"<emphasis>hp:/net/&lt;name-of-the-printer></emphasis> . In this case, fixed "
-"IP-adress is not required."
+"which contain an USB port to connect the printer. In this case, the IP-"
+"address is that of the router. Note that the tool \"Hp Device manager\" can "
+"manage dynamically configured IP-adress, setting an URI like <emphasis>hp:/"
+"net/&lt;name-of-the-printer></emphasis> . In this case, fixed IP-adress is "
+"not required."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10407,9 +10404,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:251
 msgid ""
-"Additional information can be found in the <link "
-"ns2:href=\"http://www.cups.org/documentation.php/doc-1.5/network.html\">CUPS "
-"documentation.</link>"
+"Additional information can be found in the <link ns2:href=\"http://www.cups."
+"org/documentation.php/doc-1.5/network.html\">CUPS documentation.</link>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -10422,11 +10418,10 @@ msgstr ""
 msgid ""
 "You can access the properties of the device. The menu allows access to "
 "parameters for the CUPS server. By default a CUPS server is launched on your "
-"system, but you can specify a different one with the "
-"<guimenu>Server</guimenu> | <guimenuitem>Connect...</guimenuitem> menu, "
-"another window which gives access to the tuning of other specific parameters "
-"of the server, following <guimenu>Server</guimenu> | "
-"<guimenuitem>Settings.</guimenuitem>"
+"system, but you can specify a different one with the <guimenu>Server</"
+"guimenu> | <guimenuitem>Connect...</guimenuitem> menu, another window which "
+"gives access to the tuning of other specific parameters of the server, "
+"following <guimenu>Server</guimenu> | <guimenuitem>Settings.</guimenuitem>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -10444,23 +10439,23 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:273
 msgid ""
-"You can also access to a tool to diagnose problems using the "
-"<guimenu>Help</guimenu> | <guilabel>Troubleshoot</guilabel> menu."
+"You can also access to a tool to diagnose problems using the <guimenu>Help</"
+"guimenu> | <guilabel>Troubleshoot</guilabel> menu."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:280
 msgid ""
 "It is possible that some drivers for specific printers are not available in "
-"Mageia or are not functional. In this case, have a look at the <link "
-"ns2:href=\"http://openprinting.org/printers/\">openprinting</link> site to "
-"check if a driver for your device is available. If yes, check if the package "
-"is already present in Mageia and in this case install it manually. Then, "
-"redo the installation process to configure the printer. In all cases, report "
-"the problem in bugzilla or on the forum if you are comfortable with this "
-"tool and furnish the model and driver information and whether the printer "
-"works or not after installation. Here are some sources to find other "
-"up-to-date drivers or for more recent devices."
+"Mageia or are not functional. In this case, have a look at the <link ns2:"
+"href=\"http://openprinting.org/printers/\">openprinting</link> site to check "
+"if a driver for your device is available. If yes, check if the package is "
+"already present in Mageia and in this case install it manually. Then, redo "
+"the installation process to configure the printer. In all cases, report the "
+"problem in bugzilla or on the forum if you are comfortable with this tool "
+"and furnish the model and driver information and whether the printer works "
+"or not after installation. Here are some sources to find other up-to-date "
+"drivers or for more recent devices."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10471,11 +10466,9 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:294
 msgid ""
-"<link "
-"ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/downl"
-"oad_prn.html\">This "
-"page</link> give a list of drivers provided by Brother. Search the driver "
-"for your device, download the rpm(s) and install."
+"<link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/"
+"en/download_prn.html\">This page</link> give a list of drivers provided by "
+"Brother. Search the driver for your device, download the rpm(s) and install."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10487,8 +10480,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:301
 msgid ""
-"<emphasis role=\"bold\">Hewlett-Packard printers and All in one "
-"devices</emphasis>"
+"<emphasis role=\"bold\">Hewlett-Packard printers and All in one devices</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10496,13 +10489,11 @@ msgstr ""
 msgid ""
 "These devices use the hplip tool. It is installed automatically after the "
 "detection or the selection of the printer. You can find other information "
-"<link "
-"ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">here</link>.  "
-"The tool \"HP Device Manager\" is available in the "
-"<guilabel>System</guilabel> menu. Also view <link "
-"ns2:href=\"http://hplipopensource.com/hplip-web/install/manual/hp_setup.html\""
-">configuration</link> "
-"for the management of the printer."
+"<link ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">here</"
+"link>.  The tool \"HP Device Manager\" is available in the <guilabel>System</"
+"guilabel> menu. Also view <link ns2:href=\"http://hplipopensource.com/hplip-"
+"web/install/manual/hp_setup.html\">configuration</link> for the management "
+"of the printer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10525,9 +10516,9 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:321
 msgid ""
-"For specific Samsung and Xerox colour printers, <link "
-"ns2:href=\"http://foo2qpdl.rkkda.com/\">this site provides drivers</link> "
-"for the QPDL protocol."
+"For specific Samsung and Xerox colour printers, <link ns2:href=\"http://"
+"foo2qpdl.rkkda.com/\">this site provides drivers</link> for the QPDL "
+"protocol."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10538,12 +10529,12 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:326
 msgid ""
-"Drivers for Epson printers are available from <link "
-"ns2:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this "
-"search page</link>. For the scanner part, you must install the "
-"\"iscan-data\" package first, then \"iscan\" (in this order). A iscan-plugin "
-"package can also be available and is to install. Choose the "
-"<emphasis>rpm</emphasis> packages according to your architecture."
+"Drivers for Epson printers are available from <link ns2:href=\"http://"
+"download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this search page</"
+"link>. For the scanner part, you must install the \"iscan-data\" package "
+"first, then \"iscan\" (in this order). A iscan-plugin package can also be "
+"available and is to install. Choose the <emphasis>rpm</emphasis> packages "
+"according to your architecture."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -10578,16 +10569,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/transfugdrake.xml:16
 msgid ""
-"<imageobject> <imagedata xml:id=\"transfugdrake-im1\" revision=\"1\" "
-"fileref=\"transfugdrake.png\" align=\"center\" format=\"PNG\"/> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"transfugdrake-im1\" revision=\"1\" fileref="
+"\"transfugdrake.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/transfugdrake.xml:22
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">transfugdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">transfugdrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -10603,9 +10593,9 @@ msgstr ""
 msgid ""
 "The tool allows an administrator to import the user documents and settings "
 "from a <trademark class=\"registered\">Windows</trademark> 2000, <trademark "
-"class=\"registered\">Windows</trademark> XP or <trademark "
-"class=\"registered\">Windows</trademark> <trademark>Vista</trademark> "
-"installation on the same computer as the Mageia installation."
+"class=\"registered\">Windows</trademark> XP or <trademark class=\"registered"
+"\">Windows</trademark> <trademark>Vista</trademark> installation on the same "
+"computer as the Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -10649,9 +10639,9 @@ msgstr ""
 #: en/transfugdrake.xml:56
 msgid ""
 "Please take into account that due to migrate-assistant (the backend of "
-"transfugdrake) limitations <trademark "
-"class=\"registered\">Windows</trademark> user account names with special "
-"symbols can be displayed incorrectly."
+"transfugdrake) limitations <trademark class=\"registered\">Windows</"
+"trademark> user account names with special symbols can be displayed "
+"incorrectly."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -10665,18 +10655,17 @@ msgstr ""
 msgid ""
 "Some <trademark class=\"registered\">Windows</trademark> applications "
 "(especially drivers) may create user accounts for different purposes. For "
-"example, NVidia drivers in <trademark "
-"class=\"registered\">Windows</trademark>are updated using "
-"<emphasis>UpdatusUser</emphasis>. Please do not use such accounts for the "
-"import purposes."
+"example, NVidia drivers in <trademark class=\"registered\">Windows</"
+"trademark>are updated using <emphasis>UpdatusUser</emphasis>. Please do not "
+"use such accounts for the import purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:74
 msgid ""
-"When you finished with the accounts selection press "
-"<guibutton>Next</guibutton> button. The next page is used to select a method "
-"to import documents:"
+"When you finished with the accounts selection press <guibutton>Next</"
+"guibutton> button. The next page is used to select a method to import "
+"documents:"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
@@ -10688,11 +10677,10 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:84
 msgid ""
-"Transfugdrake is designed to import <trademark "
-"class=\"registered\">Windows</trademark> data from <emphasis>My "
-"Documents</emphasis>, <emphasis>My Music</emphasis> and <emphasis>My "
-"Pictures</emphasis> folders. It is possible to skip import by selecting the "
-"appropriate item in this window."
+"Transfugdrake is designed to import <trademark class=\"registered\">Windows</"
+"trademark> data from <emphasis>My Documents</emphasis>, <emphasis>My Music</"
+"emphasis> and <emphasis>My Pictures</emphasis> folders. It is possible to "
+"skip import by selecting the appropriate item in this window."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -10738,8 +10726,7 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:120
 msgid ""
-"Choose the preferred option and press the <guibutton>Next</guibutton> "
-"button."
+"Choose the preferred option and press the <guibutton>Next</guibutton> button."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -10764,9 +10751,9 @@ msgstr ""
 #: en/uninstall-linux.xml:6
 msgid ""
 "<placeholder type=\"indexterm\" id=\"0\"/> <placeholder type=\"indexterm\" "
-"id=\"1\"/> If for any reason you want to uninstall "
-"<application>Mageia</application>, you can do so. The process of "
-"uninstalling <application>Mageia</application> is done in two steps:"
+"id=\"1\"/> If for any reason you want to uninstall <application>Mageia</"
+"application>, you can do so. The process of uninstalling "
+"<application>Mageia</application> is done in two steps:"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -10783,10 +10770,9 @@ msgid ""
 "Delete all partitions related to <application>Mageia</application> on your "
 "hard drive (usually partitions hosting <acronym>ext3</acronym> file systems "
 "and the <systemitem>Swap</systemitem> partition)  and — optionally — replace "
-"them with a single partition using "
-"<application>DiskDrake</application><phrase condition=\"Starter\" "
-"xml:id=\"BIdNEW-uninstall-linux-ph1\" revision=\"1\"> (see <xref "
-"linkend=\"diskdrake\" />)</phrase>."
+"them with a single partition using <application>DiskDrake</"
+"application><phrase condition=\"Starter\" xml:id=\"BIdNEW-uninstall-linux-"
+"ph1\" revision=\"1\"> (see <xref linkend=\"diskdrake\" />)</phrase>."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para><indexterm><secondary>
@@ -10802,14 +10788,13 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/uninstall-linux.xml:41
 msgid ""
-"Remove<placeholder type=\"indexterm\" id=\"0\"/><placeholder "
-"type=\"indexterm\" id=\"1\"/><placeholder type=\"indexterm\" "
-"id=\"2\"/><placeholder type=\"indexterm\" id=\"3\"/> the bootloader, "
-"<application>LILO</application> in this example, from the Master Boot Record "
-"(<acronym>MBR</acronym>). To do so, execute <command>lilo -U</command> in a "
-"console, as <literal>root</literal>. Doing this will not only uninstall "
-"<application>LILO</application> but will also restore the previous master "
-"boot record, if any."
+"Remove<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm"
+"\" id=\"1\"/><placeholder type=\"indexterm\" id=\"2\"/><placeholder type="
+"\"indexterm\" id=\"3\"/> the bootloader, <application>LILO</application> in "
+"this example, from the Master Boot Record (<acronym>MBR</acronym>). To do "
+"so, execute <command>lilo -U</command> in a console, as <literal>root</"
+"literal>. Doing this will not only uninstall <application>LILO</application> "
+"but will also restore the previous master boot record, if any."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
@@ -10832,15 +10817,15 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/userdrake.xml:17
 msgid ""
-"<imageobject> <imagedata xml:id=\"userdrake-im1\" revision=\"1\" "
-"fileref=\"userdrake.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"userdrake-im1\" revision=\"1\" fileref="
+"\"userdrake.png\" align=\"center\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/userdrake.xml:23
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">userdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">userdrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -10898,11 +10883,11 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/userdrake.xml:52
 msgid ""
-"Setting a <emphasis role=\"bold\">Password</emphasis> is highly "
-"recommended. There is a little shield on the right, if it is red, the "
-"password is weak, too short or is too similar to the login name. You should "
-"use figures, lower and upper case characters, punctuation marks, etc. The "
-"shield will turn orange and then green as the password strength improves."
+"Setting a <emphasis role=\"bold\">Password</emphasis> is highly recommended. "
+"There is a little shield on the right, if it is red, the password is weak, "
+"too short or is too similar to the login name. You should use figures, lower "
+"and upper case characters, punctuation marks, etc. The shield will turn "
+"orange and then green as the password strength improves."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -11043,10 +11028,10 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/userdrake.xml:128
 msgid ""
-"Select a user or a group and click on <emphasis "
-"role=\"bold\">Delete</emphasis> to remove it. For a user, a window appears "
-"to ask if home directory and mailbox must also be deleted. If a private "
-"group has been created for the user, it will be deleted as well."
+"Select a user or a group and click on <emphasis role=\"bold\">Delete</"
+"emphasis> to remove it. For a user, a window appears to ask if home "
+"directory and mailbox must also be deleted. If a private group has been "
+"created for the user, it will be deleted as well."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -11096,16 +11081,16 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/XFdrake.xml:9
 msgid ""
-"<imageobject> <imagedata xml:id=\"XFdrake-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"XFdrake.png\" /> </imageobject>"
+"<imageobject> <imagedata xml:id=\"XFdrake-im1\" revision=\"1\" align=\"center"
+"\" format=\"PNG\" fileref=\"XFdrake.png\" /> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
 #: en/XFdrake.xml:17
 msgid ""
-"You can start this tool from the command line, by typing "
-"<emphasis>XFdrake</emphasis> as normal user or <emphasis>drakx11</emphasis> "
-"as root. Mind the capital letters."
+"You can start this tool from the command line, by typing <emphasis>XFdrake</"
+"emphasis> as normal user or <emphasis>drakx11</emphasis> as root. Mind the "
+"capital letters."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -11113,8 +11098,8 @@ msgstr ""
 msgid ""
 "This tool is present in the Mageia Control Center under the tab <emphasis "
 "role=\"bold\">Hardware</emphasis>. Select <emphasis><guilabel>Set up the "
-"graphical server</guilabel></emphasis>.  <placeholder type=\"footnote\" "
-"id=\"0\"/>"
+"graphical server</guilabel></emphasis>.  <placeholder type=\"footnote\" id="
+"\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -11267,9 +11252,9 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/XFdrake.xml:99
 msgid ""
-"<guilabel>Global options</guilabel>: If <emphasis>Disable "
-"Ctrl-Alt-Backspace</emphasis> is checked, it will no longer be possible to "
-"restart X server using Ctrl+Alt+Backspace keys."
+"<guilabel>Global options</guilabel>: If <emphasis>Disable Ctrl-Alt-"
+"Backspace</emphasis> is checked, it will no longer be possible to restart X "
+"server using Ctrl+Alt+Backspace keys."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
@@ -11283,9 +11268,9 @@ msgstr ""
 #: en/XFdrake.xml:107
 msgid ""
 "<guilabel>Graphical interface at startup</guilabel>: Most of the time, "
-"<emphasis>Automatically start the graphical interface (Xorg) upon "
-"booting</emphasis> is checked to make the boot switch to graphical mode, it "
-"may be unchecked for a server."
+"<emphasis>Automatically start the graphical interface (Xorg) upon booting</"
+"emphasis> is checked to make the boot switch to graphical mode, it may be "
+"unchecked for a server."
 msgstr ""
 
 #. type: Content of: <section><para>
author	Marja van Waes <marja@mageia.org>	2013-10-10 17:16:40 +0200
committer	Marja van Waes <marja@mageia.org>	2013-10-10 17:16:40 +0200
commit	09f1dd8cb4575245a1a88d52db7184306e209e6d (patch)
tree	4438dcee78d8fcb3c24f7ed50dc678f45ce97ebe /docs
parent	1d3d422748c2a174bb72f7155689f185ce46c991 (diff)
download	tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.tar tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.tar.gz tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.tar.bz2 tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.tar.xz tools-09f1dd8cb4575245a1a88d52db7184306e209e6d.zip