Update translations-2

2 files changed, 1022 insertions, 886 deletions

diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index cf10133a..58269d21 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
-# 
+#
 # Translators:
 # jui <appukonrad@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\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-16 08:48+0000\n"
 "Last-Translator: jui <appukonrad@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/"
+"cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. type: Content of: <section><info><title>
@@ -26,9 +27,11 @@ msgstr "Licence a Poznámky k vydání"
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:45
@@ -38,31 +41,40 @@ msgstr "Licenční ujednání"
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:48
 msgid ""
-"Before installing <application>Mageia</application>, please read the license"
-" terms and conditions carefully."
-msgstr "Před instalací <application>Magei</application>, si pečlivě přečtěte licenční podmínky a ustanovení."
+"Before installing <application>Mageia</application>, please read the license "
+"terms and conditions carefully."
+msgstr ""
+"Před instalací <application>Magei</application>, si pečlivě přečtěte "
+"licenční podmínky a ustanovení."
 
 #. 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."
-msgstr "Tyto podmínky a ujednání se vztahují na celou distribuci <application>Mageia</application>, dříve než budete moci pokračovat, musí být přijaty."
+"These terms and conditions apply to the entire <application>Mageia</"
+"application> distribution and must be accepted before you can continue."
+msgstr ""
+"Tyto podmínky a ujednání se vztahují na celou distribuci "
+"<application>Mageia</application>, dříve než budete moci pokračovat, musí "
+"být přijaty."
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:55
 msgid ""
 "To accept, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
-msgstr "Chcete-li je přijmout, jednoduše vyberte <guilabel>Přijmout</guilabel> a poté klikněte na <guibutton>Další</guibutton>."
+msgstr ""
+"Chcete-li je přijmout, jednoduše vyberte <guilabel>Přijmout</guilabel> a "
+"poté klikněte na <guibutton>Další</guibutton>."
 
 #. 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."
-msgstr "Pokud se rozhodnete nepřijmout tyto podmínky, pak vám děkujeme za nahlédnutí. Kliknutím na <guibutton>Ukončit</guibutton> se restartuje počítač."
+"If you decide not to accept these conditions, then we thank you for looking. "
+"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+msgstr ""
+"Pokud se rozhodnete nepřijmout tyto podmínky, pak vám děkujeme za "
+"nahlédnutí. Kliknutím na <guibutton>Ukončit</guibutton> se restartuje "
+"počítač."
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:68
@@ -74,7 +86,9 @@ msgstr "Poznámky k vydání"
 msgid ""
 "To see what's new in this release of <application>Mageia</application>, "
 "click on the <guibutton>Release Notes</guibutton> button."
-msgstr "Chcete-li zjistit, co je nového v této verzi <application>Mageia</application>, klikněte na tlačítko <guibutton>Poznámky k vydání </guibutton>."
+msgstr ""
+"Chcete-li zjistit, co je nového v této verzi <application>Mageia</"
+"application>, klikněte na tlačítko <guibutton>Poznámky k vydání </guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
@@ -86,27 +100,32 @@ msgstr ""
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Výběr zdroje (Nastavení doplňkových instalačních zdojů)"
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/add_supplemental_media.xml:24
 msgid ""
 "This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The"
-" source selection determines which packages will be available for selection "
+"add other sources for packages, like an optical disc or a remote source. The "
+"source selection determines which packages will be available for selection "
 "during the next steps."
-msgstr "Tato obrazovka vám dává seznam již rozeznaných úložišť. Můžete přidat další zdroje balíčků, jako je optický disk nebo vzdálené zdroje. Výběr zdroje určuje, ten který bude dostupný v průběhu následujících kroků pro výběr balíčků."
+msgstr ""
+"Tato obrazovka vám dává seznam již rozeznaných úložišť. Můžete přidat další "
+"zdroje balíčků, jako je optický disk nebo vzdálené zdroje. Výběr zdroje "
+"určuje, ten který bude dostupný v průběhu následujících kroků pro výběr "
+"balíčků."
 
 #. type: Content of: <section><para>
 #: en/add_supplemental_media.xml:29
@@ -126,38 +145,40 @@ msgid ""
 "Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
 "the URL, you can designate a specific repository or your own NFS "
 "installation."
-msgstr "Výbrat zrcadlo nebo zadat adresu URL (první vstup). Výběrem některého ze zrcadel, budete mít přístup k nabídkám všech úložišť spravovaných Mageia, jako je Nonfree, Tainted a také k aktualizacím. Pomocí URL, můžete určit konkrétní úložiště nebo vlastní instalaci NFS."
+msgstr ""
+"Výbrat zrcadlo nebo zadat adresu URL (první vstup). Výběrem některého ze "
+"zrcadel, budete mít přístup k nabídkám všech úložišť spravovaných Mageia, "
+"jako je Nonfree, Tainted a také k aktualizacím. Pomocí URL, můžete určit "
+"konkrétní úložiště nebo vlastní instalaci NFS."
 
 #. type: Content of: <section><info><title>
 #: en/addUser.xml:4
 msgid "User and Superuser Management"
 msgstr "Správa uživatele  a supruživatele"
 
-#.  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
-#.        disable it, the rest is about the normal user you're adding in the
-#. previous
+#.  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 
+#.        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
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:27
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></imagedata> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></imagedata> "
+"</imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:34
@@ -169,8 +190,8 @@ msgstr "Nastavení hesla správce (uživetele root):"
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
 "set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the"
-" top box the colour of its shield will change from red to yellow to green "
+"<emphasis>root password</emphasis> in Linux. As you type a password into the "
+"top box the colour of its shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
 "just below the first password box, this checks that you have not mistyped "
@@ -215,8 +236,8 @@ msgstr ""
 #: en/addUser.xml:75
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case"
-" sensitive.</emphasis>"
+"drakx use a version of the users real name. <emphasis>The login name is case "
+"sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -231,8 +252,8 @@ msgstr ""
 #: en/addUser.xml:87
 msgid ""
 "<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user"
-" password text boxes."
+"text box and drakx will check you have the same password in each of the user "
+"password text boxes."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
@@ -319,8 +340,8 @@ msgstr ""
 #: en/addUser.xml:150
 msgid ""
 "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know"
-" what you are doing."
+"number, usually the same one as for the user. Leave it blank unless you know "
+"what you are doing."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -328,27 +349,27 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr ""
 
-#.  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
-#.  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
+#.  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 
+#.  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 
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"chooseMountPoints-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:33
@@ -368,8 +389,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>
@@ -382,12 +403,12 @@ msgstr ""
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:55
 msgid ""
-"If you have many partitions, you can choose many different mount points from"
-" the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
+"If you have many partitions, you can choose many different mount points from "
+"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>
@@ -408,9 +429,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>
@@ -421,8 +442,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine"
-" tune your choice."
+"Depending on your selection here, you may be offered further screens to fine "
+"tune your choice."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -438,7 +459,9 @@ msgstr ""
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
 "format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:26
@@ -457,14 +480,15 @@ msgstr ""
 msgid "Package Group Selection"
 msgstr ""
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
 #: en/choosePackageGroups.xml:10
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:16
@@ -500,8 +524,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:39
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do"
-" a minimal install."
+"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
+"a minimal install."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -509,30 +533,30 @@ msgstr ""
 msgid "Choose Individual Packages"
 msgstr ""
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
 #: en/choosePackagesTree.xml:11
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. 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>
@@ -540,28 +564,30 @@ msgstr ""
 msgid "Configure your Services"
 msgstr ""
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
 
 #. 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>
 #: en/configureServices.xml:30
 msgid ""
-"There are four groups, click on the triangle before a group to expand it and"
-" see all services in it."
+"There are four groups, click on the triangle before a group to expand it and "
+"see all services in it."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -586,28 +612,31 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr ""
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:26
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the"
-" same time zone."
+"Choose your time zone by choosing your country or a city close to you in the "
+"same time zone."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:30
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to"
-" GMT, also known as UTC."
+"In next screen you can choose to set your hardware clock to local time or to "
+"GMT, also known as UTC."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -625,10 +654,13 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:21
@@ -702,16 +734,17 @@ msgstr ""
 msgid "Graphic Card and Monitor Configuration"
 msgstr ""
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX"
-#. in the code by "configureX_chooser", because this is the correct filename
-#. for this page
+#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_chooser.xml:18
@@ -720,11 +753,11 @@ msgid ""
 "you chose for this install of <application>Mageia</application>, they are "
 "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."
+"<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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -762,11 +795,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>
@@ -800,10 +833,13 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:42
@@ -814,9 +850,9 @@ msgstr ""
 #: en/configureX_monitor.xml:44
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
-"rate and the horizontal sync rate. Vertical refresh determines how often the"
-" screen is refreshed and horizontal sync is the rate at which scan lines are"
-" displayed."
+"rate and the horizontal sync rate. Vertical refresh determines how often the "
+"screen is refreshed and horizontal sync is the rate at which scan lines are "
+"displayed."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -871,10 +907,10 @@ msgstr ""
 #: en/configureX_monitor.xml:84
 msgid ""
 "selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is"
-" often a good monitor selection group if you need to use the Vesa card "
-"driver when your video hardware cannot be determined automatically. Once "
-"again it may be wise to be conservative in your selections."
+"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the Vesa card driver "
+"when your video hardware cannot be determined automatically. Once again it "
+"may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -885,39 +921,41 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/diskdrake.xml:26
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/diskdrake.xml:33
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The"
-" encryption option for the <literal>/boot</literal> partition must NOT be "
+"must ensure that you have a separate <literal>/boot</literal> partition. The "
+"encryption option for the <literal>/boot</literal> partition must NOT be "
 "set, otherwise your system will be unbootable."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:39
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions,"
-" change the filesystem of a partition or change its size and even view what "
+"Adjust the layout of your disk(s) here. You can remove or create partitions, "
+"change the filesystem of a partition or change its size and even view what "
 "is in them before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:42
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an"
-" USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab for every detected hard disk or other storage device, like an "
+"USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:45
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected"
-" storage device"
+"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
+"storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -960,9 +998,11 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/doPartitionDisks.xml:38
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks.png\" /> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:45
@@ -984,8 +1024,8 @@ msgstr ""
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:56
 msgid ""
-"If you have unused space on your hard drive then this option will use it for"
-" your new Mageia installation."
+"If you have unused space on your hard drive then this option will use it for "
+"your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
@@ -996,8 +1036,8 @@ msgstr ""
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:65
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may"
-" offer to use it."
+"If you have unused space on an existing Windows partition, the installer may "
+"offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
@@ -1050,8 +1090,8 @@ msgstr ""
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:102
 msgid ""
-"This gives you complete control over the placing of the installation on your"
-" hard drive(s)."
+"This gives you complete control over the placing of the installation on your "
+"hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -1061,8 +1101,8 @@ msgid ""
 "previous standard of 512 byte logical sectors. Due to lack of available "
 "hardware, the partitioning tool used in the installer has not been tested "
 "with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning"
-" tool like gparted, if you own such a device, and to use the following "
+"MB. We suggest to pre-partition the drive, using an alternative partitioning "
+"tool like gparted, if you own such a device, and to use the following "
 "settings:"
 msgstr ""
 
@@ -1095,8 +1135,8 @@ msgstr ""
 #. type: Content of: <article><info><cover><para><note><para>
 #: en/DrakX.xml:7
 msgid ""
-"No one will see all the installer screens that you see in this manual. Which"
-" screens you will see, depends on your hardware and the choices you make "
+"No one will see all the installer screens that you see in this manual. Which "
+"screens you will see, depends on your hardware and the choices you make "
 "while installing."
 msgstr ""
 
@@ -1109,24 +1149,24 @@ msgstr ""
 #: 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>
@@ -1134,31 +1174,34 @@ msgstr ""
 msgid "Congratulations"
 msgstr ""
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
 
 #. 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>
 #: en/exitInstall.xml:25
 msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating"
-" systems on your computer (if you have more than one)."
+"After reboot, in the bootloader screen, you can choose between the operating "
+"systems on your computer (if you have more than one)."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1185,17 +1228,20 @@ msgstr ""
 msgid "Formatting"
 msgstr ""
 
-#.  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>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </"
+"imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:25
@@ -1228,8 +1274,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>
@@ -1260,22 +1306,29 @@ msgstr ""
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
+"imageobject>"
 
 #. 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\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id=\"1\"/>"
+msgid ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
 
 #. 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>
@@ -1286,16 +1339,15 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/installer.xml:55
 msgid ""
-"The install process is divided into a number of steps, which can be followed"
-" on the side panel of the screen."
+"The install process is divided into a number of steps, which can be followed "
+"on the side panel of the screen."
 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>
@@ -1313,8 +1365,8 @@ msgid ""
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys"
-" <guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
+"rebooting is what you want, go to a text terminal by pressing the three keys "
+"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
@@ -1326,9 +1378,9 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: 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>"
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -1344,10 +1396,13 @@ msgstr ""
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><info><title>
 #: en/installer.xml:105
@@ -1359,8 +1414,7 @@ msgstr ""
 msgid "No Graphical Interface"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. 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. "
@@ -1368,16 +1422,14 @@ msgid ""
 "resolution by typing <code>vgalo</code> at the prompt."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. 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 "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit"
-" ENTER. Now continue with the installation in text "
-"mode.<emphasis></emphasis>"
+"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 ""
 
 #. type: Content of: <section><section><section><section><info><title>
@@ -1405,8 +1457,8 @@ msgstr ""
 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>
@@ -1414,22 +1466,20 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#.  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
+#.  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 
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:19
@@ -1456,26 +1506,27 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr ""
 
-#.  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-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html
-#. filename was wrong)
+#.  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-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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/media_selection.xml:18
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
-"available, according to which media you use for installing. The repositories"
-" selection determines which packages will be available for selection during "
+"available, according to which media you use for installing. The repositories "
+"selection determines which packages will be available for selection during "
 "the next steps."
 msgstr ""
 
@@ -1490,8 +1541,8 @@ msgstr ""
 #: 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 "
+"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 ""
@@ -1499,11 +1550,11 @@ msgstr ""
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:38
 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."
+"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."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -1515,8 +1566,8 @@ msgstr ""
 #: 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>
@@ -1541,34 +1592,37 @@ msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
 "align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  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"
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry,
-#. configureServices and SecurityLevel out to separate files
+#. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:38
@@ -1593,8 +1647,8 @@ msgstr ""
 #: 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\"/>"
+"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
+">"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1638,8 +1692,8 @@ msgstr ""
 #. 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>
@@ -1703,9 +1757,9 @@ msgstr ""
 #. 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>
@@ -1715,8 +1769,7 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:139
-msgid ""
-"This section allows you to configure your graphic card(s) and displays."
+msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1727,10 +1780,11 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/misc-params.xml:156
@@ -1774,8 +1828,8 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:185
 msgid ""
-"You may need to consult your systems administrator to get the parameters you"
-" need to enter here"
+"You may need to consult your systems administrator to get the parameters you "
+"need to enter here"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -1791,8 +1845,8 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:202
 msgid ""
-"Here you set the Security level for your computer, in most cases the default"
-" setting (Standard) is adequate for general use."
+"Here you set the Security level for your computer, in most cases the default "
+"setting (Standard) is adequate for general use."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1834,10 +1888,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>
@@ -1845,15 +1898,18 @@ msgstr ""
 msgid "Security Level"
 msgstr ""
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
@@ -1878,15 +1934,18 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:27
@@ -1899,8 +1958,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>
@@ -1921,13 +1980,13 @@ msgstr ""
 #: en/selectCountry.xml:49
 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 "
+"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."
+"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>
@@ -1946,9 +2005,11 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/selectInstallClass.xml:25
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" "
-"align=\"center\" format=\"PNG\"></imagedata> </imageobject>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectInstallClass.xml:32
@@ -1980,30 +2041,30 @@ msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
 "thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do"
-" a clean install while preserving your <literal>/home</literal> partition."
+"reached its End\tOf Life when this one was released, then it is better to do "
+"a clean install while preserving your <literal>/home</literal> partition."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectInstallClass.xml:56
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been"
-" formatted or updates have started to be installed, your computer isn't in "
+"reboot, but please think twice before you do this. Once a partition has been "
+"formatted or updates have started to be installed, your computer isn't in "
 "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."
+"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."
 msgstr ""
 
 #. type: Content of: <section><tip><para>
 #: en/selectInstallClass.xml:67
 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."
+"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."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2021,35 +2082,36 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboard.xml:22
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\""
-" /> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. 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>"
+"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>
 #: en/selectKeyboard.xml:45
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though"
-" a keyboard from that screen was chosen. You can safely ignore this anomaly "
+"you'll return to the first keyboard choice dialog and it will seem as though "
+"a keyboard from that screen was chosen. You can safely ignore this anomaly "
 "and continue the installation: Your keyboard is the one you chose from the "
 "full list."
 msgstr ""
@@ -2080,22 +2142,24 @@ msgstr ""
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be"
-" difficult to add extra language support after installation."
+"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
+"difficult to add extra language support after installation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:36
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\""
-" format=\"PNG\" > </imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:44
 msgid ""
-"Even if you choose more than one language, you must first choose one of them"
-" as your preferred language in the first language screen. It will also be "
+"Even if you choose more than one language, you must first choose one of them "
+"as your preferred language in the first language screen. It will also be "
 "marked as chosen in the multiple languages screen ."
 msgstr ""
 
@@ -2126,17 +2190,18 @@ msgstr ""
 msgid "Select mouse"
 msgstr ""
 
-#.  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
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
 "format=\"PNG\" > </imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" format=\"PNG\" > </imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:23
@@ -2148,8 +2213,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>
@@ -2167,10 +2232,13 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloaderAddEntry.xml:17
@@ -2183,10 +2251,13 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloaderAddEntry.xml:26
@@ -2220,31 +2291,31 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr ""
 
-#.  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
+#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\" /> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloader.xml:16
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by"
-" the installer, you can change them here."
+"If you prefer different bootloader settings to those chosen automatically by "
+"the installer, you can change them here."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/setupBootloader.xml:20
 msgid ""
-"You may already have another operating system on your machine, in which case"
-" you need to decide whether to add Mageia to your existing bootloader, or "
+"You may already have another operating system on your machine, in which case "
+"you need to decide whether to add Mageia to your existing bootloader, or "
 "allow Mageia to create a new one."
 msgstr ""
 
@@ -2298,16 +2369,16 @@ msgstr ""
 #: en/setupBootloader.xml:60
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader"
-" <guibutton>Configure</guibutton> button, which will allow you to change the"
-" bootloader install location."
+"to STOP at the summary page during the installation and click the Bootloader "
+"<guibutton>Configure</guibutton> button, which will allow you to change the "
+"bootloader install location."
 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 "
+"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 ""
 
@@ -2320,8 +2391,8 @@ msgstr ""
 #: en/setupBootloader.xml:75
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to"
-" the installer screen."
+"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
+"the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2329,8 +2400,8 @@ msgstr ""
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and"
-" add it automatically. See the documentation for the operating system in "
+"running the relevant bootloader installation program which should detect and "
+"add it automatically. See the documentation for the operating system in "
 "question."
 msgstr ""
 
@@ -2343,9 +2414,9 @@ msgstr ""
 #: 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>
@@ -2353,29 +2424,28 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr ""
 
-#.  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
+#.  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 
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:32
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers"
-" it may be unable to determine the correct drivers to use and subsequently "
+"DrakX usually detects hard disks correctly. With some older SCSI controllers "
+"it may be unable to determine the correct drivers to use and subsequently "
 "fail to recognise the drive."
 msgstr ""
 
@@ -2396,19 +2466,22 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr ""
 
-#.  Started by marja on 2013-12-07
+#.  Started by marja on 2013-12-07 
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. 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>
@@ -2425,9 +2498,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>
@@ -2440,7 +2512,7 @@ msgstr ""
 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>
@@ -2455,19 +2527,20 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
-#.  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
+#.     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 
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" "
-"format=\"PNG\" align=\"center\" ></imagedata> </imageobject>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
+"\" align=\"center\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:24
@@ -2479,6 +2552,6 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
 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."
+"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 ""
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 5b6daaad..fe7c2d9d 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
-# 
+#
 # Translators:
 # filip.komar <filip.komar@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\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-09 19:12+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Slovenian (http://www.transifex.com/projects/p/mageia/language/sl/)\n"
+"Language-Team: Slovenian (http://www.transifex.com/projects/p/mageia/"
+"language/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:32
@@ -26,9 +28,11 @@ msgstr "Licenčna pogodba in opombe ob izdaji"
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:45
@@ -38,31 +42,39 @@ msgstr "Licenčna pogodba"
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:48
 msgid ""
-"Before installing <application>Mageia</application>, please read the license"
-" terms and conditions carefully."
-msgstr "Pred namestitvijo <application>Mageje</application> pozorno preberite licenčne pogoje."
+"Before installing <application>Mageia</application>, please read the license "
+"terms and conditions carefully."
+msgstr ""
+"Pred namestitvijo <application>Mageje</application> pozorno preberite "
+"licenčne pogoje."
 
 #. 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."
-msgstr "Ti licenčni pogoji se nanašajo na celotno distribucijo <application>Mageia</application>. Pred nadaljevanjem jih je potrebno sprejeti."
+"These terms and conditions apply to the entire <application>Mageia</"
+"application> distribution and must be accepted before you can continue."
+msgstr ""
+"Ti licenčni pogoji se nanašajo na celotno distribucijo <application>Mageia</"
+"application>. Pred nadaljevanjem jih je potrebno sprejeti."
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:55
 msgid ""
 "To accept, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
-msgstr "Za sprejem preprosto označite  <guilabel>Sprejmem</guilabel> in kliknite gumb <guibutton>Naprej</guibutton>."
+msgstr ""
+"Za sprejem preprosto označite  <guilabel>Sprejmem</guilabel> in kliknite "
+"gumb <guibutton>Naprej</guibutton>."
 
 #. 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."
-msgstr "Zahvaljujemo se za vaš ogled tudi če se odločite, da teh pogojev ne boste sprejeli. S klikom na gumb <guibutton>Izhod</guibutton> se bo vaš računalnik ponovno zagnal."
+"If you decide not to accept these conditions, then we thank you for looking. "
+"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+msgstr ""
+"Zahvaljujemo se za vaš ogled tudi če se odločite, da teh pogojev ne boste "
+"sprejeli. S klikom na gumb <guibutton>Izhod</guibutton> se bo vaš računalnik "
+"ponovno zagnal."
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:68
@@ -74,7 +86,9 @@ msgstr "Opombe ob izdaji"
 msgid ""
 "To see what's new in this release of <application>Mageia</application>, "
 "click on the <guibutton>Release Notes</guibutton> button."
-msgstr "Za ogled novosti te izdaje <application>Mageje</application> kliknite gumb <guibutton>Opombe ob izdaji</guibutton>."
+msgstr ""
+"Za ogled novosti te izdaje <application>Mageje</application> kliknite gumb "
+"<guibutton>Opombe ob izdaji</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
@@ -86,25 +100,26 @@ msgstr "sl"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Izbira virov (nastavitev dodatnih virov namestitve)"
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/add_supplemental_media.xml:24
 msgid ""
 "This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The"
-" source selection determines which packages will be available for selection "
+"add other sources for packages, like an optical disc or a remote source. The "
+"source selection determines which packages will be available for selection "
 "during the next steps."
 msgstr ""
 
@@ -133,31 +148,29 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr ""
 
-#.  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
-#.        disable it, the rest is about the normal user you're adding in the
-#. previous
+#.  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 
+#.        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
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:27
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></imagedata> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></imagedata> "
+"</imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:34
@@ -169,8 +182,8 @@ msgstr "Nastavite geslo skrbnika (uporabnika root):"
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
 "set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the"
-" top box the colour of its shield will change from red to yellow to green "
+"<emphasis>root password</emphasis> in Linux. As you type a password into the "
+"top box the colour of its shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
 "just below the first password box, this checks that you have not mistyped "
@@ -215,8 +228,8 @@ msgstr ""
 #: en/addUser.xml:75
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case"
-" sensitive.</emphasis>"
+"drakx use a version of the users real name. <emphasis>The login name is case "
+"sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -231,8 +244,8 @@ msgstr ""
 #: en/addUser.xml:87
 msgid ""
 "<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user"
-" password text boxes."
+"text box and drakx will check you have the same password in each of the user "
+"password text boxes."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
@@ -319,8 +332,8 @@ msgstr ""
 #: en/addUser.xml:150
 msgid ""
 "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know"
-" what you are doing."
+"number, usually the same one as for the user. Leave it blank unless you know "
+"what you are doing."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -328,27 +341,27 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Izberite priklopne točke"
 
-#.  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
-#.  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
+#.  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 
+#.  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 
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"chooseMountPoints-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:33
@@ -368,8 +381,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>
@@ -382,12 +395,12 @@ msgstr ""
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:55
 msgid ""
-"If you have many partitions, you can choose many different mount points from"
-" the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
+"If you have many partitions, you can choose many different mount points from "
+"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>
@@ -408,9 +421,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>
@@ -421,8 +434,8 @@ msgstr "Izbira namizja"
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine"
-" tune your choice."
+"Depending on your selection here, you may be offered further screens to fine "
+"tune your choice."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -438,7 +451,9 @@ msgstr ""
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
 "format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:26
@@ -457,14 +472,15 @@ msgstr ""
 msgid "Package Group Selection"
 msgstr "Izbira skupin paketov"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
 #: en/choosePackageGroups.xml:10
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:16
@@ -500,8 +516,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:39
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do"
-" a minimal install."
+"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
+"a minimal install."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -509,30 +525,30 @@ msgstr ""
 msgid "Choose Individual Packages"
 msgstr "Izbira posamičnih paketov"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
 #: en/choosePackagesTree.xml:11
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. 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>
@@ -540,28 +556,30 @@ msgstr ""
 msgid "Configure your Services"
 msgstr ""
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
 
 #. 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>
 #: en/configureServices.xml:30
 msgid ""
-"There are four groups, click on the triangle before a group to expand it and"
-" see all services in it."
+"There are four groups, click on the triangle before a group to expand it and "
+"see all services in it."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -586,28 +604,31 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Nastavite vaš časovni pas"
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:26
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the"
-" same time zone."
+"Choose your time zone by choosing your country or a city close to you in the "
+"same time zone."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:30
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to"
-" GMT, also known as UTC."
+"In next screen you can choose to set your hardware clock to local time or to "
+"GMT, also known as UTC."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -625,10 +646,13 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:21
@@ -702,16 +726,17 @@ msgstr ""
 msgid "Graphic Card and Monitor Configuration"
 msgstr ""
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX"
-#. in the code by "configureX_chooser", because this is the correct filename
-#. for this page
+#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_chooser.xml:18
@@ -720,11 +745,11 @@ msgid ""
 "you chose for this install of <application>Mageia</application>, they are "
 "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."
+"<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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -762,11 +787,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>
@@ -800,10 +825,13 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:42
@@ -814,9 +842,9 @@ msgstr ""
 #: en/configureX_monitor.xml:44
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
-"rate and the horizontal sync rate. Vertical refresh determines how often the"
-" screen is refreshed and horizontal sync is the rate at which scan lines are"
-" displayed."
+"rate and the horizontal sync rate. Vertical refresh determines how often the "
+"screen is refreshed and horizontal sync is the rate at which scan lines are "
+"displayed."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -871,10 +899,10 @@ msgstr ""
 #: en/configureX_monitor.xml:84
 msgid ""
 "selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is"
-" often a good monitor selection group if you need to use the Vesa card "
-"driver when your video hardware cannot be determined automatically. Once "
-"again it may be wise to be conservative in your selections."
+"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the Vesa card driver "
+"when your video hardware cannot be determined automatically. Once again it "
+"may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -885,39 +913,41 @@ msgstr "Razdeljevanje diska po meri s programom DiskDrake"
 #. type: Content of: <section><mediaobject>
 #: en/diskdrake.xml:26
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/diskdrake.xml:33
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The"
-" encryption option for the <literal>/boot</literal> partition must NOT be "
+"must ensure that you have a separate <literal>/boot</literal> partition. The "
+"encryption option for the <literal>/boot</literal> partition must NOT be "
 "set, otherwise your system will be unbootable."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:39
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions,"
-" change the filesystem of a partition or change its size and even view what "
+"Adjust the layout of your disk(s) here. You can remove or create partitions, "
+"change the filesystem of a partition or change its size and even view what "
 "is in them before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:42
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an"
-" USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab for every detected hard disk or other storage device, like an "
+"USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:45
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected"
-" storage device"
+"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
+"storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -960,9 +990,11 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/doPartitionDisks.xml:38
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks.png\" /> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:45
@@ -984,8 +1016,8 @@ msgstr "Uporabi razpoložljivi prostor"
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:56
 msgid ""
-"If you have unused space on your hard drive then this option will use it for"
-" your new Mageia installation."
+"If you have unused space on your hard drive then this option will use it for "
+"your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
@@ -996,8 +1028,8 @@ msgstr "Uporabi razpoložljivi prostor v razdelku za Windows"
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:65
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may"
-" offer to use it."
+"If you have unused space on an existing Windows partition, the installer may "
+"offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
@@ -1050,8 +1082,8 @@ msgstr "Po meri"
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:102
 msgid ""
-"This gives you complete control over the placing of the installation on your"
-" hard drive(s)."
+"This gives you complete control over the placing of the installation on your "
+"hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -1061,8 +1093,8 @@ msgid ""
 "previous standard of 512 byte logical sectors. Due to lack of available "
 "hardware, the partitioning tool used in the installer has not been tested "
 "with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning"
-" tool like gparted, if you own such a device, and to use the following "
+"MB. We suggest to pre-partition the drive, using an alternative partitioning "
+"tool like gparted, if you own such a device, and to use the following "
 "settings:"
 msgstr ""
 
@@ -1095,8 +1127,8 @@ msgstr "<note>"
 #. type: Content of: <article><info><cover><para><note><para>
 #: en/DrakX.xml:7
 msgid ""
-"No one will see all the installer screens that you see in this manual. Which"
-" screens you will see, depends on your hardware and the choices you make "
+"No one will see all the installer screens that you see in this manual. Which "
+"screens you will see, depends on your hardware and the choices you make "
 "while installing."
 msgstr ""
 
@@ -1109,24 +1141,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>
@@ -1134,31 +1166,34 @@ msgstr ""
 msgid "Congratulations"
 msgstr "Čestitke"
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
 
 #. 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>
 #: en/exitInstall.xml:25
 msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating"
-" systems on your computer (if you have more than one)."
+"After reboot, in the bootloader screen, you can choose between the operating "
+"systems on your computer (if you have more than one)."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1185,17 +1220,20 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatiranje"
 
-#.  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>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </"
+"imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:25
@@ -1228,8 +1266,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>
@@ -1260,22 +1298,29 @@ msgstr ""
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
+"imageobject>"
 
 #. 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\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id=\"1\"/>"
+msgid ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
 
 #. 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>
@@ -1286,16 +1331,15 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/installer.xml:55
 msgid ""
-"The install process is divided into a number of steps, which can be followed"
-" on the side panel of the screen."
+"The install process is divided into a number of steps, which can be followed "
+"on the side panel of the screen."
 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>
@@ -1313,8 +1357,8 @@ msgid ""
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys"
-" <guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
+"rebooting is what you want, go to a text terminal by pressing the three keys "
+"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
@@ -1326,9 +1370,9 @@ msgstr "Možnosti namestitve"
 #. type: Content of: <section><section><para>
 #: 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>"
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -1344,10 +1388,13 @@ msgstr ""
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><info><title>
 #: en/installer.xml:105
@@ -1359,8 +1406,7 @@ msgstr ""
 msgid "No Graphical Interface"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. 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. "
@@ -1368,16 +1414,14 @@ msgid ""
 "resolution by typing <code>vgalo</code> at the prompt."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. 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 "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit"
-" ENTER. Now continue with the installation in text "
-"mode.<emphasis></emphasis>"
+"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 ""
 
 #. type: Content of: <section><section><section><section><info><title>
@@ -1405,8 +1449,8 @@ msgstr "Možnosti jedra"
 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>
@@ -1414,22 +1458,20 @@ msgstr ""
 msgid "Updates"
 msgstr "Posodobitve"
 
-#.  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
+#.  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 
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:19
@@ -1456,26 +1498,27 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr ""
 
-#.  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-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html
-#. filename was wrong)
+#.  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-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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/media_selection.xml:18
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
-"available, according to which media you use for installing. The repositories"
-" selection determines which packages will be available for selection during "
+"available, according to which media you use for installing. The repositories "
+"selection determines which packages will be available for selection during "
 "the next steps."
 msgstr ""
 
@@ -1490,8 +1533,8 @@ msgstr ""
 #: 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 "
+"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 ""
@@ -1499,11 +1542,11 @@ msgstr ""
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:38
 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."
+"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."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -1515,8 +1558,8 @@ msgstr "Minimalna namestitev"
 #: 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>
@@ -1541,34 +1584,37 @@ msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
 "align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  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"
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry,
-#. configureServices and SecurityLevel out to separate files
+#. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:38
@@ -1593,8 +1639,8 @@ msgstr "<guilabel>Časovni pas</guilabel>"
 #: 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\"/>"
+"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
+">"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1638,8 +1684,8 @@ msgstr ""
 #. 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>
@@ -1703,9 +1749,9 @@ msgstr ""
 #. 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>
@@ -1715,8 +1761,7 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:139
-msgid ""
-"This section allows you to configure your graphic card(s) and displays."
+msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1727,10 +1772,11 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/misc-params.xml:156
@@ -1774,8 +1820,8 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:185
 msgid ""
-"You may need to consult your systems administrator to get the parameters you"
-" need to enter here"
+"You may need to consult your systems administrator to get the parameters you "
+"need to enter here"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -1791,8 +1837,8 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:202
 msgid ""
-"Here you set the Security level for your computer, in most cases the default"
-" setting (Standard) is adequate for general use."
+"Here you set the Security level for your computer, in most cases the default "
+"setting (Standard) is adequate for general use."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -1834,10 +1880,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>
@@ -1845,15 +1890,18 @@ msgstr ""
 msgid "Security Level"
 msgstr "Stopnja varnosti"
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
@@ -1878,15 +1926,18 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:27
@@ -1899,8 +1950,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>
@@ -1921,13 +1972,13 @@ msgstr "Način vnosa"
 #: en/selectCountry.xml:49
 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 "
+"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."
+"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>
@@ -1946,9 +1997,11 @@ msgstr "Namestitev ali nadgradnja"
 #. type: Content of: <section><mediaobject>
 #: en/selectInstallClass.xml:25
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" "
-"align=\"center\" format=\"PNG\"></imagedata> </imageobject>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectInstallClass.xml:32
@@ -1980,30 +2033,30 @@ msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
 "thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do"
-" a clean install while preserving your <literal>/home</literal> partition."
+"reached its End\tOf Life when this one was released, then it is better to do "
+"a clean install while preserving your <literal>/home</literal> partition."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectInstallClass.xml:56
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been"
-" formatted or updates have started to be installed, your computer isn't in "
+"reboot, but please think twice before you do this. Once a partition has been "
+"formatted or updates have started to be installed, your computer isn't in "
 "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."
+"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."
 msgstr ""
 
 #. type: Content of: <section><tip><para>
 #: en/selectInstallClass.xml:67
 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."
+"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."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2021,35 +2074,36 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboard.xml:22
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\""
-" /> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. 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>"
+"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>
 #: en/selectKeyboard.xml:45
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though"
-" a keyboard from that screen was chosen. You can safely ignore this anomaly "
+"you'll return to the first keyboard choice dialog and it will seem as though "
+"a keyboard from that screen was chosen. You can safely ignore this anomaly "
 "and continue the installation: Your keyboard is the one you chose from the "
 "full list."
 msgstr ""
@@ -2080,22 +2134,24 @@ msgstr ""
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be"
-" difficult to add extra language support after installation."
+"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
+"difficult to add extra language support after installation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:36
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\""
-" format=\"PNG\" > </imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:44
 msgid ""
-"Even if you choose more than one language, you must first choose one of them"
-" as your preferred language in the first language screen. It will also be "
+"Even if you choose more than one language, you must first choose one of them "
+"as your preferred language in the first language screen. It will also be "
 "marked as chosen in the multiple languages screen ."
 msgstr ""
 
@@ -2126,17 +2182,18 @@ msgstr ""
 msgid "Select mouse"
 msgstr ""
 
-#.  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
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
 "format=\"PNG\" > </imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" format=\"PNG\" > </imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:23
@@ -2148,8 +2205,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>
@@ -2167,10 +2224,13 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloaderAddEntry.xml:17
@@ -2183,10 +2243,13 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloaderAddEntry.xml:26
@@ -2220,31 +2283,31 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr "Glavne možnosti zagonskega nalagalnika"
 
-#.  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
+#.  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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\" /> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupBootloader.xml:16
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by"
-" the installer, you can change them here."
+"If you prefer different bootloader settings to those chosen automatically by "
+"the installer, you can change them here."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/setupBootloader.xml:20
 msgid ""
-"You may already have another operating system on your machine, in which case"
-" you need to decide whether to add Mageia to your existing bootloader, or "
+"You may already have another operating system on your machine, in which case "
+"you need to decide whether to add Mageia to your existing bootloader, or "
 "allow Mageia to create a new one."
 msgstr ""
 
@@ -2298,16 +2361,16 @@ msgstr ""
 #: en/setupBootloader.xml:60
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader"
-" <guibutton>Configure</guibutton> button, which will allow you to change the"
-" bootloader install location."
+"to STOP at the summary page during the installation and click the Bootloader "
+"<guibutton>Configure</guibutton> button, which will allow you to change the "
+"bootloader install location."
 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 "
+"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 ""
 
@@ -2320,8 +2383,8 @@ msgstr ""
 #: en/setupBootloader.xml:75
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to"
-" the installer screen."
+"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
+"the installer screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2329,8 +2392,8 @@ msgstr ""
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and"
-" add it automatically. See the documentation for the operating system in "
+"running the relevant bootloader installation program which should detect and "
+"add it automatically. See the documentation for the operating system in "
 "question."
 msgstr ""
 
@@ -2343,9 +2406,9 @@ msgstr "Napredne možnosti zagonskega nalagalnika"
 #: 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>
@@ -2353,29 +2416,28 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr ""
 
-#.  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
+#.  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 
 #. 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:32
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers"
-" it may be unable to determine the correct drivers to use and subsequently "
+"DrakX usually detects hard disks correctly. With some older SCSI controllers "
+"it may be unable to determine the correct drivers to use and subsequently "
 "fail to recognise the drive."
 msgstr ""
 
@@ -2396,7 +2458,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr ""
 
-#.  Started by marja on 2013-12-07
+#.  Started by marja on 2013-12-07 
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -2407,8 +2469,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>
@@ -2425,9 +2488,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>
@@ -2440,7 +2502,7 @@ msgstr ""
 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>
@@ -2455,19 +2517,20 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
-#.  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
+#.     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 
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" "
-"format=\"PNG\" align=\"center\" ></imagedata> </imageobject>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
+"\" align=\"center\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:24
@@ -2479,6 +2542,6 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
 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."
+"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 ""