Update translations

1 files changed, 253 insertions, 264 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index 6c837857..8c1a939b 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2013-12-09 07:14+0200\n"
+"POT-Creation-Date: 2013-12-24 21:23+0200\n"
 "PO-Revision-Date: 2013-12-21 17:07+0100\n"
 "Last-Translator: Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>\n"
 "Language-Team: Catalan <>\n"
@@ -25,8 +25,8 @@ msgstr "Llicència i notes de la versió"
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:36
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -44,9 +44,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:51
 msgid ""
-"These terms and conditions apply to the entire "
-"<application>Mageia</application> distribution and must be accepted before "
-"you can continue."
+"These terms and conditions apply to the entire <application>Mageia</"
+"application> distribution and must be accepted before you can continue."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -59,8 +58,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:58
 msgid ""
-"If you decide not to accept these conditions, then we thank you for "
-"looking. Clicking <guibutton>Quit</guibutton> will reboot your computer."
+"If you decide not to accept these conditions, then we thank you for looking. "
+"Clicking <guibutton>Quit</guibutton> will reboot your computer."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -85,15 +84,15 @@ msgstr ""
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 
-#.  papoteur 2013-04-13  - created
-#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#.  papoteur 2013-04-13  - created 
+#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
+#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
 #: en/add_supplemental_media.xml:18
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-add_supplemental_media.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -130,19 +129,19 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestió d'usuaris i superusuari"
 
-#.  Started by marja,using Led43's text, on 2012 03 27
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
+#.  Started by marja,using Led43's text, on 2012 03 27 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
 #.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing
-#.        about guest account there, is the box you can tick or untick to enable or
+#.        changed his text about the Advanced User Managment screen (the only thing 
+#.        about guest account there, is the box you can tick or untick to enable or 
 #.        disable it, the rest is about the normal user you're adding in the previous
 #.        screen), marja, 20120409
 #.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct?
-#.  JohnR 2012-04-19 Language proofreading
-#.  marja 2012-04-24 Added screenshot
-#.  marja 2013-04-26 added new note
+#.        "rbash" in the xguest warning - is that correct? 
+#.  JohnR 2012-04-19 Language proofreading  
+#.  marja 2012-04-24 Added screenshot 
+#.  marja 2013-04-26 added new note 
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:27
 msgid ""
@@ -271,8 +270,8 @@ msgstr "Gestió avançada d'usuaris"
 #: en/addUser.xml:119
 msgid ""
 "If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are "
-"adding. Additionally, you can disable or enable a guest account."
+"screen that allows you to edit the settings for the user you are adding. "
+"Additionally, you can disable or enable a guest account."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
@@ -320,23 +319,23 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Trieu els punts de muntatge"
 
-#.  Made by marja on 2012 03 28
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, marja, 20120409
+#.  Made by marja on 2012 03 28 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, marja, 20120409 
 #.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#.        with "a", as I can't imagine having more than one root partition ;)
-#.  Lebarhon : I put [] where it seems having mistakes
+#.        with "a", as I can't imagine having more than one root partition ;) 
+#.  Lebarhon : I put [] where it seems having mistakes 
 #.  Marja: you're right, in English English it is "its type", however, the Americans
 #.        write "it's type". And you're right about the redundant part, too, I removed it
-#.  And JohnR says the Americans are WRONG! :-))
-#.  2012-04-19  Language proofreading done
+#.  And JohnR says the Americans are WRONG! :-)) 
+#.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-chooseMountpoints.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"chooseMountPoints-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"chooseMountPoints-im1\"></"
+"imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -357,8 +356,8 @@ msgstr ""
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:44
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount "
-"point\", \"Type\")."
+"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
+"\", \"Type\")."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -375,8 +374,8 @@ msgid ""
 "the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
 "and <literal>/var</literal>. You can even make your own mount points, for "
 "instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the "
-"<literal>/home</literal> partition of a cauldron install."
+"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
+"literal> partition of a cauldron install."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -397,9 +396,9 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:77
 msgid ""
-"If you are sure the mount points are correct, click on "
-"<guibutton>Next</guibutton>, and choose whether you only want to format the "
-"partition(s) DrakX suggests, or more."
+"If you are sure the mount points are correct, click on <guibutton>Next</"
+"guibutton>, and choose whether you only want to format the partition(s) "
+"DrakX suggests, or more."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -450,8 +449,8 @@ msgstr "Selecció de grup de paquets"
 #. type: Content of: <section><mediaobject>
 #: en/choosePackageGroups.xml:10
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -501,25 +500,24 @@ msgstr "Trieu paquets individuals"
 #. type: Content of: <section><mediaobject>
 #: en/choosePackagesTree.xml:11
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackagesTree.xml:17
 msgid ""
-"Here you can add or remove any extra packages to customise your "
-"installation."
+"Here you can add or remove any extra packages to customise your installation."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackagesTree.xml:20
 msgid ""
-"After having made your choice, you can click on the <guibutton>floppy "
-"icon</guibutton> at the bottom of the page to save your choice of packages "
-"(saving to a USB key works, too). You can then use this file to install the "
-"same packages on another system, by pressing the same button during install "
-"and choosing to load it."
+"After having made your choice, you can click on the <guibutton>floppy icon</"
+"guibutton> at the bottom of the page to save your choice of packages (saving "
+"to a USB key works, too). You can then use this file to install the same "
+"packages on another system, by pressing the same button during install and "
+"choosing to load it."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -527,21 +525,20 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configura els serveis"
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureServices.xml:21
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureServices.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"configureServices-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:27
 msgid ""
-"Here you can set which services should (not) start when you boot your "
-"system."
+"Here you can set which services should (not) start when you boot your system."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -573,14 +570,14 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Configura la zona horària"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:20
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureTimezoneUTC.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"configureTimezoneUTC-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -612,9 +609,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/configureX_card_list.xml:16
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"xml:id=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -693,9 +690,9 @@ msgstr "Configuració de targeta gràfica i monitor"
 #. type: Content of: <section><mediaobject>
 #: en/configureX_chooser.xml:11
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"configureX_chooser-im1\"> </imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
+"imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -706,10 +703,10 @@ msgid ""
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
 "<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following "
-"<acronym>X</acronym> settings need to be correct. Choose the correct "
-"settings if you can see that <application>DrakX</application> didn't make a "
-"choice, or if you think the choice is incorrect."
+"any other graphical environment to work well, the following <acronym>X</"
+"acronym> settings need to be correct. Choose the correct settings if you can "
+"see that <application>DrakX</application> didn't make a choice, or if you "
+"think the choice is incorrect."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -724,8 +721,8 @@ msgstr ""
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
 "<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> "
-"list. Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
+"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
+"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
 "horizontal and vertical refresh rates of your monitor."
 msgstr ""
 
@@ -747,11 +744,11 @@ msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
 "always appear during install. If the button is there, you can control your "
 "settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be "
-"kept. If you don't see anything, you'll return to the configuration screen "
-"and be able to reconfigure everything until the test is good. <emphasis>Make "
-"sure your settings are on the safe side if the test button isn't "
-"available</emphasis>"
+"settings are correct, you can answer \"yes\", and the settings will be kept. "
+"If you don't see anything, you'll return to the configuration screen and be "
+"able to reconfigure everything until the test is good. <emphasis>Make sure "
+"your settings are on the safe side if the test button isn't available</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -785,9 +782,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/configureX_monitor.xml:34
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"configureX_monitor-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -870,8 +867,8 @@ msgstr "Particionament personalitzat del disc amb DiskDrake"
 #. type: Content of: <section><mediaobject>
 #: en/diskdrake.xml:26
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -945,8 +942,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/doPartitionDisks.xml:38
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks.png\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
@@ -1094,25 +1091,24 @@ msgstr "</note>"
 #: en/DrakX.xml:12
 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/DrakX.xml:16
 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/DrakX.xml:18
 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>
@@ -1120,24 +1116,24 @@ msgstr ""
 msgid "Congratulations"
 msgstr "Enhorabona"
 
-#.  Started by marja on 2012 03 29
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#.  marja - 2012-04-24 added screenshot and text
+#.  Started by marja on 2012 03 29 
+#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
+#.  marja - 2012-04-24 added screenshot and text 
 #.  same day, added "s" to "sytems"
 #. type: Content of: <section><mediaobject>
 #: en/exitInstall.xml:14
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> "
-"</imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/exitInstall.xml:21
 msgid ""
-"You have finished installing and configuring "
-"<application>Mageia</application> and it is now safe to remove the "
-"installation medium and reboot your computer."
+"You have finished installing and configuring <application>Mageia</"
+"application> and it is now safe to remove the installation medium and reboot "
+"your computer."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1171,16 +1167,16 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatació"
 
-#.  Made by marja on 2012 03 29
-#.  NEEDS TO BE REVIEWED!
-#.  marja 2012-04-24 added screenshot
-#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#.  Made by marja on 2012 03 29 
+#.  NEEDS TO BE REVIEWED! 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
 #: en/formatPartitions.xml:18
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </"
+"imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1214,8 +1210,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:44
 msgid ""
-"When you are confident about the selection, click on "
-"<guibutton>Next</guibutton> to continue."
+"When you are confident about the selection, click on <guibutton>Next</"
+"guibutton> to continue."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -1246,24 +1242,24 @@ msgstr "Pantalla de benvinguda de la instal·lació"
 #. type: Content of: <section><figure><mediaobject>
 #: en/installer.xml:39
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><figure>
 #: en/installer.xml:34 en/installer.xml:90
 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><para>
 #: en/installer.xml:47
 msgid ""
 "If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref "
-"linkend=\"installationOptions\"></xref>."
+"special installation options, see <xref linkend=\"installationOptions\"></"
+"xref>."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -1281,9 +1277,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/installer.xml:58
 msgid ""
-"Each step has one or more screens which may also have "
-"<guibutton>Advanced</guibutton> buttons with extra, less commonly required, "
-"options."
+"Each step has one or more screens which may also have <guibutton>Advanced</"
+"guibutton> buttons with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -1315,8 +1310,8 @@ msgstr "Opcions d'instal·lació"
 #: en/installer.xml:83
 msgid ""
 "If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 "
-"(Help)</guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
+"of the extra options available by hitting the <guibutton>F1 (Help)</"
+"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -1332,9 +1327,9 @@ msgstr "Pantalla d'ajuda de la instal·lació"
 #. type: Content of: <section><section><figure><mediaobject>
 #: en/installer.xml:96
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
@@ -1350,17 +1345,17 @@ msgstr "Sense interfície gràfica"
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/installer.xml:116
 msgid ""
-"After the initial screen you did not reach the language selection "
-"screen. This can happen with some graphic cards and older systems. Try using "
-"low resolution by typing <code>vgalo</code> at the prompt."
+"After the initial screen you did not reach the language selection screen. "
+"This can happen with some graphic cards and older systems. Try using low "
+"resolution by typing <code>vgalo</code> at the prompt."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/installer.xml:123
 msgid ""
-"If the hardware is very old, a graphical installation may not be "
-"possible. In this case it is worth trying a text mode installation. To use "
-"this hit ESC at the first welcome screen and confirm with ENTER. You will be "
+"If the hardware is very old, a graphical installation may not be possible. "
+"In this case it is worth trying a text mode installation. To use this hit "
+"ESC at the first welcome screen and confirm with ENTER. You will be "
 "presented with a black screen with the word \"boot:\". Type \"text\" and hit "
 "ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
 msgstr ""
@@ -1390,8 +1385,8 @@ msgstr "Opcions del nucli"
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of "
-"RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM."
+"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
+"g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -1399,16 +1394,16 @@ msgstr ""
 msgid "Updates"
 msgstr "Actualitzacions"
 
-#.  Made by marja on 2012 03 30
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 03 30 
+#.  NEEDS TO BE REVIEWED! 
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#.  marja, 2012-04-24 added screenshot
+#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> "
-"</imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1436,16 +1431,16 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Selecció del suport (Nonfree)"
 
-#.  papoteur 2013-04-11  - created
+#.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
 #: en/media_selection.xml:12
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-media_selection.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"media_selection-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1467,11 +1462,11 @@ msgstr ""
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:30
 msgid ""
-"The <emphasis>Nonfree</emphasis> repository includes packages that are "
-"free-of-charge, i.e. Mageia may redistribute them, but they contain "
-"closed-source software (hence the name - Nonfree). For example this "
-"repository includes nVidia and ATI graphics card proprietary drivers, "
-"firmware for various WiFi cards, etc."
+"The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
+"of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
+"software (hence the name - Nonfree). For example this repository includes "
+"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
+"cards, etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -1479,9 +1474,9 @@ msgstr ""
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
-"that they may infringe patents and copyright laws in some countries, "
-"e.g. Multimedia codecs needed to play various audio/video files; packages "
-"needed to play commercial video DVD, etc."
+"that they may infringe patents and copyright laws in some countries, e.g. "
+"Multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD, etc."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -1493,8 +1488,8 @@ msgstr "Instal·lació mínima"
 #: en/minimal-install.xml:9
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref "
-"linkend=\"choosePackageGroups\"></xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
+"xref>."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1526,24 +1521,24 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Resum dels paràmetres diversos"
 
-#.  Started by marja on 2012 03 31
-#.  NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
+#.  Started by marja on 2012 03 31 
+#.  NEEDS TO BE WRITTEN AND REVIEWED! 
+#. marja - 2012 04 15 added some text, not much, unfortunately :( 
+#. marja 2012-04-24 added screenshots 
 #. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#.       the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
+#. marja 2012-04-24 added 2 links to other help pages 
+#. marja 2012-04-24 added some text in the drakxid-configureServices and 
+#.       the drakxid-miscellaneous section 
+#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
+#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
+#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
+#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
 #. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
 #. type: Content of: <section><mediaobject>
 #: en/misc-params.xml:33
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1568,9 +1563,9 @@ msgstr "<guilabel>Zona horària</guilabel>"
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:52
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred "
-"language. You can change it if needed. See also <xref "
-"linkend=\"configureTimezoneUTC\"/>"
+"DrakX selected a time zone for you, depending on your preferred language. "
+"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
+">"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1614,8 +1609,8 @@ msgstr "<guilabel>Gestió d'usuaris</guilabel>"
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:83
 msgid ""
-"You can add extra users here. They will each get their own "
-"<literal>/home</literal> directories."
+"You can add extra users here. They will each get their own <literal>/home</"
+"literal> directories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1679,9 +1674,9 @@ msgstr "<guilabel>Targeta de so</guilabel>:"
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:129
 msgid ""
-"Installer uses the default driver, if there is a default one. The option to "
-"select a different driver is only given when there is more than one driver "
-"for your card, but none of them is the default one."
+"The installer uses the default driver, if there is a default one. The option "
+"to select a different driver is only given when there is more than one "
+"driver for your card, but none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1702,9 +1697,8 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/misc-params.xml:148
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> "
-"</imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -1809,10 +1803,9 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/resizeFATChoose.xml:20
 msgid ""
-"You have more than one "
-"<application>Windows<superscript>®</superscript></application> partition.  "
-"Choose which one should be made smaller to make space for installing "
-"<application>Mageia</application>."
+"You have more than one <application>Windows<superscript>®</superscript></"
+"application> partition.  Choose which one should be made smaller to make "
+"space for installing <application>Mageia</application>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -1820,14 +1813,14 @@ msgstr ""
 msgid "Security Level"
 msgstr "Nivell de seguretat"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml"
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml" 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/securityLevel.xml:19
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1853,14 +1846,14 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr "Seleccioneu país / regió"
 
-#.  2012-12-25 marja - moved this section out of misc-params
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectCountry.xml:21
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1874,8 +1867,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:32
 msgid ""
-"If your country isn't in the list, click the <guilabel>Other "
-"Countries</guilabel> button and choose your country / region there."
+"If your country isn't in the list, click the <guilabel>Other Countries</"
+"guilabel> button and choose your country / region there."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -1898,11 +1891,11 @@ msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
-"default input method in Mageia DVDs, Africa/India and Asia/no-India "
-"Live-CDs. For Asian and African locales, IBus will be set as default input "
-"method so users should not need to configure it manually. Other input "
-"methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be "
-"installed if you added HTTP/FTP media before package selection."
+"default input method in Mageia DVDs, Africa/India and Asia/no-India Live-"
+"CDs. For Asian and African locales, IBus will be set as default input method "
+"so users should not need to configure it manually. Other input methods(SCIM, "
+"GCIN, HIME, etc) also provide similar functions and can be installed if you "
+"added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
@@ -1921,8 +1914,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/selectInstallClass.xml:25
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" "
-"align=\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" format=\"PNG\"></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -1968,8 +1961,8 @@ msgid ""
 "the same state anymore and rebooting it could very well leave you with an "
 "unusable system. If in spite of that you are very sure rebooting is what you "
 "want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl "
-"Delete</guilabel> simultaneously to reboot."
+"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
+"guilabel> simultaneously to reboot."
 msgstr ""
 
 #. type: Content of: <section><tip><para>
@@ -1977,8 +1970,8 @@ msgstr ""
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
 "can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do "
-"<emphasis>not</emphasis> do this later in the install."
+"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
+"emphasis> do this later in the install."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -1996,28 +1989,26 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboard.xml:22
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\" "
-"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:30
 msgid ""
-"Make sure that the selection is correct 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. There "
-"may even be a label on the keyboard that identifies the layout. You can also "
-"look here: <link "
-"xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">"
-"en.wikipedia.org/wiki/Keyboard_layout</link>"
+"Make sure that the selection is correct 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. There may even be a "
+"label on the keyboard that identifies the layout. You can also look here: "
+"<link xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en."
+"wikipedia.org/wiki/Keyboard_layout</link>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:40
 msgid ""
-"If your keyboard isn't in the list shown, click on "
-"<guibutton>More</guibutton> to get a full list, and select your keyboard "
-"there."
+"If your keyboard isn't in the list shown, click on <guibutton>More</"
+"guibutton> to get a full list, and select your keyboard there."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
@@ -2102,10 +2093,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Seleccioneu el ratolí"
 
-#.  Made by marja on 2012 04 11
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 04 11 
+#.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
-#.  marja 2012-04-24 adding screenshot
+#.  marja 2012-04-24 adding screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -2123,8 +2114,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:25
 msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB "
-"mice</guilabel> is a good choice."
+"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
+"guilabel> is a good choice."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2142,9 +2133,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" "
-"xml:id=\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2158,9 +2149,9 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:21
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" "
-"xml:id=\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2195,15 +2186,15 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr "Opcions principals del menú d'arrencada"
 
-#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
 #
+#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" "
-"format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\" /> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2279,9 +2270,9 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:66
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing "
-"MBR. You must select the root partition that you chose during the "
-"partitioning phase earlier, e.g.  sda7."
+"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
+"You must select the root partition that you chose during the partitioning "
+"phase earlier, e.g.  sda7."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2316,9 +2307,9 @@ msgstr "Opció avançada del carregador d'arrencada"
 #: en/setupBootloader.xml:95
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on "
-"<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp "
-"at each boot</guilabel>. This helps to maintain some free space."
+"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
+"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
+"guilabel>. This helps to maintain some free space."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2326,20 +2317,19 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Configuració SCSI"
 
-#.  Made by marja on 2012 04 02
-#.  NEEDS TO BE REVIEWED!
-#.  JohnR - edited 2012-03-03
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#.  marja 2012-04-24 added screenshot
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#.        Mdv doc instead of on our setupSCSI file
+#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2367,7 +2357,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Configuració del so"
 
-#.  Started by marja on 2013-12-07
+#.  Started by marja on 2013-12-07 
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -2378,8 +2368,9 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:23
 msgid ""
-"In this screen the name of the driver that installer chose for your sound "
-"card is given, which will be the default driver if we have a default one."
+"In this screen the name of the driver that the installer chose for your "
+"sound card is given, which will be the default driver if we have a default "
+"one."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2396,9 +2387,8 @@ msgstr ""
 #: en/soundConfig.xml:33
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on "
-"<guibutton>Troubleshooting</guibutton> to find very useful advice about how "
-"to solve the problem."
+"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
+"guibutton> to find very useful advice about how to solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -2411,7 +2401,7 @@ msgstr "Avançat"
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
-"available, but you think installer selected the wrong one."
+"available, but you think the installer selected the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2426,17 +2416,17 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmeu el disc dur que es formatarà"
 
-#.  Made by marja on 2012 04 03
-#.  test comment - johnr
+#.  Made by marja on 2012 04 03 
+#.  test comment - johnr 
 #.  2012-04-24 marja - replaced "if you are not sure you selected the correct
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
-#.     saw this help screen when I had only one HD
-#.  2013-05-05 marja added screenshot
+#.     saw this help screen when I had only one HD 
+#.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" "
-"format=\"PNG\" align=\"center\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
+"\" align=\"center\" ></imagedata> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2452,4 +2442,3 @@ msgid ""
 "Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
 "partition, every operating system and all data on that hard disk."
 msgstr ""
-