update greek translation

46 files changed, 20916 insertions, 7533 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index c2967319..b90b5234 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-02-28 09:40+0100\n"
 "Last-Translator: Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>\n"
 "Language-Team: Catalan <>\n"
@@ -97,9 +97,9 @@ msgstr "ca"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selecció dels suports (configura suports d'instal·lació suplementaris)"
 
-#.  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 ""
@@ -153,19 +153,19 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestió d'usuaris i superusuari"
 
-#.  Started by marja,using Led43's text, on 2012 03 27
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
+#.  Started by marja,using Led43's text, on 2012 03 27 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
 #.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing
-#.        about guest account there, is the box you can tick or untick to enable or
+#.        changed his text about the Advanced User Managment screen (the only thing 
+#.        about guest account there, is the box you can tick or untick to enable or 
 #.        disable it, the rest is about the normal user you're adding in the previous
 #.        screen), marja, 20120409
 #.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct?
-#.  JohnR 2012-04-19 Language proofreading
-#.  marja 2012-04-24 Added screenshot
-#.  marja 2013-04-26 added new note
+#.        "rbash" in the xguest warning - is that correct? 
+#.  JohnR 2012-04-19 Language proofreading  
+#.  marja 2012-04-24 Added screenshot 
+#.  marja 2013-04-26 added new note 
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:27
 msgid ""
@@ -404,17 +404,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Trieu els punts de muntatge"
 
-#.  Made by marja on 2012 03 28
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, marja, 20120409
+#.  Made by marja on 2012 03 28 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, marja, 20120409 
 #.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#.        with "a", as I can't imagine having more than one root partition ;)
-#.  Lebarhon : I put [] where it seems having mistakes
+#.        with "a", as I can't imagine having more than one root partition ;) 
+#.  Lebarhon : I put [] where it seems having mistakes 
 #.  Marja: you're right, in English English it is "its type", however, the Americans
 #.        write "it's type". And you're right about the redundant part, too, I removed it
-#.  And JohnR says the Americans are WRONG! :-))
-#.  2012-04-19  Language proofreading done
+#.  And JohnR says the Americans are WRONG! :-)) 
+#.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
@@ -670,8 +670,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configura els serveis"
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureServices.xml:21
 msgid ""
@@ -723,8 +723,8 @@ msgstr "Canvieu coses només si teniu molt clar què esteu fent."
 msgid "Configure your Timezone"
 msgstr "Configura la zona horària"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:20
 msgid ""
@@ -982,8 +982,7 @@ msgid ""
 "correctly identify yours."
 msgstr ""
 "DrakX té una base de dades de monitors força completa i normalment "
-"identificarà "
-"correctament el vostre."
+"identificarà correctament el vostre."
 
 #. type: Content of: <section><warning><para>
 #: en/configureX_monitor.xml:26
@@ -1451,9 +1450,9 @@ msgstr ""
 msgid "Congratulations"
 msgstr "Enhorabona"
 
-#.  Started by marja on 2012 03 29
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#.  marja - 2012-04-24 added screenshot and text
+#.  Started by marja on 2012 03 29 
+#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
+#.  marja - 2012-04-24 added screenshot and text 
 #.  same day, added "s" to "sytems"
 #. type: Content of: <section><mediaobject>
 #: en/exitInstall.xml:14
@@ -1512,10 +1511,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatació"
 
-#.  Made by marja on 2012 03 29
-#.  NEEDS TO BE REVIEWED!
-#.  marja 2012-04-24 added screenshot
-#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#.  Made by marja on 2012 03 29 
+#.  NEEDS TO BE REVIEWED! 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
 #: en/formatPartitions.xml:18
 msgid ""
@@ -1576,12 +1575,12 @@ msgstr ""
 "per a continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'instal·lador de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1592,7 +1591,7 @@ msgstr ""
 "instal·lació o actualització tan fàcil com sigui possible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1601,26 +1600,37 @@ msgstr ""
 "predeterminada engegarà l'instal·lador, que normalment és tot el que cal."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Pantalla de benvinguda de la instal·lació"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1628,21 +1638,211 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Si hi ha problemes durant la instal·lació, llavors potser cal utilitzar "
-"paràmetres especials d'instal·lació. Vegeu <xref linkend="
-"\"installationOptions\"></xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Si la instal·lació falla, potser és necessari tornar-ho a provar utilitzant "
+"alguna de les opcions addicionals disponibles prement el botó <guibutton>F1 "
+"(Ajuda)</guibutton>. Vegeu <xref linkend=\"dx-welcome\"/>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Els passos de la instal·lació"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1651,7 +1851,7 @@ msgstr ""
 "veure en el plafó lateral de la pantalla."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1661,7 +1861,7 @@ msgstr ""
 "habituals."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1670,7 +1870,7 @@ msgstr ""
 "dóna més explicacions sobre el pas actual."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1690,56 +1890,18 @@ msgstr ""
 "<guibutton>Alt Ctrl F2</guibutton>. Després premeu alhora <guibutton>Alt "
 "Ctrl Delete </guibutton> per a reiniciar."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opcions d'instal·lació"
-
-#. 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>"
-msgstr ""
-"Si la instal·lació falla, potser és necessari tornar-ho a provar utilitzant "
-"alguna de les opcions addicionals disponibles prement "
-"el botó <guibutton>F1 (Ajuda)</guibutton>. "
-"Vegeu <xref linkend=\"dx-welcome\"/>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Això obrirà l'ajuda següent en mode text."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Pantalla d'ajuda de la instal·lació"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-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
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemes en la instal·lació i possibles solucions"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Sense interfície gràfica"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1751,13 +1913,14 @@ msgstr ""
 "consola."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Si el maquinari és molt antic, potser la instal·lació gràfica no és "
 "possible. En aquest cas val la pena provar una instal·lació en mode text. "
@@ -1767,12 +1930,12 @@ msgstr ""
 "instal·lació en mode text.<emphasis></emphasis>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "La instal·lació es penja"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1787,12 +1950,12 @@ msgstr ""
 "d'altres."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opcions del nucli"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -1810,10 +1973,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Actualitzacions"
 
-#.  Made by marja on 2012 03 30
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 03 30 
+#.  NEEDS TO BE REVIEWED! 
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#.  marja, 2012-04-24 added screenshot
+#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -1855,9 +2018,9 @@ msgstr "Llavors premeu <guibutton>Següent</guibutton> per a continuar."
 msgid "Media Selection (Nonfree)"
 msgstr "Selecció del suport (Nonfree)"
 
-#.  papoteur 2013-04-11  - created
+#.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
 #: en/media_selection.xml:12
@@ -1947,11 +2110,10 @@ msgid ""
 "Selection, see <xref linkend=\"choosePackagesTree\"></xref>."
 msgstr ""
 "La instal·lació mínima és per a aquelles persones que tenen en ment uns usos "
-"específics de <application>Mageia</application>, com ara un servidor o bé una "
-"estació de treball especialitzada. Probablement es farà servir aquesta opció "
-"combinada amb la Selecció Manual de Paquets, vegeu <xref "
-"linkend=\"choosePackagesTree"
-"\"></xref>."
+"específics de <application>Mageia</application>, com ara un servidor o bé "
+"una estació de treball especialitzada. Probablement es farà servir aquesta "
+"opció combinada amb la Selecció Manual de Paquets, vegeu <xref linkend="
+"\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:14
@@ -1978,18 +2140,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Resum dels paràmetres diversos"
 
-#.  Started by marja on 2012 03 31
-#.  NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
+#.  Started by marja on 2012 03 31 
+#.  NEEDS TO BE WRITTEN AND REVIEWED! 
+#. marja - 2012 04 15 added some text, not much, unfortunately :( 
+#. marja 2012-04-24 added screenshots 
 #. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#.       the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
+#. marja 2012-04-24 added 2 links to other help pages 
+#. marja 2012-04-24 added some text in the drakxid-configureServices and 
+#.       the drakxid-miscellaneous section 
+#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
+#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
+#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
+#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
 #. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
 #. type: Content of: <section><mediaobject>
 #: en/misc-params.xml:33
@@ -2323,8 +2485,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Nivell de seguretat"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml"
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml" 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/securityLevel.xml:19
 msgid ""
@@ -2362,8 +2524,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr "Seleccioneu país / regió"
 
-#.  2012-12-25 marja - moved this section out of misc-params
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectCountry.xml:21
 msgid ""
@@ -2700,10 +2862,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Seleccioneu el ratolí"
 
-#.  Made by marja on 2012 04 11
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 04 11 
+#.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
-#.  marja 2012-04-24 adding screenshot
+#.  marja 2012-04-24 adding screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -2819,7 +2981,7 @@ msgid "Bootloader main options"
 msgstr "Opcions principals del menú d'arrencada"
 
 #
-#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
@@ -2988,14 +3150,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Configuració SCSI"
 
-#.  Made by marja on 2012 04 02
-#.  NEEDS TO BE REVIEWED!
-#.  JohnR - edited 2012-03-03
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#.  marja 2012-04-24 added screenshot
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#.        Mdv doc instead of on our setupSCSI file
+#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -3035,7 +3197,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Configuració del so"
 
-#.  Started by marja on 2013-12-07
+#.  Started by marja on 2013-12-07 
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -3114,12 +3276,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmeu el disc dur que es formatarà"
 
-#.  Made by marja on 2012 04 03
-#.  test comment - johnr
+#.  Made by marja on 2012 04 03 
+#.  test comment - johnr 
 #.  2012-04-24 marja - replaced "if you are not sure you selected the correct
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
-#.     saw this help screen when I had only one HD
-#.  2013-05-05 marja added screenshot
+#.     saw this help screen when I had only one HD 
+#.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
@@ -3146,3 +3308,41 @@ msgstr ""
 "Feu clic a <guibutton>Següent</guibutton> si esteu segur i voleu esborrar "
 "totes les particions, tots els sistemes operatius i totes les dades del disc."
 
+#~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Si hi ha problemes durant la instal·lació, llavors potser cal utilitzar "
+#~ "paràmetres especials d'instal·lació. Vegeu <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opcions d'instal·lació"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Això obrirà l'ajuda següent en mode text."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Pantalla d'ajuda de la instal·lació"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opcions del nucli"
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index 36ee2674..d8c1345d 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\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/"
@@ -1308,12 +1308,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1321,33 +1321,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1355,39 +1366,228 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "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
+#: en/installer.xml:191
 msgid ""
 "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>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1399,52 +1599,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-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>"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1452,22 +1618,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1477,12 +1643,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
+#: en/installer.xml:256
+msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -2584,3 +2750,21 @@ msgid ""
 "Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
 "partition, every operating system and all data on that hard disk."
 msgstr ""
+
+#~ 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>"
+
+#~ 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>"
diff --git a/docs/installer/de.po b/docs/installer/de.po
index 553ca917..f1d787e6 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2013-12-08 18:35+0000\n"
 "Last-Translator: latte <marc.lattemann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/mageia/language/"
@@ -1627,12 +1627,12 @@ msgstr ""
 "guibutton>, um mit der Installation fortzufahren."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, das Mageia Installationsprogramm"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1643,7 +1643,7 @@ msgstr ""
 "Installation oder eine Aktualisierung so leicht wie möglich macht."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1653,25 +1653,38 @@ msgstr ""
 "Sie tun müssen."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Willkommensbildschirm der Installation"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1679,21 +1692,212 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Treten während der Installation Probleme auf, kann es nötig sein, spezielle "
-"Installationsoptionen zu verwenden, siehe <xref linkend=\"installationOptions"
-"\"/>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Falls die Installation nicht funktioniert, kann es nötig sein, sie mit einer "
+"der zusätzlichen Optionen zu wiederholen. Betätigen Sie dafür den Knopf "
+"<guibutton>\"F1\" (Hilfe)</guibutton>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
+"imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
 msgid "The installation steps"
 msgstr "Die Installationsschritte"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1702,7 +1906,7 @@ msgstr ""
 "linken Seite des Bildschirms verfolgt werden können."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1712,7 +1916,7 @@ msgstr ""
 "zusätzlichen Optionen haben."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1721,7 +1925,7 @@ msgstr ""
 "über den Sie weitere Erklärungen zum momentan ausgeführten Schritt erhalten."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1743,54 +1947,18 @@ msgstr ""
 "\">Alt+Strg+F2</emphasis>. Anschließend betätigen Sie <emphasis role=\"bold"
 "\">Alt+Strg+Entf</emphasis>, um einen Neustart auszulösen."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Installationsoptionen"
-
-#. 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>"
-msgstr ""
-"Falls die Installation nicht funktioniert, kann es nötig sein, sie mit einer "
-"der zusätzlichen Optionen zu wiederholen. Betätigen Sie dafür den Knopf "
-"<guibutton>\"F1\" (Hilfe)</guibutton>."
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Dies öffnet die die nachfolgend gezeigte textbasierte Hilfe."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Hilfebildschirm der Installation"
-
-#. 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 align=\"center\" fileref=\"../dx-help.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installationsprobleme und mögliche Lösungen"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Keine grafische Schnittstelle"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1802,13 +1970,14 @@ msgstr ""
 "code> eingeben."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Ist die Hardware sehr alt, kann unter Umständen eine grafische Installation "
 "nicht möglich sein. In diesem Falle sollten Sie eine Installation im "
@@ -1819,12 +1988,12 @@ msgstr ""
 "Textmodus des Installationsprogramms zu gelangen."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Die Installation friert ein"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1842,12 +2011,12 @@ msgstr ""
 "ist."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kernel Optionen"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3242,3 +3411,41 @@ msgstr ""
 "Klicken Sie auf <guibutton>Weiter</guibutton>, wenn Sie sich sicher sind und "
 "jede Partition, jedes Betriebssystem und alle Daten auf dem Laufwerk löschen "
 "wollen."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Treten während der Installation Probleme auf, kann es nötig sein, "
+#~ "spezielle Installationsoptionen zu verwenden, siehe <xref linkend="
+#~ "\"installationOptions\"/>."
+
+#~ msgid "Installation options"
+#~ msgstr "Installationsoptionen"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Dies öffnet die die nachfolgend gezeigte textbasierte Hilfe."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Hilfebildschirm der Installation"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Kernel Optionen"
diff --git a/docs/installer/el.po b/docs/installer/el.po
index d782ae22..34a72622 100644
--- a/docs/installer/el.po
+++ b/docs/installer/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-02-28 07:16+0100\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -98,9 +98,9 @@ msgstr "el"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Επιλογή μέσων (Διαμόρφωση επιπρόσθετων μέσων εγκατάστασης)"
 
-#.  papoteur 2013-04-13  - created
-#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#.  papoteur 2013-04-13  - created 
+#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
+#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
 #: en/add_supplemental_media.xml:18
 msgid ""
@@ -155,19 +155,19 @@ 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
+#.  Started by marja,using Led43's text, on 2012 03 27 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
 #.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing
-#.        about guest account there, is the box you can tick or untick to enable or
+#.        changed his text about the Advanced User Managment screen (the only thing 
+#.        about guest account there, is the box you can tick or untick to enable or 
 #.        disable it, the rest is about the normal user you're adding in the previous
 #.        screen), marja, 20120409
 #.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct?
-#.  JohnR 2012-04-19 Language proofreading
-#.  marja 2012-04-24 Added screenshot
-#.  marja 2013-04-26 added new note
+#.        "rbash" in the xguest warning - is that correct? 
+#.  JohnR 2012-04-19 Language proofreading  
+#.  marja 2012-04-24 Added screenshot 
+#.  marja 2013-04-26 added new note 
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:27
 msgid ""
@@ -416,17 +416,17 @@ 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
+#.  Made by marja on 2012 03 28 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, marja, 20120409 
 #.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#.        with "a", as I can't imagine having more than one root partition ;)
-#.  Lebarhon : I put [] where it seems having mistakes
+#.        with "a", as I can't imagine having more than one root partition ;) 
+#.  Lebarhon : I put [] where it seems having mistakes 
 #.  Marja: you're right, in English English it is "its type", however, the Americans
 #.        write "it's type". And you're right about the redundant part, too, I removed it
-#.  And JohnR says the Americans are WRONG! :-))
-#.  2012-04-19  Language proofreading done
+#.  And JohnR says the Americans are WRONG! :-)) 
+#.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
@@ -688,8 +688,8 @@ 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 ""
@@ -742,8 +742,8 @@ 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 ""
@@ -1476,9 +1476,9 @@ 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
@@ -1539,10 +1539,10 @@ 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 ""
@@ -1606,12 +1606,12 @@ msgstr ""
 "guibutton> για να συνεχίσετε."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, ο οδηγός εγκατάστασης της Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1623,7 +1623,7 @@ msgstr ""
 "ευκολότερα."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1632,26 +1632,37 @@ msgstr ""
 "εκκινήσει τον οδηγό εγκατάστασης, και τυπικά είναι αυτό που χρειαζόσαστε."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Η πρώτη οθόνη καλωσορίσματος στην εγκατάσταση"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1659,21 +1670,199 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Αν παρουσιαστούν προβλήματα κατά την εγκατάσταση, τότε ίσως να χρειαστεί να "
-"χρησιμοποιήσετε ειδικές επιλογές, δείτε <xref linkend=\"installationOptions"
-"\"></xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Αν αποτύχει η εγκατάσταση τότε ίσως να χρειαστεί να δοκιμάσετε ξανά "
+"χρησιμοποιώντας μια από τις επιπλέον επιλογές διαθέσιμες με το πάτημα του "
+"κουμπιού F1 (Βοήθεια) δείτε <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Τα βήματα εγκατάστασης"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1682,7 +1871,7 @@ msgstr ""
 "οποία μπορείτε να παρακολουθήσετε στον πλευρικό πίνακα της οθόνης."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1692,7 +1881,7 @@ msgstr ""
 "συνήθως δεν θα χρειαστεί να επιλέξετε."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1701,7 +1890,7 @@ msgstr ""
 "όπου θα βρείτε περισσότερες πληροφορίες σχετικά με το τρέχον βήμα."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1723,57 +1912,18 @@ msgstr ""
 "πατήστε <guibutton>Alt Ctrl Delete</guibutton> ταυτόχρονα για να κάνετε "
 "επανεκκίνηση."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-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>"
-msgstr ""
-"Αν αποτύχει η εγκατάσταση τότε ίσως να χρειαστεί να δοκιμάσετε ξανά "
-"χρησιμοποιώντας μια από τις επιπλέον επιλογές διαθέσιμες με το πάτημα του "
-"κουμπιού F1 (Βοήθεια) δείτε <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-"Στη συνέχεια θα ανοίξει το παρακάτω παράθυρο κειμένου βοήθειας για την "
-"εγκατάσταση."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Προβλήματα στην εγκατάσταση και πιθανές λύσεις"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Δεν λειτουργεί το γραφικό περιβάλλον"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1785,13 +1935,14 @@ msgstr ""
 "<code>vgalo</code> στην προτροπή."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Αν πρόκειται για πολύ παλιό υλικό, ίσως η εγκατάσταση σε γραφικό περιβάλλον "
 "να είναι αδύνατη. Σε αυτή την περίπτωση μπορείτε να δοκιμάσετε την "
@@ -1801,12 +1952,12 @@ msgstr ""
 "Τώρα συνεχίστε την εγκατάσταση σε λειτουργία κειμένου.<emphasis></emphasis>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Πάγωμα της εγκατάστασης"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1822,12 +1973,12 @@ msgstr ""
 "κριθεί απαραίτητο."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Επιλογές πυρήνα"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -1845,10 +1996,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Ενημερώσεις"
 
-#.  Made by marja on 2012 03 30
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 03 30 
+#.  NEEDS TO BE REVIEWED! 
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#.  marja, 2012-04-24 added screenshot
+#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -1891,9 +2042,9 @@ msgstr "Έπειτα κάντε κλικ στο <guibutton>Επόμενο</guibu
 msgid "Media Selection (Nonfree)"
 msgstr "Επιλογή μέσων (Nonfree)"
 
-#.  papoteur 2013-04-11  - created
+#.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
 #: en/media_selection.xml:12
@@ -2016,18 +2167,18 @@ msgstr ""
 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"
+#. 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
@@ -2373,8 +2524,8 @@ 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 ""
@@ -2413,8 +2564,8 @@ 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 ""
@@ -2761,10 +2912,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Επιλογή ποντικιού"
 
-#.  Made by marja on 2012 04 11
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 04 11 
+#.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
-#.  marja 2012-04-24 adding screenshot
+#.  marja 2012-04-24 adding screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -2883,7 +3034,7 @@ 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.
+#.  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
@@ -3055,14 +3206,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Διαμόρφωση SCSI"
 
-#.  Made by marja on 2012 04 02
-#.  NEEDS TO BE REVIEWED!
-#.  JohnR - edited 2012-03-03
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#.  marja 2012-04-24 added screenshot
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#.        Mdv doc instead of on our setupSCSI file
+#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -3105,7 +3256,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 ""
@@ -3185,12 +3336,12 @@ 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
+#.     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 ""
@@ -3220,6 +3371,47 @@ msgstr ""
 "συστημάτων και όλων των δεδομένων στον συγκεκριμένο σκληρό δίσκο."
 
 #~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Αν παρουσιαστούν προβλήματα κατά την εγκατάσταση, τότε ίσως να χρειαστεί "
+#~ "να χρησιμοποιήσετε ειδικές επιλογές, δείτε <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Επιλογές εγκατάστασης"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr ""
+#~ "Στη συνέχεια θα ανοίξει το παρακάτω παράθυρο κειμένου βοήθειας για την "
+#~ "εγκατάσταση."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Η πρώτη οθόνη βοήθειας εγκατάστασης"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Επιλογές πυρήνα"
+
+#~ msgid ""
 #~ "This section allows you to fine tune your sound card. In most cases the "
 #~ "options selected will work with your computer."
 #~ msgstr ""
diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml
index eb7e9fca..da773cf5 100644
--- a/docs/installer/en/installer.xml
+++ b/docs/installer/en/installer.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="installer">
-
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installer" version="5.0">
   <!-- Made by marja on 2012 03 30, using barjac's text -->
 
   <!-- NEEDS TO BE REVIEWED! -->
@@ -35,17 +34,151 @@
       <title xml:id="installer-ti2">Installation Welcome Screen</title>
     </info>
 
+    <para>Here is the default welcome screen when using a Mageia
+    DVD:</para>
+
     <mediaobject>
       <imageobject>
-        <imagedata revision="1" fileref="../dx-welcome.png" align="center" 
-         format="PNG"  xml:id="BId-drakx-intro-im1">
-        </imagedata>
+        <imagedata xml:id="BId-drakx-intro-im1" revision="1" align="center" format="PNG" fileref="../dx-welcome.png"/>
       </imageobject>
     </mediaobject>
   </figure>
 
-  <para>If there are problems during install, then it may be necessary to use
-  special installation options, see <xref linkend="installationOptions"></xref>.</para>
+  <para>From this first screen, it is possible to set some personal
+  preferences:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>The language (for the installation only, may be different that the
+      chosen language for the system) by pressing the key F2</para>
+
+      <para/>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcome-lang.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Use the arrow keys to select the language and press the key
+      Enter.</para>
+
+      <para>Here is for example, the French welcome screen when using a Live
+      DVD/CD. Note that the Live DVD/CD menu does not propose:
+      <guilabel>Rescue System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
+      Detection Tool</guilabel>.</para>
+
+      <para/>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcome4fr.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para/>
+    </listitem>
+
+    <listitem>
+      <para>Change the screen resolution by pressing the F3 key.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcome5def.png"/>
+        </imageobject>
+      </mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>Add some kernel options by pressing the F6 key.</para>
+
+      <para>If the installation fails, then it may be necessary to try again
+      using one of the extra options. The menu called by F6 displays a new
+      line called <guilabel>Boot options</guilabel> and propose four
+      entries:</para>
+
+      <para>- Default, it doesn't alter anything in the default
+      options.</para>
+
+      <para>- Safe Settings, priority is given to the safer options to the
+      detriment of performances.</para>
+
+      <para>- No ACPI (Advanced Configuration and Power Interface), power
+      management isn't taken into account.</para>
+
+      <para>- No Local APIC (Local Advanced Programmable Interrupt
+      Controller), it is about CPU interruptions, select this option if you
+      are asked for.</para>
+
+      <para>When you select one of these entries, it modifies the default options
+      displayed in the <guilabel>Boot Options</guilabel> line.</para>
+
+      <note>
+        <para>In some Mageia releases, it may happen that the entries selected
+	  with the key F6 does not appear in the <guilabel>Boot Options</guilabel> line, however, they
+        are really taken into account.</para>
+      </note>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcome6opt.png"/>
+        </imageobject>
+      </mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>Add more kernel options by pressing the key F1</para>
+
+      <para>Pressing F1 opens a new window with more available options. Select
+      one with the arrow keys and press Enter to have more details or press
+      the Esc key to go back to the welcome screen.</para>
+
+      <para/>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcomeHelp1.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para/>
+
+      <para>The detailed view about the option splash. Press Esc or select
+      <guilabel>Return to Boot Options</guilabel> to go back to the options
+      list. These options can by added by hand in the <guilabel>Boot
+      options</guilabel> line.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx-welcomeHelp2.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para/>
+
+      <note>
+        <para>The help is translated in the chosen language with the F2
+        key.</para>
+      </note>
+    </listitem>
+  </itemizedlist>
+
+  <para>Here is the default welcome screen when using a Wired Network-based
+  Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
+
+  <para>It does not allow to change the language, the available options are
+  described in the screen. For more information about using a Wired
+  Network-based Installation CD, see <link ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia Wiki</link></para>
+
+  <warning>
+    <para>The keyboard layout is the American one.</para>
+  </warning>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata revision="1" xml:id="installer-im2" align="center" format="PNG" fileref="../dx-help.png"/>
+    </imageobject>
+  </mediaobject>
 
   <section xml:id="installationSteps">
     <info>
@@ -76,30 +209,6 @@
   </section>
 
   <section xml:id="installationOptions">
-    <info>
-      <title xml:id="installationOptions-ti1">Installation options</title>
-    </info>
-
-    <para>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></para>
-
-    <para>This will open the following text based help.</para>
-
-    <figure xml:id="dx-help">
-      <info>
-        <title xml:id="installationOptions-ti2">Installation Help
-        Screen</title>
-      </info>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata revision="1" fileref="../dx-help.png" align="center" 
-           format="PNG"  xml:id="installer-im2"></imagedata>
-        </imageobject>
-      </mediaobject>
-    </figure>
-
     <section xml:id="installationProblems">
       <info>
         <title xml:id="installationProblems-ti1">Installation Problems and
@@ -120,12 +229,12 @@
           </listitem>
 
           <listitem>
-            <para revision="2">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></para>
+            <para revision="2">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.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -144,7 +253,7 @@
 
       <section xml:id="kernelOptions">
         <info>
-          <title xml:id="kernelOptions-ti1">Kernel Options</title>
+          <title xml:id="kernelOptions-ti1">RAM problem</title>
         </info>
 
         <para>These will rarely be needed, but in some cases the hardware may
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index c39a5e1e..3df87063 100644
--- a/docs/installer/eo.po
+++ b/docs/installer/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-01-16 06:20+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/"
@@ -1518,12 +1518,12 @@ msgstr ""
 "por daŭrigi."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, la instalilo de Magejo"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1533,7 +1533,7 @@ msgstr ""
 "estas desegnita por igi vian instaladon aŭ ĝisdatigon tiel facila kiel eble."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1542,26 +1542,38 @@ msgstr ""
 "mageja instalilo, kiu kutime havos ĉion kion oni bezonas."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Bonveniga instal-ekrano"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" width="
-"\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"BId-drakx-"
-"intro-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summary-im2\"></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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1569,20 +1581,212 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Se okazus problemoj dum la instalado, tiam povus esti necese uzi specialajn "
-"instalajn elektojn, vidu <xref linkend=\"installationOptions\"></xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Se la instalo malsukcesas tiam povas esti necese provi denove kaj uzi unu el "
+"la aldonaj elektoj aperontaj per la premo de la klavo F1 (Helpo), vidu <xref "
+"linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summary-im2\"></imagedata> </"
+"imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
 msgid "The installation steps"
 msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1591,7 +1795,7 @@ msgstr ""
 "la flanka panelo de la ekrano."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1601,7 +1805,7 @@ msgstr ""
 "bezonataj elektoj."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1610,7 +1814,7 @@ msgstr ""
 "havigantan pliajn karigojn pri tiu paŝo."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1629,55 +1833,18 @@ msgstr ""
 "<guibutton>Alt Ctrl F2</guibutton> samtempe.  Post tio, premu <guibutton>Alt "
 "Ctrl Delete</guibutton> samtempe por reŝarĝi."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Instal-elektoj"
-
-#. 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>"
-msgstr ""
-"Se la instalo malsukcesas tiam povas esti necese provi denove kaj uzi unu el "
-"la aldonaj elektoj aperontaj per la premo de la klavo F1 (Helpo), vidu <xref "
-"linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Ĉi tio malfermos la jenan teksto-bazitan helpon."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Instala helpo-ekrano"
-
-#. 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\" width=\"720\" format=\"PNG\" depth=\"400\" xml:id=\"installer-"
-"im2\"></imagedata> </imageobject>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instal-problemoj kaj eblaj solvoj"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Sen grafika interfaco"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1688,13 +1855,14 @@ msgstr ""
 "utiligi malaltan rezolucion per la tajpo de \"vgalo\" en la komand-linio."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Se la aparataro estas tre malnova, grafika instalo povas esti neebla. Ĉikaze "
 "povas esti rekomendinde provi teksto-bazitan instalon.  Por tio premu la "
@@ -1703,12 +1871,12 @@ msgstr ""
 "daŭrigu la instaladon tekste.  <emphasis></emphasis>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Instal-paneoj"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1722,12 +1890,12 @@ msgstr ""
 "Ĉi tiu elekto povas ankaŭ esti miksita kun la antaŭa se estas necese."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kernaj elektoj"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -2999,3 +3167,42 @@ msgid ""
 "Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
 "partition, every operating system and all data on that hard disk."
 msgstr ""
+
+#~ 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\" "
+#~ "width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"BId-"
+#~ "drakx-intro-im1\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Se okazus problemoj dum la instalado, tiam povus esti necese uzi "
+#~ "specialajn instalajn elektojn, vidu <xref linkend=\"installationOptions"
+#~ "\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Instal-elektoj"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Ĉi tio malfermos la jenan teksto-bazitan helpon."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Instala helpo-ekrano"
+
+#~ 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\" width=\"720\" format=\"PNG\" depth=\"400\" xml:id=\"installer-"
+#~ "im2\"></imagedata> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Kernaj elektoj"
diff --git a/docs/installer/es.po b/docs/installer/es.po
index cc23cdbe..d992cf4b 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2013-12-20 16:26+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -1584,12 +1584,12 @@ msgstr ""
 "guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, el instalador de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1600,7 +1600,7 @@ msgstr ""
 "posible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1609,25 +1609,37 @@ msgstr ""
 "iniciará el instalador, que normalmente será todo lo que necesite."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Pantalla de bienvenida del Instalador"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
-msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\" /> </imageobject>"
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.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><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1635,21 +1647,211 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Si tiene problemas durante la instalación, puede que sea necesario usar "
-"opciones especiales de instalación, vea <xref linkend=\"installationOptions"
-"\"/>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Si la instalación falla, puede ser necesario volver a intentarlo usando una "
+"de las opciones extra disponibles pulsando <guibutton>F1 (Help)</guibutton>. "
+"Vea <xref linkend=\"dx-welcome\"/>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Los pasos de la instalación"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1658,7 +1860,7 @@ msgstr ""
 "seguidos en el panel lateral de la pantalla."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1667,7 +1869,7 @@ msgstr ""
 "<guibutton>Avanzados</guibutton> con opciones extra, normalmente poco usadas."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1676,7 +1878,7 @@ msgstr ""
 "que le darán explicaciones sobre el paso en cuestión."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1695,54 +1897,18 @@ msgstr ""
 "pulsando al mismo tiempo <guibutton>Alt Ctrl F2</guibutton>. Después, pulse "
 "<guibutton>Alt Ctrl Delete</guibutton> simultáneamente para reiniciar."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opciones de instalación"
-
-#. 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>"
-msgstr ""
-"Si la instalación falla, puede ser necesario volver a intentarlo usando una "
-"de las opciones extra disponibles pulsando <guibutton>F1 (Help)</guibutton>. "
-"Vea <xref linkend=\"dx-welcome\"/>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Esto abrirá la siguiente página de ayuda en texto."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Pantalla de Ayuda de la Instalación"
-
-#. 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\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\" /> </imageobject>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemas en la Instalación y Posibles Soluciones."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "No hay Interfaz Gráfica"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1754,13 +1920,14 @@ msgstr ""
 "code> en la terminal."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Si el hardware es muy antiguo, puede que no sea posible hacer una "
 "instalación gráfica. En este caso merece la pena intentar una instalación en "
@@ -1770,12 +1937,12 @@ msgstr ""
 "texto."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "La Instalación se congela"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1790,12 +1957,12 @@ msgstr ""
 "con otras si es necesario."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opciones del Kernel"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3144,3 +3311,41 @@ msgid ""
 msgstr ""
 "Haga click en <guibutton>Siguiente</guibutton> si está seguro y quiereborrar "
 "todas las particiones, sistemas operativos y datos de su disco duro."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Si tiene problemas durante la instalación, puede que sea necesario usar "
+#~ "opciones especiales de instalación, vea <xref linkend="
+#~ "\"installationOptions\"/>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opciones de instalación"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Esto abrirá la siguiente página de ayuda en texto."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Pantalla de Ayuda de la Instalación"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\" /> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opciones del Kernel"
diff --git a/docs/installer/et.po b/docs/installer/et.po
index 29634120..539c0d28 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-01-02 18:46+0000\n"
 "Last-Translator: Marek Laane <bald@smail.ee>\n"
 "Language-Team: Estonian <i18n-discuss@ml.mageia.org>\n"
@@ -1569,12 +1569,12 @@ msgstr ""
 "guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "Mageia paigaldusprogramm DrakX"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1585,7 +1585,7 @@ msgstr ""
 "uuendamine oleks kõigile võimalikult lihtne."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1594,25 +1594,37 @@ msgstr ""
 "paigaldusprogrammi, mida tavaliselt ongi vaja."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Paigaldusprogrammi avaekraan"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-summaryBottom.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"summaryBottom-im1\"/> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1620,21 +1632,211 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Kui paigaldamise ajal tekib probleeme, võib olla vajalik kasutada "
-"spetsiaalseid paigaldusvõtmeid, mille kohta vaadake <xref linkend="
-"\"installationOptions\"/>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
+"kasutades mõnda lisavõtit, mille nägemiseks tuleb vajutada klahvi "
+"<guibutton>F1 (Abi)</guibutton>, vt ka <xref linkend=\"dx-welcome\"/>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-summaryBottom.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"summaryBottom-im1\"/> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
 msgid "The installation steps"
 msgstr "Paigaldamise etapid"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1643,7 +1845,7 @@ msgstr ""
 "külgpaneelil."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1653,7 +1855,7 @@ msgstr ""
 "vajalikud valikud."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1662,7 +1864,7 @@ msgstr ""
 "etappi põhjalikumalt."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1682,54 +1884,18 @@ msgstr ""
 "guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
 "<guibutton>Alt Ctrl Delete</guibutton>."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Paigaldamisvõtmed"
-
-#. 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>"
-msgstr ""
-"Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
-"kasutades mõnda lisavõtit, mille nägemiseks tuleb vajutada klahvi "
-"<guibutton>F1 (Abi)</guibutton>, vt ka <xref linkend=\"dx-welcome\"/>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "See avab järgmise tekstipõhise abiekraani."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Paigaldamise abiekraan"
-
-#. 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 align=\"center\" fileref=\"../dx-help.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Graafiline liides puudub"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1740,13 +1906,14 @@ msgstr ""
 "ekraanilahutust, kirjutades käsureale <code>vgalo</code>."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Kui riistvara on väga vana, ei pruugi graafiline paigaldamine üldse võimalik "
 "olla. Sel juhul võib proovida tekstipõhist paigaldamist. Selleks vajutage "
@@ -1756,12 +1923,12 @@ msgstr ""
 "<emphasis/>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Paigaldamine hangub"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1776,12 +1943,12 @@ msgstr ""
 "võtmetega."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kerneli võtmed"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3119,6 +3286,44 @@ msgstr ""
 "kõik andmed."
 
 #~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Kui paigaldamise ajal tekib probleeme, võib olla vajalik kasutada "
+#~ "spetsiaalseid paigaldusvõtmeid, mille kohta vaadake <xref linkend="
+#~ "\"installationOptions\"/>."
+
+#~ msgid "Installation options"
+#~ msgstr "Paigaldamisvõtmed"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "See avab järgmise tekstipõhise abiekraani."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Paigaldamise abiekraan"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Kerneli võtmed"
+
+#~ msgid ""
 #~ "This section allows you to fine tune your sound card. In most cases the "
 #~ "options selected will work with your computer."
 #~ msgstr ""
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index ca58a9f1..0a271409 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 15:01+0700\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-02-17 21:46+0000\n"
 "Last-Translator: Dune <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
@@ -1605,12 +1605,12 @@ msgstr ""
 "<guibutton>Suivant</guibutton> pour continuer."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'installateur de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1621,7 +1621,7 @@ msgstr ""
 "mise à jour aussi aisée que possible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1631,25 +1631,38 @@ msgstr ""
 "plupart du temps ."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Ecran d'accueil de l'installation"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
-msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\" /> </imageobject>"
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1657,21 +1670,200 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Si des problèmes se présentent pendant l'installation, il peut alors être "
-"nécessaire d'employer des options d'installation particulières, voir <xref "
-"linkend=\"installationOptions\"/>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Si l'installation échoue, alors il peut être nécessaire d'essayer à nouveau "
+"en faisant appel à l'une des options disponibles en appuyant sur la touche  "
+"<guibutton>F1 (Aide) </guibutton> voir <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
+"imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
 msgid "The installation steps"
 msgstr "Les étapes de l'installation"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1680,7 +1872,7 @@ msgstr ""
 "suivies dans le panneau latéral à gauche de l'écran."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1690,7 +1882,7 @@ msgstr ""
 "supplémentaires moins communes."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1699,7 +1891,7 @@ msgstr ""
 "apporte davantage d'explications au sujet de l'étape en cours."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1720,54 +1912,18 @@ msgstr ""
 "simultanément sur les trois touches <guibutton>alt ctrl suppr</guibutton> "
 "pour redémarrer."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Options d'installation"
-
-#. 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>"
-msgstr ""
-"Si l'installation échoue, alors il peut être nécessaire d'essayer à nouveau "
-"en faisant appel à l'une des options disponibles en appuyant sur la touche  "
-"<guibutton>F1 (Aide) </guibutton> voir <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Cela affichera l'aide suivante en mode texte."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Ecran d'aide de l'installation"
-
-#. 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\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problèmes d'installation et solutions possibles"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Pas d'interface graphique"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1779,13 +1935,14 @@ msgstr ""
 "l'invite."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Si le matériel est très vieux, une installation graphique peut être "
 "impossible. Dans ce cas il est nécessaire de tenter une installation en mode "
@@ -1795,12 +1952,12 @@ msgstr ""
 "ensuite avec l'installation en mode texte.<emphasis></emphasis>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "L'installation se fige"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1815,12 +1972,12 @@ msgstr ""
 "avec les précédentes si nécessaire.."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Options du noyau"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3193,3 +3350,41 @@ msgstr ""
 "Cliquer sur <guibutton>Suivant</guibutton> en cas de certitude avec la "
 "volonté d'effacer toutes les partitions, tous les systèmes d'exploitation et "
 "toutes les données présents sur ce disque dur."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Si des problèmes se présentent pendant l'installation, il peut alors être "
+#~ "nécessaire d'employer des options d'installation particulières, voir "
+#~ "<xref linkend=\"installationOptions\"/>."
+
+#~ msgid "Installation options"
+#~ msgstr "Options d'installation"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Cela affichera l'aide suivante en mode texte."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Ecran d'aide de l'installation"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Options du noyau"
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index a7bc1d57..317a963c 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 15:01+0700\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1242,12 +1242,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1255,54 +1255,225 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> "
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> "
 "</imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" "
-"id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/installer.xml:47
+msgid "From this first screen, it is possible to set some personal preferences:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+msgid "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live "
+"DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue "
+"System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+"Detection Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+msgid "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref "
-"linkend=\"installationOptions\"></xref>."
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+msgid "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options "
+"list. These options can by added by hand in the <guilabel>Boot "
+"options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired "
+"Network-based Installation CD, see <link "
+"ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">the Mageia "
+"Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" "
+"align=\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/installer.xml:52
+#: en/installer.xml:185
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "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
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have "
 "<guibutton>Advanced</guibutton> buttons with extra, less commonly required, "
@@ -1310,14 +1481,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1329,49 +1500,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-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>"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-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 ""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection "
 "screen. This can happen with some graphic cards and older systems. Try using "
@@ -1379,22 +1519,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1404,12 +1544,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
+#: en/installer.xml:256
+msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
diff --git a/docs/installer/id.po b/docs/installer/id.po
index afc8caac..1d804da5 100644
--- a/docs/installer/id.po
+++ b/docs/installer/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 15:01+0700\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-02-17 07:47+0000\n"
 "Last-Translator: kiki.syahadat <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -1574,12 +1574,12 @@ msgstr ""
 "guibutton> untuk melanjutkan."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Installer Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1590,7 +1590,7 @@ msgstr ""
 "mungkin."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1599,26 +1599,37 @@ msgstr ""
 "memulai installer, yang normalnya adalah yang Anda inginkan."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Layar Selamat Datang untuk Instalasi"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1626,20 +1637,199 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Jika ada masalah saat instalasi, mungkin perlu menggunakan pilihan instalasi "
-"khusus, lihat <xref linkend=\"installationOptions\"></xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Jika instalasi gagal, mungkin perlu dicoba lagi dengan menggunakan salah "
+"satu pilihan tambahan yang tersedia dengan menekan tombol <guibutton>F1 "
+"(Bantuan)</guibutton> lihat <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Langkah-langkah instalasi"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1648,7 +1838,7 @@ msgstr ""
 "panel samping dari layar."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1658,7 +1848,7 @@ msgstr ""
 "terlalu dibutuhkan."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1667,7 +1857,7 @@ msgstr ""
 "penjelasan lebih tentang langkah yang sedang dijalani."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1688,55 +1878,18 @@ msgstr ""
 "bersamaan. Setelahnya, tekan <guibutton>Alt Ctrl Delete</guibutton> secara "
 "bersamaan untuk menjalankan ulang."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Pilihan instalasi"
-
-#. 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>"
-msgstr ""
-"Jika instalasi gagal, mungkin perlu dicoba lagi dengan menggunakan salah "
-"satu pilihan tambahan yang tersedia dengan menekan tombol <guibutton>F1 "
-"(Bantuan)</guibutton> lihat <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Ini akan membuka bantuan berbasis teks berikut."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Layar Bantuan Instalasi"
-
-#. 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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Masalah Instalasi dan Kemungkinan Solusinya"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Tidak Ada Antarmuka Grafis"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1748,13 +1901,14 @@ msgstr ""
 "pada baris perintah."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Jika hardware sangat tua, instalasi dengan gambar mungkin tidak bisa. Dalam "
 "kasus seperti ini, patut dicoba untuk menginstall dengan mode teks. Untuk "
@@ -1763,12 +1917,12 @@ msgstr ""
 "lalu tekan ENTER. Lanjutkan instalasi dengan mode teks.<emphasis></emphasis>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Instalasi Membeku"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1783,12 +1937,12 @@ msgstr ""
 "pilihan lain seperlunya."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Pilihan Kernel"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3133,3 +3287,41 @@ msgstr ""
 "Klik pada <guibutton>Selanjutnya</guibutton> jika Anda yakin dan ingin "
 "menghapus semua partisi, semua sistem operasi dan semua data pada harddisk "
 "tersebut."
+
+#~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Jika ada masalah saat instalasi, mungkin perlu menggunakan pilihan "
+#~ "instalasi khusus, lihat <xref linkend=\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Pilihan instalasi"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Ini akan membuka bantuan berbasis teks berikut."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Layar Bantuan Instalasi"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Pilihan Kernel"
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index 6b889426..3f5bf6f9 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2013-12-18 18:49+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/mageia/language/"
@@ -1589,12 +1589,12 @@ msgstr ""
 "uw keus."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, het Mageia-installatieprogramma"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1605,7 +1605,7 @@ msgstr ""
 "ervaren gebruiker bent."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1615,26 +1615,37 @@ msgstr ""
 "nodig heeft."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Allereerste installatiewelkomsscherm"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1642,21 +1653,211 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Als er tijdens het installeren problemen zijn, kan het nodig zijn speciale "
-"installatie-opties te gebruiken, zie <xref linkend=\"installationOptions\"></"
-"xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Als de installatie misgaat, kan het nodig zijn opnieuw te beginnen en één of "
+"meer van de opties te gebruiken die u ziet als u op de F1 (Help)  toets "
+"klikt, zie <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "De Installatiestappen"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1665,7 +1866,7 @@ msgstr ""
 "de volgende schermen zichtbaar zijn."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1675,7 +1876,7 @@ msgstr ""
 "gebruikelijke opties."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1684,7 +1885,7 @@ msgstr ""
 "uitleg geven over de desbetreffende stap."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1705,55 +1906,18 @@ msgstr ""
 "<guibutton>Alt Ctrl F2</guibutton> in te drukken. Druk vervolgens simultaan "
 "op <guibutton>Alt Ctrl Delete</guibutton> om opnieuw op te starten."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Installatie-opties"
-
-#. 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>"
-msgstr ""
-"Als de installatie misgaat, kan het nodig zijn opnieuw te beginnen en één of "
-"meer van de opties te gebruiken die u ziet als u op de F1 (Help)  toets "
-"klikt, zie <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Het volgende tekstscherm wordt dan zichtbaar."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Eerste installatiehulpscherm"
-
-#. 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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installatieproblemen en mogelijke oplossingen"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Geen grafische interface"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1764,13 +1928,14 @@ msgstr ""
 "resolutie te gebruiken door \"vgalo\" te typen bij de \"boot:\"-prompt."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Als de hardware erg oud is, kan grafisch installeren zelfs onmogelijk zijn. "
 "In dat geval is het de moeite waard een installatie in tekstmodus te doen. "
@@ -1780,12 +1945,12 @@ msgstr ""
 "druk vervolgens op de entertoets. Ga nu verder met installeren in textmodus."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Installatieblokkades"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1800,12 +1965,12 @@ msgstr ""
 "beide vorige gecombineerd worden."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kernelopties"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3157,3 +3322,42 @@ msgstr ""
 "Klik op <guibutton>Volgende</guibutton> als u het zeker weet en elke "
 "partitie, elk besturingssysteem en alle gegevens op deze harde schijf wilt "
 "wissen."
+
+#~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Als er tijdens het installeren problemen zijn, kan het nodig zijn "
+#~ "speciale installatie-opties te gebruiken, zie <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Installatie-opties"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Het volgende tekstscherm wordt dan zichtbaar."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Eerste installatiehulpscherm"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Kernelopties"
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index 734b2a99..52557fb5 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2013-12-19 12:07+0100\n"
 "Last-Translator: Daniel Napora <napcok@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -1344,12 +1344,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX instalator Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1360,7 +1360,7 @@ msgstr ""
 "aktualizację łatwą i przyjemną. "
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1370,26 +1370,37 @@ msgstr ""
 "potrzebujesz."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1397,21 +1408,211 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Jeśli napotkasz na jakieś problemy podczas instalacji, może się jednak "
-"okazać, że będzie potrzebne skorzystanie ze specjalnych opcji instalacji, "
-"zobacz <xref linkend=\"installationOptions\"></xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Jeśli instalacja się nie powiedzie, może być konieczne rozpoczęcie od "
+"początku i użycie dodatkowych opcji dostępnych pod klawiszem <guibutton>F1 "
+"(Pomoc)</guibutton> zobacz <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Etapy instalacji"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1420,7 +1621,7 @@ msgstr ""
 "lewej stronie ekranu instalatora."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1430,7 +1631,7 @@ msgstr ""
 "używanych opcji."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1440,7 +1641,7 @@ msgstr ""
 "instalacji."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1461,55 +1662,18 @@ msgstr ""
 "wciskając jednocześnie klawisze<guibutton>Alt Ctrl F2</guibutton>. Następnie "
 "zrebootuj komputer za pomocą klawiszy <guibutton>Alt Ctrl Delete</guibutton>."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opcje instalatora"
-
-#. 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>"
-msgstr ""
-"Jeśli instalacja się nie powiedzie, może być konieczne rozpoczęcie od "
-"początku i użycie dodatkowych opcji dostępnych pod klawiszem <guibutton>F1 "
-"(Pomoc)</guibutton> zobacz <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Zostanie wyświetlony następujący ekran z pomocą."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemy z instalacją oraz możliwe rozwiązania"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Brak graficznego interfejsu"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1520,13 +1684,14 @@ msgstr ""
 "użyć niskiej rozdzielczości wpisując w linii komend <code>vgalo</code>."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Jeśli sprzęt jest bardzo stary, użycie graficznego instalatora może być "
 "niemożliwe. W tym przypadku warto wypróbować instalację w trybie tekstowym. "
@@ -1535,12 +1700,12 @@ msgstr ""
 "kontynuować instalację w trybie tekstowym."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Zawieszenie się instalacji"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1554,12 +1719,12 @@ msgstr ""
 "łączona z innymi opcjami jeśli zajdzie taka potrzeba."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opcje jądra"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -2704,3 +2869,39 @@ msgid ""
 "Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
 "partition, every operating system and all data on that hard disk."
 msgstr ""
+
+#~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Jeśli napotkasz na jakieś problemy podczas instalacji, może się jednak "
+#~ "okazać, że będzie potrzebne skorzystanie ze specjalnych opcji instalacji, "
+#~ "zobacz <xref linkend=\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opcje instalatora"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Zostanie wyświetlony następujący ekran z pomocą."
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opcje jądra"
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index 52c5c748..3a319f7b 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2013-12-08 20:54+0000\n"
 "Last-Translator: Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -1595,12 +1595,12 @@ msgstr ""
 "<guibutton>Próximo</guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, o Instalador da Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1611,7 +1611,7 @@ msgstr ""
 "possível."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1620,26 +1620,38 @@ msgstr ""
 "instalador, que será, normalmente, tudo o que você irá precisar."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Primeira Tela da Instalação"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"></imagedata> </"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1647,21 +1659,212 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Se houver problemas durante a instalação, então pode ser necessário usar "
-"opções de instalação especiais, consulte <xref linkend=\"installationOptions"
-"\"></xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Se a instalação falhar, então pode ser necessário tentar de novo usando uma "
+"das opções extras disponíveis pressionando <guibutton>F1 (Help)</guibutton>. "
+"Veja em <xref linkend=\"dx-welcome\"></xref>Tela de Ajuda da Instalação"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
+"imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
 msgid "The installation steps"
 msgstr "As etapas de instalação"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1670,7 +1873,7 @@ msgstr ""
 "seguido no painel lateral da tela."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1680,7 +1883,7 @@ msgstr ""
 "necessárias."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1689,7 +1892,7 @@ msgstr ""
 "explicações sobre a etapa atual."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1710,55 +1913,18 @@ msgstr ""
 "guibutton> ao mesmo tempo. Depois disso, pressione <guibutton>Ctrl Alt "
 "Delete</guibutton> simultaneamente, para reiniciar."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opções de Instalação"
-
-#. 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>"
-msgstr ""
-"Se a instalação falhar, então pode ser necessário tentar de novo usando uma "
-"das opções extras disponíveis pressionando <guibutton>F1 (Help)</guibutton>. "
-"Veja em <xref linkend=\"dx-welcome\"></xref>Tela de Ajuda da Instalação"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Isto abrirá o seguinte ajuda em modo texto."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Tela de Ajuda da Instalação"
-
-#. 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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemas de Instalação e Possíveis Soluções"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Sem Interface Gráfica"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1770,13 +1936,14 @@ msgstr ""
 "texto)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Se o hardware é muito antigo, uma instalação gráfica pode não ser possível. "
 "Neste caso, vale a pena tentar uma instalação em modo de texto.  Para usar "
@@ -1785,12 +1952,12 @@ msgstr ""
 "clique ENTER. Agora continue com a instalação em modo-texto."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "A Instalação Congela"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1805,12 +1972,12 @@ msgstr ""
 "combinada com outras opções, conforme necessário."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opções do Kernel"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3172,3 +3339,42 @@ msgstr ""
 "Clique em <guibutton>Avançar</guibutton> se você tem certeza e deseja apagar "
 "todas as partições, cada sistema operacional e todos os dados no disco "
 "rígido."
+
+#~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Se houver problemas durante a instalação, então pode ser necessário usar "
+#~ "opções de instalação especiais, consulte <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opções de Instalação"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Isto abrirá o seguinte ajuda em modo texto."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Tela de Ajuda da Instalação"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opções do Kernel"
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index 71374491..dc0fd0a2 100644
--- a/docs/installer/ro.po
+++ b/docs/installer/ro.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-01-07 10:05+0000\n"
 "Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -1590,12 +1590,12 @@ msgstr ""
 "guibutton> pentru a continua."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instalatorul Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1606,7 +1606,7 @@ msgstr ""
 "se poate de ușor."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1615,26 +1615,37 @@ msgstr ""
 "care va lansa instalatorul, care în mod normal este tot ceea ce vă trebuie."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Ecranul de bun venit al instalării"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1642,21 +1653,211 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Dacă aveți probleme în timpul instalării, atunci va fi nevoie să utilizați "
-"instrucțiunile de instalare speciale, vedeți <xref linkend="
-"\"installationOptions\"></xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Dacă instalarea eșuează, atunci poate fi necesar să încercați din nou "
+"utilizînd una din opțiunile suplimentare disponibile apăsînd <guibutton>F1 "
+"(Ajutor)</guibutton>, vedeți <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Etapele instalării"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1665,7 +1866,7 @@ msgstr ""
 "fi urmărite în acest panou lateral al ecranului."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1675,7 +1876,7 @@ msgstr ""
 "mai puțin necesare."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1684,7 +1885,7 @@ msgstr ""
 "multe explicații pentru etapa actuală."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1704,55 +1905,18 @@ msgstr ""
 "<guibutton>Alt Ctrl F2</guibutton> în același timp, apoi apăsați "
 "<guibutton>Alt Ctrl Delete</guibutton> simultan pentru a reporni."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opțiuni de instalare"
-
-#. 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>"
-msgstr ""
-"Dacă instalarea eșuează, atunci poate fi necesar să încercați din nou "
-"utilizînd una din opțiunile suplimentare disponibile apăsînd <guibutton>F1 "
-"(Ajutor)</guibutton>, vedeți <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Aceasta va deschide ajutorul următor în mod text."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Ecranul de ajutor al instalării"
-
-#. 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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Probleme de instalare și soluții posibile"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Fără interfață grafică"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1763,13 +1927,14 @@ msgstr ""
 "utilizați o rezoluție mai mică tastînd <code>vgalo</code> la prompter."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Dacă mașina este foarte veche, instalarea grafică poate să nu fie posibilă. "
 "În acest caz merită încercată o instalare în mod text. Pentru aceasta "
@@ -1779,12 +1944,12 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Instalarea îngheață"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1800,12 +1965,12 @@ msgstr ""
 "opțiuni."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opțiuni nucleu"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3164,3 +3329,42 @@ msgid ""
 msgstr ""
 "Apăsați pe <guibutton>Înainte</guibutton> dacă sigur doriți să ștergeți "
 "toate partițiile, toate sistemele de operare și toate datele de pe acel disc."
+
+#~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Dacă aveți probleme în timpul instalării, atunci va fi nevoie să "
+#~ "utilizați instrucțiunile de instalare speciale, vedeți <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opțiuni de instalare"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Aceasta va deschide ajutorul următor în mod text."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Ecranul de ajutor al instalării"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opțiuni nucleu"
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 213823b3..9f4ab06b 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 15:01+0700\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-02-18 12:55+0300\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian <saikov.vb@gmail.com>\n"
@@ -1621,12 +1621,12 @@ msgstr ""
 "чтобы продолжить работу с программой."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, программа для установки Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1637,7 +1637,7 @@ msgstr ""
 "системы прошло как можно проще для вас."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1647,26 +1647,37 @@ msgstr ""
 "именно тот пункт, который вам нужен."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Приветственное окно программы установки"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1674,21 +1685,200 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Если при установке у вас возникнут проблемы, вам придется воспользоваться "
-"особыми параметрами установке см. <xref linkend=\"installationOptions\"></"
-"xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Если программе установки не удается выполнить свое назначение должным "
+"образом, вы можете повторить попытку, воспользовавшись дополнительными "
+"вариантами, описание которых можно получить после нажатия клавиши "
+"<guibutton>F1 (Справка)</guibutton> см. <xref linkend=\"dx-welcome\"></xref>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Шаги установки"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1697,7 +1887,7 @@ msgstr ""
 "показан на боковой панели экрана."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1708,7 +1898,7 @@ msgstr ""
 "пользуются не так часто, как основными."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1718,7 +1908,7 @@ msgstr ""
 "относительно текущего шага."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1739,58 +1929,18 @@ msgstr ""
 "одновременно. После этого нажмите комбинацию клавиш <guibutton>Alt Ctrl "
 "Delete</guibutton> одновременно, чтобы перезагрузить компьютер."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-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>"
-msgstr ""
-"Если программе установки не удается выполнить свое назначение должным "
-"образом, вы можете повторить попытку, воспользовавшись дополнительными "
-"вариантами, описание которых можно получить после нажатия клавиши "
-"<guibutton>F1 (Справка)</guibutton> см. <xref linkend=\"dx-welcome\"></xref>."
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-"В ответ на нажатие этой клавиши будет открыто текстовое окно справочных "
-"данных."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблемы с установкой и возможные пути их решения"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Нет графического интерфейса"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1802,13 +1952,14 @@ msgstr ""
 "впишите <code>vgalo</code> в строку запроса."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Если компьютер очень старый, установка в графическом режиме может быть "
 "просто невозможна. В таком случае стоит воспользоваться установкой в "
@@ -1818,12 +1969,12 @@ msgstr ""
 "Enter. Установка будет продолжена в текстовом режиме.<emphasis></emphasis>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Остановка установки"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1839,12 +1990,12 @@ msgstr ""
 "При необходимости эту команду можно совместить с вышеуказанными командами."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Параметры ядра"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3238,6 +3389,47 @@ msgstr ""
 "хранящиеся на этом диске."
 
 #~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Если при установке у вас возникнут проблемы, вам придется воспользоваться "
+#~ "особыми параметрами установке см. <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Параметры установки"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr ""
+#~ "В ответ на нажатие этой клавиши будет открыто текстовое окно справочных "
+#~ "данных."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Справочное окно инсталлятора"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Параметры ядра"
+
+#~ msgid ""
 #~ "This section allows you to fine tune your sound card. In most cases the "
 #~ "options selected will work with your computer."
 #~ msgstr ""
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index d6075cea..69ee3590 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\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/"
@@ -1300,12 +1300,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1313,33 +1313,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1347,39 +1358,228 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "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
+#: en/installer.xml:191
 msgid ""
 "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>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1391,52 +1591,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-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>"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1444,22 +1610,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1469,12 +1635,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Možnosti jedra"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -2574,3 +2740,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."
 msgstr ""
+
+#~ 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>"
+
+#~ msgid "Installation options"
+#~ msgstr "Možnosti namestitve"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Možnosti jedra"
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index 66eb4985..9b146bb6 100644
--- a/docs/installer/sq.po
+++ b/docs/installer/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-01-20 14:34+0000\n"
 "Last-Translator: ard1t <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -1260,12 +1260,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1273,68 +1273,272 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Nëse instalimi dështon atëherë ajo mund të jetë e nevojshme  të provoni "
+"përsëri duke përdorur një nga opsionet shtesë në dispozicion duke shtypur "
+"<guibutton>F1  (Ndihmë) </ guibutton> çeles të shihni <xref linkend=\"dx-"
+"welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </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/installer.xml:185
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "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
+#: en/installer.xml:191
 msgid ""
 "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>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1346,53 +1550,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opsione Instalimi"
-
-#. 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>"
-msgstr ""
-"Nëse instalimi dështon atëherë ajo mund të jetë e nevojshme  të provoni "
-"përsëri duke përdorur një nga opsionet shtesë në dispozicion duke shtypur "
-"<guibutton>F1  (Ndihmë) </ guibutton> çeles të shihni <xref linkend=\"dx-"
-"welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-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 ""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1400,22 +1569,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1430,12 +1599,12 @@ msgstr ""
 "opsione të tjera të nevojshme."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opsionet Kernel"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -2495,3 +2664,9 @@ msgid ""
 "Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
 "partition, every operating system and all data on that hard disk."
 msgstr ""
+
+#~ msgid "Installation options"
+#~ msgstr "Opsione Instalimi"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opsionet Kernel"
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index a02a091e..ecbdcb5a 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-01-11 12:34+0000\n"
 "Last-Translator: Kristoffer Grundströ <kristoffer.grundstrom1983@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
@@ -1498,12 +1498,12 @@ msgstr ""
 "fortsätta."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "Mageia-installeraren DrakX"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1511,50 +1511,246 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Välkomstskärm till installationen"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Installationsstegen"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1563,14 +1759,14 @@ msgstr ""
 "sidopanelen på skärmen."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "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>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1579,7 +1775,7 @@ msgstr ""
 "information om det nuvarande steget."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1591,52 +1787,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Installationsalternativ"
-
-#. 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>"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Detta kommer att öppna följande text-baserad hjälp."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Hjälpskärm för installation"
-
-#. 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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problem vid installation och möjliga lösningar"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Inget grafiskt gränssnitt"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1644,22 +1806,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Installationen hänger sig"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1669,12 +1831,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Alternativ för kärna"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -2900,3 +3062,33 @@ msgid ""
 "Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
 "partition, every operating system and all data on that hard disk."
 msgstr ""
+
+#~ 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>"
+
+#~ msgid "Installation options"
+#~ msgstr "Installationsalternativ"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Detta kommer att öppna följande text-baserad hjälp."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Hjälpskärm för installation"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Alternativ för kärna"
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index c70f9d60..84968169 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
 "PO-Revision-Date: 2014-03-01 03:24+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
 "Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -1579,12 +1579,12 @@ msgstr ""
 "guibutton> düğmesini tıklayın."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Kurulum Aracı"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1595,7 +1595,7 @@ msgstr ""
 "yapmanıza yardımcı olmak için tasarlanmıştır."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1604,26 +1604,37 @@ msgstr ""
 "tüm ihtiyacınızı karşılayacak, kurulum aracını başlatacaktır."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Kurulum Karşılama Ekranı"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
 "\"1\"/>"
@@ -1631,20 +1642,199 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/installer.xml:47
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
 msgstr ""
-"Kurulum sırasında sorun yaşarsanız, özel kurulum seçeneklerini kullanmanız "
-"gerekebilir. Bkz: <xref linkend=\"installationOptions\"></xref>."
 
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Kurulum başarısız olursa, <guibutton>F1 (Yardım- Help)</guibutton> düğmesine "
+"basarak erişebileceğiniz ek seçenekleri kullanarak yeniden denemeniz "
+"gerekebilir. Bkz: <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.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/installer.xml:185
 msgid "The installation steps"
 msgstr "Kurulum adımları"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1653,7 +1843,7 @@ msgstr ""
 "bölünmüştür."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1662,7 +1852,7 @@ msgstr ""
 "düğmesini içerebilen bir veya bir kaç ekrana sahiptir."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1671,7 +1861,7 @@ msgstr ""
 "guibutton> düğmesine sahiptir."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1692,55 +1882,18 @@ msgstr ""
 "sonra yeniden başlatmak için <guibutton>Alt Ctrl Delete</guibutton> "
 "tuşlarına aynı anda basın."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Kurulum seçenekleri"
-
-#. 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>"
-msgstr ""
-"Kurulum başarısız olursa, <guibutton>F1 (Yardım- Help)</guibutton> düğmesine "
-"basarak erişebileceğiniz ek seçenekleri kullanarak yeniden denemeniz "
-"gerekebilir. Bkz: <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Böylece yardım temelli aşağıdaki metin açılacaktır."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Kurulum Yardım Ekranı"
-
-#. 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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Kurulum Sorunları ve Muhtemel Çözümleri"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Grafiksel Arabirim Yok"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1751,13 +1904,14 @@ msgstr ""
 "<code>vgalo</code> yazarak düşük çözünürlük kullanmayı deneyin."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Donanım çok eskiyse, grafiksel bir kurulum mümkün olmayabilir. Bu durumda "
 "metin tabanlı kurulumu denemelisiniz. Bunu kullanmak için, ilk karşılama "
@@ -1767,12 +1921,12 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Kurulum Donuyor"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1787,12 +1941,12 @@ msgstr ""
 "seçeneklerle birlikte kullanılabilir."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Çekirdek Seçenekleri"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3142,6 +3296,45 @@ msgstr ""
 "veriyi silmeyi istiyorsanız <guibutton>İleri</guibutton>' yi tıklayın."
 
 #~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Kurulum sırasında sorun yaşarsanız, özel kurulum seçeneklerini "
+#~ "kullanmanız gerekebilir. Bkz: <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Kurulum seçenekleri"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Böylece yardım temelli aşağıdaki metin açılacaktır."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Kurulum Yardım Ekranı"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Çekirdek Seçenekleri"
+
+#~ msgid ""
 #~ "This section allows you to fine tune your sound card. In most cases the "
 #~ "options selected will work with your computer."
 #~ msgstr ""
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index e669eddb..9bb9b52a 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
-"PO-Revision-Date: 2014-02-17 08:48+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
+"PO-Revision-Date: 2014-05-02 11:35+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -1625,12 +1625,12 @@ msgstr ""
 "щоб продовжити роботу з програмою."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, програма для встановлення Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1641,7 +1641,7 @@ msgstr ""
 "оновлення системи якомога простішим для вас."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1651,48 +1651,270 @@ msgstr ""
 "саме той пункт, який вам потрібен."
 
 #. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
 msgid "Installation Welcome Screen"
 msgstr "Вітальне вікно програми для встановлення"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr "Нижче наведено типове вікно вітання DVD Mageia:"
+
 #. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#. type: Content of: <section><para>
+#: en/installer.xml:47
+msgid ""
+"From this first screen, it is possible to set some personal preferences:"
+msgstr "За допомогою першої сторінки можна вказати деякі особисті уподобання:"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+"Мову (лише на час встановлення, у системі може бути вибрано зовсім іншу "
+"мову) можна вибрати після натискання клавіші F2."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+"Скористайтеся клавішами зі стрілками, щоб вибрати потрібний вам пункт у "
+"списку, і натисніть клавішу Enter."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+"Нижче наведено приклад вікна вітання, перекладеного французькою, у "
+"портативній версії системи на DVD або компакти диску. Зауважте, що у меню "
+"портативної системи немає таких пунктів: <guilabel>Порятунок системи</"
+"guilabel>, <guilabel>Тест пам’яті</guilabel> та <guilabel>Інструмент пошуку "
+"обладнання</guilabel>."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+"Змінити роздільну здатність екрана можна за допомогою натискання клавіші F3."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr "Деякі параметри роботи ядра можна вказати після натискання клавіші F6."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Якщо програмі для встановлення не вдається виконати своє призначення "
+"належним чином, ви можете повторити спробу, скориставшись додатковими "
+"варіантами. У меню, яке можна викликати натисканням клавіші F6, буде "
+"показано новий пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметри "
+"завантаження</guilabel>) з такими чотирма підпунктами:"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr "- Default (типовий), не змінювати нічого у типових параметрах."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+"- Safe Settings (безпечні параметри), перевага безпечності параметрів над "
+"швидкодією."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+"- No ACPI (без розширеного інтерфейсу налаштовування та керування "
+"живленням), не брати до уваги параметри керування живленням."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+"- No Local APIC (без локального розширеного контролера переривань з "
+"можливістю програмування), цей варіант пов’язано з перериваннями роботи "
+"центрального процесора, виберіть його, якщо маєте відповідні настанови."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+"Вибір одного з пунктів призводить до внесення змін до типових параметрів, "
+"показаних у рядку <guilabel>Параметри завантаження</guilabel>."
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+"У деяких випусках Mageia параметри, вибрані за допомогою F6, не буде "
+"показано у рядку <guilabel>Параметри завантаження</guilabel>. Втім, ці "
+"параметри буде враховано під час завантаження системи."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+"Додаткові параметри роботи ядра можна вказати після натискання клавіші F1"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+"Натискання клавіші F1 відкриває нове вікно зі списком пунктів. Виберіть один "
+"з пунктів за допомогою клавіш зі стрілками і натисніть клавішу Enter, щоб "
+"отримати докладнішу довідку, або натисніть клавішу Esc, щоб повернутися до "
+"вікна вітання."
 
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
 msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+"Нижче наведено знімок вікна з докладним описом параметрів вікна вітання "
+"системи. Натисніть клавішу Esc або виберіть пункт <guilabel>Return to Boot "
+"Options</guilabel> (Повернутися до параметрів завантаження), щоб повернутися "
+"до списку параметрів. Описані у вікні параметри можна додати вручну до рядка "
+"<guilabel>Параметри завантаження</guilabel>."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+"Переглянути переклад довідки вибраною мовою можна за допомогою натискання "
+"клавіші F2."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:47
+#: en/installer.xml:166
 msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+"Нижче наведено типове вікно вітання образу для встановлення з мережі (назви "
+"— Boot.iso або Boot-Nonfree.iso):"
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+"Мову тут змінити не можна. Список доступних параметрів наведено на екрані. "
+"Докладніший опис використання образу для встановлення з мережі наведено у "
+"<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">вікі Mageia</"
+"link>."
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr "Розкладка клавіатури відповідає американській англійській."
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 msgstr ""
-"Якщо під час встановлення у вас виникнуть проблеми, вам доведеться "
-"скористатися особливими параметрами встановлення, див. <xref linkend="
-"\"installationOptions\"></xref>."
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/installer.xml:52
+#: en/installer.xml:185
 msgid "The installation steps"
 msgstr "Кроки встановлення"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -1701,7 +1923,7 @@ msgstr ""
 "показано на бічній панелі екрана."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -1712,7 +1934,7 @@ msgstr ""
 "часто як основними."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -1722,7 +1944,7 @@ msgstr ""
 "поточного кроку."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1743,58 +1965,18 @@ msgstr ""
 "Після цього, натисніть комбінацію клавіш <guibutton>Alt Ctrl Delete</"
 "guibutton> одночасно, щоб перезавантажити комп’ютер."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-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>"
-msgstr ""
-"Якщо програмі для встановлення не вдається виконати своє призначення "
-"належним чином, ви можете повторити спробу, скориставшись додатковими "
-"варіантами, опис яких можна отримати після натискання клавіші <guibutton>F1 "
-"(Довідка)</guibutton> див. <xref linkend=\"dx-welcome\"></xref>."
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-"У відповідь на натискання цієї клавіші буде відкрито таке текстове вікно "
-"довідкових даних."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-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>"
-
 #. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблеми зі встановленням та можливі шляхи їх вирішення"
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
 msgid "No Graphical Interface"
 msgstr "Немає графічного інтерфейсу"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1806,28 +1988,28 @@ msgstr ""
 "впишіть <code>vgalo</code> у рядок запиту."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
 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>"
+"ENTER. Now continue with the installation in text mode."
 msgstr ""
 "Якщо комп’ютер є дуже застарілим, встановлення у графічному режимі може бути "
 "просто неможливим. У такому випадку варто скористатися встановленням у "
 "текстовому режимі. Щоб скористатися цим режимом, натисніть клавішу Esc, коли "
 "буде показано перший вітальний екран, і підтвердіть виконання дії "
 "натисканням клавіші Enter. Введіть <code>text</code> і натисніть клавішу "
-"Enter. Встановлення буде продовжено у текстовому режимі.<emphasis></emphasis>"
+"Enter. Встановлення буде продовжено у текстовому режимі."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
 msgid "The Install Freezes"
 msgstr "Встановлення зупиняється"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1843,12 +2025,12 @@ msgstr ""
 "потреби, цю команду можна поєднати з вищевказаними командами."
 
 #. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Параметри ядра"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr "Проблеми з оперативною пам’яттю"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
 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 "
@@ -3238,6 +3420,47 @@ msgstr ""
 "цьому диску."
 
 #~ 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>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Якщо під час встановлення у вас виникнуть проблеми, вам доведеться "
+#~ "скористатися особливими параметрами встановлення, див. <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Параметри встановлення"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr ""
+#~ "У відповідь на натискання цієї клавіші буде відкрито таке текстове вікно "
+#~ "довідкових даних."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Довідкове вікно системи встановлення"
+
+#~ 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>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Параметри ядра"
+
+#~ msgid ""
 #~ "This section allows you to fine tune your sound card. In most cases the "
 #~ "options selected will work with your computer."
 #~ msgstr ""
diff --git a/docs/installer/uk/installer.xml b/docs/installer/uk/installer.xml
index 17a398f0..89d62de0 100644
--- a/docs/installer/uk/installer.xml
+++ b/docs/installer/uk/installer.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="uk" xml:id="installer">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installer" version="5.0" xml:lang="uk">
   
 
   
@@ -39,16 +38,134 @@ If you have peripherals like printers or scanners, it is [best] to
 це саме той пункт, який вам потрібен.</para>
 
   <figure xml:id="dx-welcome">
-<info>
+    <info>
       <title xml:id="installer-ti2">Вітальне вікно програми для встановлення</title>
-    </info> <mediaobject>
-<imageobject> <imagedata revision="1" fileref="../dx-welcome.png"
-align="center" format="PNG" xml:id="BId-drakx-intro-im1"> </imagedata>
-</imageobject></mediaobject></figure>
+    </info>
+
+    <para>Нижче наведено типове вікно вітання DVD Mageia:</para>
+
+<mediaobject>
+<imageobject> <imagedata xml:id="BId-drakx-intro-im1" revision="1"
+align="center" format="PNG" fileref="../dx-welcome.png"/> </imageobject></mediaobject></figure>
+
+  <para>За допомогою першої сторінки можна вказати деякі особисті уподобання:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>Мову (лише на час встановлення, у системі може бути вибрано зовсім іншу
+мову) можна вибрати після натискання клавіші F2.</para>
+
+      <para/>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+
+      <para>Скористайтеся клавішами зі стрілками, щоб вибрати потрібний вам пункт у
+списку, і натисніть клавішу Enter.</para>
+
+      <para>Нижче наведено приклад вікна вітання, перекладеного французькою, у
+портативній версії системи на DVD або компакти диску. Зауважте, що у меню
+портативної системи немає таких пунктів: <guilabel>Порятунок
+системи</guilabel>, <guilabel>Тест пам’яті</guilabel> та
+<guilabel>Інструмент пошуку обладнання</guilabel>.</para>
+
+      <para/>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
+
+      <para/>
+    </listitem>
+
+    <listitem>
+      <para>Змінити роздільну здатність екрана можна за допомогою натискання клавіші F3.</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>Деякі параметри роботи ядра можна вказати після натискання клавіші F6.</para>
+
+      <para>Якщо програмі для встановлення не вдається виконати своє призначення
+належним чином, ви можете повторити спробу, скориставшись додатковими
+варіантами. У меню, яке можна викликати натисканням клавіші F6, буде
+показано новий пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметри
+завантаження</guilabel>) з такими чотирма підпунктами:</para>
+
+      <para>- Default (типовий), не змінювати нічого у типових параметрах.</para>
+
+      <para>- Safe Settings (безпечні параметри), перевага безпечності параметрів над
+швидкодією.</para>
+
+      <para>- No ACPI (без розширеного інтерфейсу налаштовування та керування
+живленням), не брати до уваги параметри керування живленням.</para>
+
+      <para>- No Local APIC (без локального розширеного контролера переривань з
+можливістю програмування), цей варіант пов’язано з перериваннями роботи
+центрального процесора, виберіть його, якщо маєте відповідні настанови.</para>
 
-  <para>Якщо під час встановлення у вас виникнуть проблеми, вам доведеться
-скористатися особливими параметрами встановлення, див. <xref
-linkend="installationOptions"></xref>.</para>
+      <para>Вибір одного з пунктів призводить до внесення змін до типових параметрів,
+показаних у рядку <guilabel>Параметри завантаження</guilabel>.</para>
+
+      <note>
+        <para>У деяких випусках Mageia параметри, вибрані за допомогою F6, не буде
+показано у рядку <guilabel>Параметри завантаження</guilabel>. Втім, ці
+параметри буде враховано під час завантаження системи.</para>
+      </note>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>Додаткові параметри роботи ядра можна вказати після натискання клавіші F1</para>
+
+      <para>Натискання клавіші F1 відкриває нове вікно зі списком пунктів. Виберіть один
+з пунктів за допомогою клавіш зі стрілками і натисніть клавішу Enter, щоб
+отримати докладнішу довідку, або натисніть клавішу Esc, щоб повернутися до
+вікна вітання.</para>
+
+      <para/>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+
+      <para/>
+
+      <para>Нижче наведено знімок вікна з докладним описом параметрів вікна вітання
+системи. Натисніть клавішу Esc або виберіть пункт <guilabel>Return to Boot
+Options</guilabel> (Повернутися до параметрів завантаження), щоб повернутися
+до списку параметрів. Описані у вікні параметри можна додати вручну до рядка
+<guilabel>Параметри завантаження</guilabel>.</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+
+      <para/>
+
+      <note>
+        <para>Переглянути переклад довідки вибраною мовою можна за допомогою натискання
+клавіші F2.</para>
+      </note>
+    </listitem>
+  </itemizedlist>
+
+  <para>Нижче наведено типове вікно вітання образу для встановлення з мережі (назви
+— Boot.iso або Boot-Nonfree.iso):</para>
+
+  <para>Мову тут змінити не можна. Список доступних параметрів наведено на
+екрані. Докладніший опис використання образу для встановлення з мережі
+наведено у <link ns2:href="https://wiki.mageia.org/en/Boot.iso_install">вікі
+Mageia</link>.</para>
+
+  <warning>
+    <para>Розкладка клавіатури відповідає американській англійській.</para>
+  </warning>
+
+  <mediaobject>
+<imageobject> <imagedata revision="1" xml:id="installer-im2" align="center"
+format="PNG" fileref="../dx-help.png"/> </imageobject></mediaobject>
 
   <section xml:id="installationSteps">
     <info>
@@ -82,26 +199,6 @@ F2</guibutton> одночасно. Після цього, натисніть к�
   </section>
 
   <section xml:id="installationOptions">
-    <info>
-      <title xml:id="installationOptions-ti1">Параметри встановлення</title>
-    </info>
-
-    <para>Якщо програмі для встановлення не вдається виконати своє призначення
-належним чином, ви можете повторити спробу, скориставшись додатковими
-варіантами, опис яких можна отримати після натискання клавіші <guibutton>F1
-(Довідка)</guibutton> див. <xref linkend="dx-welcome"></xref>.</para>
-
-    <para>У відповідь на натискання цієї клавіші буде відкрито таке текстове вікно
-довідкових даних.</para>
-
-    <figure xml:id="dx-help">
-<info>
-        <title xml:id="installationOptions-ti2">Довідкове вікно системи встановлення</title>
-      </info> <mediaobject>
-<imageobject> <imagedata revision="1" fileref="../dx-help.png"
-align="center" format="PNG" xml:id="installer-im2"></imagedata>
-</imageobject></mediaobject></figure>
-
     <section xml:id="installationProblems">
       <info>
         <title xml:id="installationProblems-ti1">Проблеми зі встановленням та можливі шляхи їх вирішення</title>
@@ -126,8 +223,7 @@ align="center" format="PNG" xml:id="installer-im2"></imagedata>
 текстовому режимі. Щоб скористатися цим режимом, натисніть клавішу Esc, коли
 буде показано перший вітальний екран, і підтвердіть виконання дії
 натисканням клавіші Enter. Введіть <code>text</code> і натисніть клавішу
-Enter. Встановлення буде продовжено у текстовому
-режимі.<emphasis></emphasis></para>
+Enter. Встановлення буде продовжено у текстовому режимі.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -147,7 +243,7 @@ Enter. Встановлення буде продовжено у текстов�
 
       <section xml:id="kernelOptions">
         <info>
-          <title xml:id="kernelOptions-ti1">Параметри ядра</title>
+          <title xml:id="kernelOptions-ti1">Проблеми з оперативною пам’яттю</title>
         </info>
 
         <para>Потреба у визначенні параметрів ядра виникає нечасто, але у певних випадках
diff --git a/docs/mcc-help/ca.po b/docs/mcc-help/ca.po
index 517399df..f79fcf54 100644
--- a/docs/mcc-help/ca.po
+++ b/docs/mcc-help/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2013-12-21 16:40+0100\n"
 "Last-Translator: Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>\n"
 "Language-Team: Catalan <>\n"
@@ -52,8 +52,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr ""
@@ -695,8 +695,8 @@ msgstr ""
 msgid "drakboot--boot.png"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -4120,9 +4120,9 @@ msgstr ""
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
@@ -4581,8 +4581,8 @@ msgid "drakwizard-web-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
@@ -4653,8 +4653,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
@@ -4665,8 +4665,8 @@ msgid "drakwizard-web-step6.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click <guibutton>Next</guibutton>."
@@ -4674,7 +4674,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -4685,7 +4685,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr ""
 
@@ -4712,41 +4712,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -4755,117 +4756,205 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 msgid "drakwizard-dhcp-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 msgid "drakwizard-dhcp-step2.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 msgid "drakwizard-dhcp-step3.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 msgid "drakwizard-dhcp-step4.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 msgid "drakwizard-dhcp-step5.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 msgid "drakwizard-dhcp-step6.png"
 msgstr ""
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -4873,54 +4962,104 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
 "because this server always points to available time servers."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+msgid "This tool executes the following steps:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -5036,43 +5175,44 @@ msgid "drakwizard-ftp-step6.png"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -5081,144 +5221,204 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 msgid "drakwizard-proxy-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 msgid "drakwizard-proxy-step2.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 msgid "drakwizard-proxy-step3.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 msgid "drakwizard-proxy-step4.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 msgid "Grant Network Access"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 msgid "drakwizard-proxy-step5.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 msgid "drakwizard-proxy-step6.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 msgid "drakwizard-proxy-step7.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 msgid "drakwizard-proxy-step8.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 msgid "drakwizard-proxy-step9.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 msgid "drakwizard-proxy-step10.png"
 msgstr ""
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -7246,23 +7446,48 @@ msgid ""
 "\"drakrpm-edit-media\"/> ."
 msgstr ""
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "diskdrake--smb4.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -7272,7 +7497,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -7281,14 +7506,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -7296,12 +7521,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -7309,12 +7534,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -7322,36 +7547,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -7360,12 +7585,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -7377,78 +7602,78 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 #, fuzzy
 msgid "rpmdrake4.png"
 msgstr "diskdrake--smb4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -7456,7 +7681,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -7464,17 +7689,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/de.po b/docs/mcc-help/de.po
index 3d585b4a..9389c7ee 100644
--- a/docs/mcc-help/de.po
+++ b/docs/mcc-help/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-01-02 14:14+0000\n"
 "Last-Translator: jonas2790\n"
 "Language-Team: German (http://www.transifex.com/projects/p/mageia/language/"
@@ -61,8 +61,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Einleitung"
@@ -737,8 +737,8 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -4228,9 +4228,9 @@ msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
@@ -4704,8 +4704,8 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
@@ -4779,8 +4779,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
@@ -4792,8 +4792,8 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click <guibutton>Next</guibutton>."
@@ -4801,7 +4801,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -4813,7 +4813,7 @@ msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 #, fuzzy
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "<guibutton>Verändern</guibutton>"
@@ -4843,22 +4843,22 @@ msgstr ""
 "role=\"bold\">drakwizard bind</emphasis> als root eingeben"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr "DHCP konfigurieren"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr "drakwizard dhcp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
@@ -4867,22 +4867,23 @@ msgstr ""
 "role=\"bold\">drakwizard dhcp</emphasis> als root eingeben"
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 "Dieses Tool  <placeholder type=\"footnote\" id=\"0\"/> kann nur über die "
 "Kommandozeile gestartet werden."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -4891,116 +4892,204 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 #, fuzzy
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 #, fuzzy
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 #, fuzzy
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 #, fuzzy
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 #, fuzzy
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 #, fuzzy
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard_dhcp.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr "Zeit konfigurieren"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr "drakwizard ntp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
@@ -5009,7 +5098,7 @@ msgstr ""
 "role=\"bold\">drakwizard ntp</emphasis> als root eingeben"
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -5017,55 +5106,105 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
 "because this server always points to available time servers."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr "<author> <personname/> </author> <pubdate/>"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 "Klicken sie auf <guibutton>Beenden</guibutton> um das Programm zu schließen"
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+msgid "This tool executes the following steps:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -5192,22 +5331,22 @@ msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr "Proxy konfigurieren"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr "drakwizard squid"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
@@ -5216,24 +5355,25 @@ msgstr ""
 "role=\"bold\">drakwizard squid</emphasis> als root eingeben"
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 "Dieses Tool  <placeholder type=\"footnote\" id=\"0\"/> kann nur über die "
 "Kommandozeile gestartet werden."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -5242,155 +5382,215 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 #, fuzzy
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 #, fuzzy
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 #, fuzzy
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 #, fuzzy
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 #, fuzzy
 msgid "Grant Network Access"
 msgstr "Netzwerkdienste"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 #, fuzzy
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 #, fuzzy
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 #, fuzzy
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 #, fuzzy
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 #, fuzzy
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 #, fuzzy
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakwizard-ntp1.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -7482,23 +7682,48 @@ msgid ""
 "\"drakrpm-edit-media\"/> ."
 msgstr ""
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Paket Typ Filter:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -7508,7 +7733,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -7517,14 +7742,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -7532,12 +7757,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -7545,12 +7770,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -7558,36 +7783,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -7596,12 +7821,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "Die Status Spalte"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -7613,77 +7838,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Symbol"
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr "Legende"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "../rpmdrake2.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr "Dies Paket ist bereits installiert"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "../rpmdrake3.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr "Dies Paket wird installiert"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "../rpmdrake4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr "Dies Paket kann nicht modifiziert werden"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "../rpmdrake5.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr "Diese Paket ist eine Aktualisierung."
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "../rpmdrake6.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr "Dieses Paket wird deinstalliert"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -7691,7 +7916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -7699,17 +7924,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr "Die Abhängigkeiten"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/el.po b/docs/mcc-help/el.po
index 4cf9873f..72b70fe8 100644
--- a/docs/mcc-help/el.po
+++ b/docs/mcc-help/el.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
 "POT-Creation-Date: 2014-03-06 22:29+0200\n"
-"PO-Revision-Date: 2014-05-03 17:15+0300\n"
+"PO-Revision-Date: 2014-05-03 17:13+0300\n"
 "Last-Translator: Dimitris Tsiamasiotis <dtsiamasiotis@gmail.com>\n"
 "Language-Team: Greek <i18n-el@ml.mageia.org>\n"
 "Language: el\n"
diff --git a/docs/mcc-help/en/drakboot--boot.xml b/docs/mcc-help/en/drakboot--boot.xml
index 0f358fea..0d61c77e 100644
--- a/docs/mcc-help/en/drakboot--boot.xml
+++ b/docs/mcc-help/en/drakboot--boot.xml
@@ -117,5 +117,4 @@
   <guilabel>initrd</guilabel> file and a <xref linkend="draknetprofile"></xref> in the drop-down
   lists.</para>
 
-  <para>You can start this tool from the command line, by typing <emphasis role="bold">drakboot --boot</emphasis> as root.</para>
 </section>
\ No newline at end of file
diff --git a/docs/mcc-help/en/drakwizard_dhcp.xml b/docs/mcc-help/en/drakwizard_dhcp.xml
index acda9b41..eab06e30 100644
--- a/docs/mcc-help/en/drakwizard_dhcp.xml
+++ b/docs/mcc-help/en/drakwizard_dhcp.xml
@@ -1,94 +1,205 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="drakwizard_dhcp" version="5.0">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="drakwizard_dhcp"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="drakwizard_dhcp-ti1">Configure DHCP</title><subtitle>drakwizard dhcp</subtitle>
+    <title xml:id="drakwizard_dhcp-ti1">Configure DHCP</title>
+
+    <subtitle>drakwizard dhcp</subtitle>
   </info>
 
   <mediaobject>
     <imageobject>
-      <imagedata   xml:id="drakwizard_dhcp-im1" revision="1" align="center" format="PNG" fileref="drakwizard_dhcp.png"/>
+      <imagedata align="center" fileref="drakwizard_dhcp.png" format="PNG"
+                 revision="1" xml:id="drakwizard_dhcp-im1"/>
     </imageobject>
   </mediaobject>
 
-  <para>This tool<footnote><para>You can start this tool from the command line, by typing <emphasis role="bold">drakwizard dhcp</emphasis> as root.</para></footnote>  can help you to set up a <acronym>DHCP</acronym> server.
-  </para>
+  <para>This tool<footnote>
+      <para>You can start this tool from the command line, by typing <emphasis
+      role="bold">drakwizard dhcp</emphasis> as root.</para>
+    </footnote> can help you to set up a <acronym>DHCP</acronym> server. It is
+  a component of drakwizard which should be installed before you can access to
+  it.</para>
+
   <section>
     <title>What is DHCP?</title>
-    <para>
-      The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a standardized networking protocol used on IP networks that dynamically configures IP addresses and other information that is needed for Internet communication. (From Wikipedia)
-    </para>
+
+    <para>The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is
+    a standardized networking protocol used on IP networks that dynamically
+    configures IP addresses and other information that is needed for Internet
+    communication. (From Wikipedia)</para>
+  </section>
+
+  <section>
+    <title>Setting up a DHCP server with drakwizard dhcp</title>
+
+    <para>Welcome to the DHCP server wizard.</para>
+
+    <procedure>
+      <step>
+        <title>Introduction</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step1.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im2"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>The first page is just an introduction, click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Selecting Adaptor</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step2.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im3"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Choose the network interface, which is connected to the subnet,
+        and for which DHCP will assign IP addresses, and then click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Select IP range</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step3.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im4"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Select the beginning and ending IP addresses of the range of IPs
+        you want the server to offer, along with the IP of the gateway machine
+        connecting to some place outside the local network, hopefully close to
+        the Internet, then click <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Summary</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step4.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im5"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Take a second to check these options, then click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Hold on...</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step5.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im6"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>This can be fixed. Click <guibutton>Previous</guibutton> a few
+        times and change things around.</para>
+      </step>
+
+      <step>
+        <title>Hours later...</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step6.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im7"/>
+          </imageobject>
+        </mediaobject>
+      </step>
+    </procedure>
+  </section>
+
+  <section>
+    <title>What is done</title>
+
+    <para><itemizedlist>
+        <listitem>
+          <para>Installing the package dhcp-server if needed;</para>
+        </listitem>
+
+        <listitem>
+          <para>Saving <code>/etc/dhcpd.conf</code> in
+          <code>/etc/dhcpd.conf.orig;</code></para>
+        </listitem>
+
+        <listitem>
+          <para>Creating a new <code>dhcpd.conf</code> starting from
+          <code>/usr/share/wizards/dhcp_wizard/scripts/dhcpd.conf.default</code>
+          and adding the new parameters:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><code>hname</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>dns</code></para>
+            </listitem>
+
+            <listitem>
+              <para>net</para>
+            </listitem>
+
+            <listitem>
+              <para>ip</para>
+            </listitem>
+
+            <listitem>
+              <para><code>mask</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>rng1</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>rng2</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>dname</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>gateway</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>tftpserverip</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>dhcpd_interface</code></para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Also modifying Webmin configuration file
+          <code>/etc/webmin/dhcpd/config</code></para>
+        </listitem>
+
+        <listitem>
+          <para>Restarting <code>dhcpd.</code></para>
+        </listitem>
+      </itemizedlist></para>
   </section>
-    <section>
-      <title>Setting up DHCP server with drakwizard dhcp</title>
-      <para>
-	Welcome to the DHCP server wizard.
-      </para>
-      <procedure>
-	<step>
-	  <title>Introduction</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im2" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step1.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    The first page is just an introduction, click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Selecting Adaptor</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im3" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step2.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Choose network interface connected to the subnet DHCP will assign IPs for, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Select IP range</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im4" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step3.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Select the beginning and ending IP addresses of the range of IPs you want the server to offer, along with the IP of the gateway machine connecting to someplace outside the local net, hopeful close to the Internet, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Summary</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im5" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step4.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Take a second to check these options, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Hold on...</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im6" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step5.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    This can be fixed. Click <guibutton>Previous</guibutton> a few times and change things around. Don't keep track.
-	  </para>
-	</step>
-	<step>
-	  <title>Hours later...</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im7" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step6.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Another lesson learned.
-	  </para>
-	</step>
-      </procedure>
-    </section>
 </section>
diff --git a/docs/mcc-help/en/drakwizard_ntp.xml b/docs/mcc-help/en/drakwizard_ntp.xml
index b149088f..656e2851 100644
--- a/docs/mcc-help/en/drakwizard_ntp.xml
+++ b/docs/mcc-help/en/drakwizard_ntp.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="drakwizard_ntp" version="5.0">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="drakwizard_ntp"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="drakwizard_ntp-ti1">Configure time</title>
 
@@ -9,56 +16,109 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="drakwizard_ntp.png" xml:id="drakwizard_ntp-im1" align="center" format="PNG"/>
+      <imagedata align="center" fileref="drakwizard_ntp.png" format="PNG"
+                 revision="1" xml:id="drakwizard_ntp-im1"/>
     </imageobject>
   </mediaobject>
 
   <para>This tool<footnote>
-      <para>You can start this tool from the command line, by typing <emphasis role="bold">drakwizard ntp</emphasis> as root.</para>
+      <para>You can start this tool from the command line, by typing <emphasis
+      role="bold">drakwizard ntp</emphasis> as root.</para>
     </footnote> purpose is to set the time of your server synchronised with an
   external server. It isn't installed by default and you have to also install
   the drakwizard and drakwizard-base packages.</para>
 
-  <para>After a welcome screen (see above), the second one ask you to choose
-  three time servers in the drop down lists and suggests to use pool.ntp.org
-  twice because this server always points to available time servers.</para>
+  <section>
+    <title>Setup a NTP server with drakwizard ntp</title>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="drakwizard-ntp1.png"/>
-    </imageobject>
-  </mediaobject>
+    <procedure>
+      <step>
+        <para>After a welcome screen (see above), the second one ask you to
+        choose three time servers in the drop down lists and suggests to use
+        pool.ntp.org twice because this server always points to available time
+        servers.</para>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="drakwizard-ntp2.png">
-        <info>
-          <author>
-            <personname/>
-          </author>
-
-          <pubdate/>
-        </info>
-      </imagedata>
-    </imageobject>
-  </mediaobject>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="drakwizard-ntp1.png"/>
+          </imageobject>
+        </mediaobject>
 
-  <para/>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="drakwizard-ntp2.png">
+              <info>
+                <author>
+                  <personname/>
+                </author>
 
-  <para>The following screens allows to choose the region and the city and
-  then, you arrive on a summary. If something is wrong, you can obviously
-  change it using the <guibutton>Previous </guibutton>button. If everything is
-  right, click on the <guibutton>Next</guibutton> button to proceed to the
-  test. It may take a while and you finally get this screen below:</para>
+                <pubdate/>
+              </info>
+            </imagedata>
+          </imageobject>
+        </mediaobject>
+      </step>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="drakwizard-ntp3.png"/>
-    </imageobject>
-  </mediaobject>
+      <step>
+        <para>The following screens allows to choose the region and the city
+        and then, you arrive on a summary. If something is wrong, you can
+        obviously change it using the <guibutton>Previous</guibutton>button.
+        If everything is right, click on the <guibutton>Next</guibutton>
+        button to proceed to the test. It may take a while and you finally get
+        this screen below:</para>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="drakwizard-ntp3.png"/>
+          </imageobject>
+        </mediaobject>
+      </step>
+
+      <step>
+        <para>Click on the <guibutton>Finish</guibutton> button to close the
+        tool</para>
+      </step>
+    </procedure>
+
+    <para/>
+  </section>
+
+  <section>
+    <title>What is done</title>
+
+    <para>This tool executes the following steps:</para>
+
+    <para><itemizedlist>
+        <listitem>
+          <para>Installing the package <code>ntp</code> if needed</para>
+        </listitem>
+
+        <listitem>
+          <para>Saving the files <code>/etc/sysconfig/clock</code> to
+          <code>/etc/sysconfig/clock.orig</code> and
+          <code>/etc/ntp/step-tickers</code> to
+          <code>/etc/ntp/step-tickers.orig</code>;</para>
+        </listitem>
+
+        <listitem>
+          <para>Writing a new file <code>/etc/ntp/step-tickers</code> with the
+          list of servers;</para>
+        </listitem>
+
+        <listitem>
+          <para>Modifying the file <code>/etc/ntp.conf</code> by inserting the
+          first server name;</para>
+        </listitem>
 
-  <para/>
+        <listitem>
+          <para>Stopping and starting <code>crond</code>, <code>atd</code> and
+          <code>ntpd</code> services;</para>
+        </listitem>
 
-  <para>Click on the <guibutton>Finish</guibutton> button to close the
-  tool</para>
-</section>
\ No newline at end of file
+        <listitem>
+          <para>Setting the hardware clock to the current system time with UTC
+          reference.</para>
+        </listitem>
+      </itemizedlist></para>
+  </section>
+</section>
diff --git a/docs/mcc-help/en/drakwizard_squid.xml b/docs/mcc-help/en/drakwizard_squid.xml
index 1ee759d6..31ddb524 100644
--- a/docs/mcc-help/en/drakwizard_squid.xml
+++ b/docs/mcc-help/en/drakwizard_squid.xml
@@ -1,138 +1,243 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="drakwizard_squid" version="5.0">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:id="drakwizard_squid"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="drakwizard_squid-ti1">Configure proxy</title><subtitle>drakwizard squid</subtitle>
+    <title xml:id="drakwizard_squid-ti1">Configure proxy</title>
+
+    <subtitle>drakwizard squid</subtitle>
   </info>
 
   <mediaobject>
     <imageobject>
-      <imagedata   xml:id="drakwizard_squid-im1" revision="1" align="center" format="PNG" fileref="drakwizard_squid.png"/>
+      <imagedata align="center" fileref="drakwizard_squid.png" format="PNG"
+                 revision="1" xml:id="drakwizard_squid-im1"/>
     </imageobject>
   </mediaobject>
 
- <para>This tool<footnote><para>You can start this tool from the command line, by typing <emphasis role="bold">drakwizard squid</emphasis> as root.</para></footnote>  can help you to set up a proxy server.
-  </para>
+  <para>This tool<footnote>
+      <para>You can start this tool from the command line, by typing <emphasis
+      role="bold">drakwizard squid</emphasis> as root.</para>
+    </footnote> can help you to set up a proxy server. It is a component of
+  drakwizard which should be installed before you can access to it.</para>
+
   <section>
     <title>What is a proxy server?</title>
-    <para>
-      A proxy server is a server (a computer system or an application) that acts as an intermediary for requests from clients seeking resources from other servers. A client connects to the proxy server, requesting some service, such as a file, connection, web page, or other resource available from a different server and the proxy server evaluates the request as a way to simplify and control its complexity. (From Wikipedia)
-    </para>
+
+    <para>A proxy server is a server (a computer system or an application)
+    that acts as an intermediary for requests from clients seeking resources
+    from other servers. A client connects to the proxy server, requesting some
+    service, such as a file, connection, web page, or other resource available
+    from a different server and the proxy server evaluates the request as a
+    way to simplify and control its complexity. (From Wikipedia)</para>
+  </section>
+
+  <section>
+    <title>Setting up a proxy server with drakwizard squid</title>
+
+    <para>Welcome to the proxy server wizard.</para>
+
+    <procedure>
+      <step>
+        <title>Introduction</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step1.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im2"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>The first page is just an introduction, click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Selecting the proxy port</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step2.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im3"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Select the proxy port browsers will connect through, then click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Set Memory and Disk Usage</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step3.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im4"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Set memory and disk cache limits, then click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Select Network Access Control</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step4.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im5"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Set visibility to local network or world, then click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Grant Network Access</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step5.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im6"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Grant access to local networks, then click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Use Upper Level Proxy Server?</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step6.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im7"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Cascade through another proxy server? If no, skip next
+        step.</para>
+      </step>
+
+      <step>
+        <title>Upper Level Proxy URL and Port</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step7.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im8"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Provide upper level proxy hostname and port, then click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Summary</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step8.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im9"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Take a second to check these options, then click
+        <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Start during boot?</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step9.png"
+                       format="PNG" revision="1"
+                       xml:id="drakwizard_squid-im10"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Choose if the proxy server should be started during the boot
+        time, then click <guibutton>Next</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Finish</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step10.png"
+                       format="PNG" revision="1"
+                       xml:id="drakwizard_squid-im11"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>You're done! Click <guibutton>Finish</guibutton>.</para>
+      </step>
+    </procedure>
+  </section>
+
+  <section>
+    <title>What is done</title>
+
+    <para><itemizedlist>
+        <listitem>
+          <para>Installing the package squid if needed;</para>
+        </listitem>
+
+        <listitem>
+          <para>Saving <code>/etc/squid/squid.conf</code> in
+          <code>/etc/squid/squid.conf.orig;</code></para>
+        </listitem>
+
+        <listitem>
+          <para>Creating a new <code>squid.conf</code> starting from
+          <code>squid.conf.default</code> and adding the new
+          parameters:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><code>cache_dir</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>localnet</code></para>
+            </listitem>
+
+            <listitem>
+              <para>cache_mem</para>
+            </listitem>
+
+            <listitem>
+              <para>http_port</para>
+            </listitem>
+
+            <listitem>
+              <para><code>level</code> 1, 2 or 3 and <code>http_access</code>
+              according to level</para>
+            </listitem>
+
+            <listitem>
+              <para><code>cache_peer</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>visible_hostname</code></para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Restarting <code>squid.</code></para>
+        </listitem>
+      </itemizedlist></para>
   </section>
-    <section>
-      <title>Setting up a proxy server with drakwizard squid</title>
-      <para>
-	Welcome to the proxy server wizard.
-      </para>
-      <procedure>
-	<step>
-	  <title>Introduction</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im2" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step1.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    The first page is just an introduction, click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Selecting the proxy port</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im3" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step2.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Select the proxy port browsers will connect through, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Set Memory and Disk Usage</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im4" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step3.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Set memory and disk cache limits, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Select Network Access Control</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im5" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step4.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Set visibility to local network or world, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Grant Network Access</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im6" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step5.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Grant access to local networks, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Use Upper Level Proxy Server?</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im7" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step6.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Cascade through another proxy server? If no, skip next step.
-	  </para>
-	</step>
-	<step>
-	  <title>Upper Level Proxy URL and Port</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im8" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step7.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Provide upper level proxy hostname and port, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Summary</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im9" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step8.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Take a second to check these options, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Start during boot?</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im10" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step9.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Choose if the proxy server should be started during the boot time, then click <guibutton>Next</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Finish</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im11" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step10.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    You're done! Click <guibutton>Finish</guibutton>.
-	  </para>
-	</step>
-      </procedure>
-    </section>
 </section>
diff --git a/docs/mcc-help/en/rpmdrake.xml b/docs/mcc-help/en/rpmdrake.xml
index 2e26e95f..eb047afb 100644
--- a/docs/mcc-help/en/rpmdrake.xml
+++ b/docs/mcc-help/en/rpmdrake.xml
@@ -33,6 +33,22 @@
     included in the packages.</para>
 
     <para>To work, rpmdrake needs the repositories to be configured with <xref linkend="drakrpm-edit-media"/> .</para>
+
+    <important>
+      <para>During the installation, the configured repository is the medium
+      used for the installation, generally the DVD or CD. If you keep this
+      medium, rpmdrake will ask it each time you want to install a package,
+      with this pop-up window : <mediaobject>
+          <imageobject>
+            <imagedata fileref="rpmdrake8.png"/>
+          </imageobject>
+        </mediaobject>If the above message annoys you and you have a good
+      internet connection without too strict download limit, it is wise to
+      remove that medium and replace it by online repositories thanks to <xref linkend="drakrpm-edit-media"/> .</para>
+
+      <para>Moreover, the online repositories are always up to date, contains
+      much more packages, and allow to update your installed packages.</para>
+    </important>
   </section>
 
   <section>
diff --git a/docs/mcc-help/es.po b/docs/mcc-help/es.po
index 113d58c7..39273255 100644
--- a/docs/mcc-help/es.po
+++ b/docs/mcc-help/es.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-02-17 06:51+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -62,8 +62,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Introducción"
@@ -799,8 +799,8 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -4323,9 +4323,9 @@ msgstr ""
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
@@ -4788,8 +4788,8 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakgw-net.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
@@ -4863,8 +4863,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
@@ -4876,8 +4876,8 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakgw-net.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click <guibutton>Next</guibutton>."
@@ -4885,7 +4885,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -4897,7 +4897,7 @@ msgstr "drakgw-net.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 #, fuzzy
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "<guibutton>Editar:</guibutton>"
@@ -4925,44 +4925,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 "Esta herramienta <placeholder type=\"footnote\" id=\"0\">solo se puede "
 "iniciar desde la línea de comandos."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -4971,117 +4972,205 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 msgid "drakwizard-dhcp-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 msgid "drakwizard-dhcp-step2.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 msgid "drakwizard-dhcp-step3.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 msgid "drakwizard-dhcp-step4.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 msgid "drakwizard-dhcp-step5.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 msgid "drakwizard-dhcp-step6.png"
 msgstr ""
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -5089,54 +5178,105 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
 "because this server always points to available time servers."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+#, fuzzy
+msgid "This tool executes the following steps:"
+msgstr "Este comando recolecta la siguiente información de su sistema:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -5257,46 +5397,47 @@ msgid "drakwizard-ftp-step6.png"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 "Esta herramienta <placeholder type=\"footnote\" id=\"0\">solo se puede "
 "iniciar desde la línea de comandos."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -5305,155 +5446,215 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 #, fuzzy
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 #, fuzzy
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 #, fuzzy
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 #, fuzzy
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 #, fuzzy
 msgid "Grant Network Access"
 msgstr "Servicios de red"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 #, fuzzy
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 #, fuzzy
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 #, fuzzy
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 #, fuzzy
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 #, fuzzy
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakproxy.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 #, fuzzy
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakproxy.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -7508,23 +7709,48 @@ msgid ""
 "\"drakrpm-edit-media\"/> ."
 msgstr ""
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake7.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -7534,7 +7760,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -7543,14 +7769,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -7558,12 +7784,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -7571,12 +7797,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -7584,36 +7810,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -7622,12 +7848,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -7639,77 +7865,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -7717,7 +7943,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -7728,17 +7954,17 @@ msgstr ""
 "al hacer clic en <guibutton> Aplicar </guibutton> ."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/et.po b/docs/mcc-help/et.po
index ea151c80..ebd05824 100644
--- a/docs/mcc-help/et.po
+++ b/docs/mcc-help/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-01-31 15:22+0200\n"
 "Last-Translator: Marek Laane <bald@smail.ee>\n"
 "Language-Team: Estonian <i18n-discuss@ml.mageia.org>\n"
@@ -58,8 +58,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Sissejuhatus"
@@ -849,8 +849,8 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -5004,9 +5004,9 @@ msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
@@ -5561,8 +5561,8 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 #, fuzzy
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
@@ -5639,8 +5639,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
@@ -5652,8 +5652,8 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 #, fuzzy
 msgid ""
@@ -5662,7 +5662,7 @@ msgstr "Valige soovitud viis ja klõpsake nupule <guibutton>Edasi</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -5674,7 +5674,7 @@ msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 #, fuzzy
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "<guibutton>Muuda:</guibutton>"
@@ -5704,22 +5704,22 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard bind</emphasis>."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr "DHCP seadistamine"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr "drakwizard dhcp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
@@ -5728,22 +5728,23 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard dhcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 "Seda tööriista<placeholder type=\"footnote\" id=\"0\"/> saab käivitada ja "
 "kasutada ainult käsureal."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -5752,116 +5753,205 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 #, fuzzy
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 #, fuzzy
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 #, fuzzy
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 #, fuzzy
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 #, fuzzy
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 #, fuzzy
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard_dhcp.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+#, fuzzy
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr "Salvestab kehtiva seadistuse faili <code>/etc/samba/smb.conf</code>."
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr "Aja seadistamine"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr "drakwizard ntp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
@@ -5870,7 +5960,7 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard ntp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -5882,8 +5972,13 @@ msgstr ""
 "ning selle kasutamiseks tuleb paigaldada ka tarkvarapaketid drakwizard ja "
 "drakwizard-base."
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
@@ -5893,32 +5988,33 @@ msgstr ""
 "ajaserverit ning soovitab kahel juhul määrata serveri pool.ntp.org, sest see "
 "server viitab alati kättesaadavatele ajaserveritele."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr "<author> <personname/> </author> <pubdate/>"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
+#, fuzzy
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
@@ -5928,16 +6024,62 @@ msgstr ""
 "testimiseks nupule <guibutton>Edasi</guibutton>. See võib võtta veidi aega, "
 "aga lõpuks ilmub allolev aken:"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr "Nupule <guibutton>Lõpeta</guibutton> klõpsates saab tööriista sulgeda."
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+#, fuzzy
+msgid "This tool executes the following steps:"
+msgstr "Käsk kogub süsteemi kohta järgmist teavet:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -6064,22 +6206,22 @@ msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr "Puhverserveri seadistamine"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr "drakwizard squid"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
@@ -6088,25 +6230,26 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard squid</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 "Seda tööriista<placeholder type=\"footnote\" id=\"0\"/> saab käivitada ja "
 "kasutada ainult käsureal."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 #, fuzzy
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -6122,34 +6265,34 @@ msgstr ""
 "server vastab proksile ning proksi edastab vastuse kliendile.\""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 #, fuzzy
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 #, fuzzy
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 #, fuzzy
 msgid ""
 "Select the proxy port browsers will connect through, then click "
@@ -6159,87 +6302,87 @@ msgstr ""
 "guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 #, fuzzy
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 #, fuzzy
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr "Valige soovitud viis ja klõpsake nupule <guibutton>Edasi</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 #, fuzzy
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 #, fuzzy
 msgid "Grant Network Access"
 msgstr "Võrguteenused"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 #, fuzzy
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 #, fuzzy
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 #, fuzzy
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 #, fuzzy
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
@@ -6247,24 +6390,24 @@ msgid ""
 msgstr "Valige soovitud viis ja klõpsake nupule <guibutton>Edasi</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 #, fuzzy
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 #, fuzzy
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 #, fuzzy
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
@@ -6272,11 +6415,71 @@ msgid ""
 msgstr "Valige soovitud viis ja klõpsake nupule <guibutton>Edasi</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 #, fuzzy
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakwizard-ntp1.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -8712,23 +8915,48 @@ msgstr ""
 "Töötamiseks vajab rpmdrake tarkvarahoidlaid, mis on seadistatud tööriistaga, "
 "mida kirjeldab <xref linkend=\"drakrpm-edit-media\"/>."
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "Akna põhiosad"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Paketitüübi filter:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -8743,7 +8971,7 @@ msgstr ""
 "uuendused või Mageia uuematest versioonidest tagasi porditud tarkvarapaketid."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -8757,7 +8985,7 @@ msgstr ""
 "osas, niisiis Teil võiks olla mõttekas määrata filtriks \"Kõik\"."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
@@ -8766,7 +8994,7 @@ msgstr ""
 "firstterm>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -8776,12 +9004,12 @@ msgstr ""
 "tarkvarapakette või kõiki, nii paigaldatud kui ka paigaldamata pakette."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr "<emphasis role=\"bold\">Otsingurežiim:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -8792,12 +9020,12 @@ msgstr ""
 "nimedes."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr "<emphasis role=\"bold\">Otsingukast:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -8808,24 +9036,24 @@ msgstr ""
 "otsida korraga pakette mplayer ja xine, tuleb kirjutada \"mplayer | xine\"."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr "<emphasis role=\"bold\">Kustutamine:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
 msgstr "Selle ikooniga saab korraga puhastada kogu otsingukasti."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr "<emphasis role=\"bold\">Kategooriate loend:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
@@ -8834,12 +9062,12 @@ msgstr ""
 "kategooriatesse ja alamkategooriatesse."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr "<emphasis role=\"bold\">Kirjelduspaneel:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -8852,12 +9080,12 @@ msgstr ""
 "pandud viimaste muudatuste loend."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "Olekuveerg"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -8876,77 +9104,77 @@ msgstr ""
 "märge eemaldada ning klõpsata nupule <guibutton>Rakenda</guibutton>."
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Ikoon"
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr "Tähendus"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "../rpmdrake2.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr "See pakett on juba paigaldatud"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "../rpmdrake3.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr "See pakett on valitud paigaldamiseks"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "../rpmdrake4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr "Selle paketi olekut ei saa muuta"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "../rpmdrake5.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr "See pakett on uuendus"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "../rpmdrake6.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr "See pakett on valitud eemaldamiseks"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr "Näide ülalolevalt pildilt:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -8957,7 +9185,7 @@ msgstr ""
 "eemaldatakse, kui klõpsate nupule <guibutton>Rakenda</guibutton>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -8968,17 +9196,17 @@ msgstr ""
 "klõpsate nupule <guibutton>Rakenda</guibutton>."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr "Sõltuvused"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/fr.po b/docs/mcc-help/fr.po
index 20f2480d..3c55cc9d 100644
--- a/docs/mcc-help/fr.po
+++ b/docs/mcc-help/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-03-11 17:58+0000\n"
 "Last-Translator: Dune <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
@@ -66,8 +66,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Introduction"
@@ -873,8 +873,8 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -5133,9 +5133,9 @@ msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
@@ -5701,8 +5701,8 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-web-step1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
@@ -5780,8 +5780,8 @@ msgstr ""
 "fichiers du serveur web : pages web, documents."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr "Récapitulatif"
@@ -5792,8 +5792,8 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-web-step6.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click <guibutton>Next</guibutton>."
@@ -5803,7 +5803,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr "Terminer"
 
@@ -5814,7 +5814,7 @@ msgstr "drakwizard-web-step7.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "C'est fait ! Cliquer sur <guibutton>Terminer</guibutton>."
 
@@ -5843,22 +5843,22 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard bind</emphasis> sous root."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr "Configurer DHCP"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr "drakwizard dhcp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
@@ -5867,21 +5867,23 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard dhcp</emphasis> sous root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 "Cet outil<placeholder type=\"footnote\" id=\"0\"/> vous aide à paramétrer un "
 "serveur <acronym>DHCP</acronym>."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr "Qu'est-ce que DHCP ?"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -5894,56 +5896,60 @@ msgstr ""
 "une adresse IP et un masque de sous-réseau (source Wikipedia)."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+#, fuzzy
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr "Paramétrer un serveur DHCP avec l'assistant DHCP."
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr "Bienvenue dans l'assistant du serveur DHCP."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-dhcp-step1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr "Sélection de l'interface Réseau"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-dhcp-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
+#, fuzzy
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 "Sélectionner l'interface connectée au sous-réseau DHCP auquel seront "
 "affectées les adresses IP, puis cliquer sur <guibutton>Suivant</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr "Sélection de la plage d'adresses IP"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-dhcp-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
+#, fuzzy
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 "Sélectionner les adresses IP de début et de fin de la plage d'adresses que "
 "le serveur DHCP doit proposer, ainsi que l'adresse IP de la passerelle se "
@@ -5951,61 +5957,152 @@ msgstr ""
 "<guibutton>Suivant</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard-dhcp-step4.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr "Une erreur possible..."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard-dhcp-step5.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
+#, fuzzy
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 "Ceci peut être corrigé. Cliquer sur <guibutton>Précédent</guibutton> "
 "plusieurs fois et modifier l'anomalie."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr "Quelques instants plus tard..."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard-dhcp-step6.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
-msgstr "Une nouvelle leçon apprise."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+#, fuzzy
+msgid "What is done"
+msgstr "Qu'est-ce que DHCP ?"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+#, fuzzy
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+"Enregistrer la configuration actuelle dans <code>/etc/samba/smb.conf</code>."
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
+msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr "Configurer l'heure"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr "drakwizard ntp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
@@ -6014,7 +6111,7 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard ntp</emphasis> sous root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -6026,8 +6123,14 @@ msgstr ""
 "installé par défaut et vous devez aussi installer les paquetages drakwizard "
 "et drakwizard-base."
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+#, fuzzy
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr "Paramétrer un serveur FTP avec l'assistant proftpd"
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
@@ -6038,32 +6141,33 @@ msgstr ""
 "d'utiliser deux fois pool.ntp.org car ce serveur redirige toujours vers des "
 "serveurs de temps disponibles."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr "<author> <personname/> </author> <pubdate/>"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
+#, fuzzy
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
@@ -6074,17 +6178,63 @@ msgstr ""
 "guibutton> pour procéder au test. Cela peut prendre du temps, et vous "
 "obtenez finalement cet écran ci-dessous."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 "Cliquer sur le bouton <guibutton>Terminer</guibutton> pour fermer l'outil."
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+#, fuzzy
+msgid "This tool executes the following steps:"
+msgstr "La commande recueille les informations suivantes sur votre système :"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -6213,22 +6363,22 @@ msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ftp-step6.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr "Configurer le serveur mandataire (proxy)"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr "drakwizard squid"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
@@ -6237,23 +6387,26 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard squid</emphasis> sous root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 "Cet outil <placeholder type=\"footnote\" id=\"0\"/> vous aide à paramétrer "
 "un serveur mandataire."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr "Qu'est-ce qu'un serveur mandataire ?"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
+#, fuzzy
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -6269,32 +6422,32 @@ msgstr ""
 "complexité (source Wikipédia)."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr "Paramétrer un serveur proxy avec l'assistant Squid."
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr "Bienvenue dans l'assistant du serveur proxy."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-proxy-step1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr "Sélection du port proxy"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-proxy-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
@@ -6303,17 +6456,17 @@ msgstr ""
 "puis cliquer sur <guibutton>Suivant</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr "Utilisation de la mémoire vive et l'espace disque"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-proxy-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
@@ -6321,17 +6474,17 @@ msgstr ""
 "sur <guibutton>Suivant</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr "Sélection du contrôle d'accès au Réseau"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard-proxy-step4.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
@@ -6340,51 +6493,51 @@ msgstr ""
 "cliquer sur <guibutton>Suivant</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 msgid "Grant Network Access"
 msgstr "Autoriser l'accès au Réseau"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakwizard-proxy-step5.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 "Autoriser l'accès au réseau local,  puis cliquer sur <guibutton>Suivant</"
 "guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr "Utiliser un serveur proxy de niveau supérieur ?"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakwizard-proxy-step6.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 "Utiliser un autre serveur proxy de niveau supérieur ? Dans le cas contraire, "
 "passer à l'étape suivante."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr "Nom d'hôte et port du proxy de niveau supérieur"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakwizard-proxy-step7.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
 "guibutton>."
@@ -6393,22 +6546,22 @@ msgstr ""
 "sur <guibutton>Suivant</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakwizard-proxy-step8.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr "Lancement du proxy au démarrage ?"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakwizard-proxy-step9.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
@@ -6417,10 +6570,70 @@ msgstr ""
 "<guibutton>Suivant</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakwizard-proxy-step10.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -8902,23 +9115,48 @@ msgstr ""
 "Pour fonctionner, rpmdrake a besoin que les dépôts soient configurés avec "
 "<xref linkend=\"drakrpm-edit-media\"/>."
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "Les principales zones de l'écran"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Filtre par type de paquetage :</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -8934,7 +9172,7 @@ msgstr ""
 "rétroportés depuis des versions plus récentes de Mageia."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -8948,7 +9186,7 @@ msgstr ""
 "aussi, il est préférable de positionner ce filtre sur \"Tout\"."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
@@ -8957,7 +9195,7 @@ msgstr ""
 "emphasis> </firstterm>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -8967,12 +9205,12 @@ msgstr ""
 "non installés ou tous les paquetages (installés et non installés)."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr "<emphasis role=\"bold\">Mode recherche :</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -8983,12 +9221,12 @@ msgstr ""
 "les paquetages."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr "<emphasis role=\"bold\">Champ \"Trouver\" :</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -8999,12 +9237,12 @@ msgstr ""
 "\"xine\" en même temps, taper 'mplayer | xine'."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr "<emphasis role=\"bold\">Effacer tout :</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
@@ -9013,12 +9251,12 @@ msgstr ""
 "\"Trouver\"."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr "<emphasis role=\"bold\">Liste de catégories :</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
@@ -9027,12 +9265,12 @@ msgstr ""
 "catégories clairement définies."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr "<emphasis role=\"bold\">Le Panneau de description :</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -9045,12 +9283,12 @@ msgstr ""
 "la liste des dernières modifications réalisées par le mainteneur."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "La colonne statut"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -9069,77 +9307,77 @@ msgstr ""
 "paquetage et cliquer sur <guibutton>Appliquer</guibutton>."
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Icône"
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr "Légende"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "../rpmdrake2.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr "Ce paquetage est déjà installé"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "../rpmdrake3.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr "Ce paquetage sera installé"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "../rpmdrake4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr "Ce paquetage ne peut être modifié"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "../rpmdrake5.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr "Ce paquetage est une mise à jour"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "../rpmdrake6.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr "Ce paquetage sera désinstallé"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr "Exemples dans la copie d'écran ci-dessus :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -9150,7 +9388,7 @@ msgstr ""
 "désinstallé en cliquant sur <guibutton>Appliquer</guibutton>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -9161,17 +9399,17 @@ msgstr ""
 "cliquant sur <guibutton>Appliquer</guibutton>."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr "Les dépendances"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
@@ -11170,3 +11408,6 @@ msgstr ""
 "demande la confirmation de l'abandon des nouveaux paramètres ou de leur "
 "acceptation. Dans ce dernier cas, vous êtes invité à vous déconnecter et "
 "vous reconnecter afin d'activer la nouvelle configuration."
+
+#~ msgid "Another lesson learned."
+#~ msgstr "Une nouvelle leçon apprise."
diff --git a/docs/mcc-help/id.po b/docs/mcc-help/id.po
index ac4f6fd9..1254d78d 100644
--- a/docs/mcc-help/id.po
+++ b/docs/mcc-help/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2013-12-11 14:51+0000\n"
 "Last-Translator: kiki.syahadat <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -58,8 +58,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Pengantar"
@@ -851,8 +851,8 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -5017,9 +5017,9 @@ msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
@@ -5570,8 +5570,8 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 #, fuzzy
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
@@ -5649,8 +5649,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
@@ -5662,8 +5662,8 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 #, fuzzy
 msgid ""
@@ -5673,7 +5673,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -5685,7 +5685,7 @@ msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 #, fuzzy
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "<guibutton>Edit:</guibutton>"
@@ -5715,22 +5715,22 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard bind</emphasis> sebagai root."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr "Konfigurasi DHCP"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr "drakwizard dhcp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
@@ -5739,22 +5739,23 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard dhcp</emphasis> sebagai root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 "Alat ini<placeholder type=\"footnote\" id=\"0\"/> hanya bisa dijalankan dan "
 "digunakan di baris perintah."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -5763,116 +5764,205 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 #, fuzzy
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 #, fuzzy
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 #, fuzzy
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 #, fuzzy
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 #, fuzzy
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 #, fuzzy
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard_dhcp.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+#, fuzzy
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr "Simpan konfigurasi saat ini di <code>/etc/samba/smb.conf</code>."
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr "Konfigurasi waktu"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr "drakwizard ntp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
@@ -5881,7 +5971,7 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard ntp</emphasis> sebagai root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -5893,8 +5983,13 @@ msgstr ""
 "secara baku dan Anda harus juga menginstall paket drakwizard dan drakwizard-"
 "base."
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
@@ -5905,32 +6000,33 @@ msgstr ""
 "menggunakan pool.ntp.org dua kali karena server ini selalu mengarahkan ke "
 "server waktu yang tersedia."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr "<author> <personname/> </author> <pubdate/>"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
+#, fuzzy
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
@@ -5940,16 +6036,62 @@ msgstr ""
 "tombol <guibutton>Selanjutnya</guibutton> untuk melanjutkan ke pengujian. "
 "Ini mungkin memakan waktu dan akhirnya Anda mendapatkan layar di bawah:"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr "Klik tombol <guibutton>Selesai</guibutton> untuk menutup alat"
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+#, fuzzy
+msgid "This tool executes the following steps:"
+msgstr "Perintah ini mengumpulkan informasi berikut pada sistem:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -6076,22 +6218,22 @@ msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr "Konfigurasi proxy"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr "drakwizard squid"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
@@ -6100,25 +6242,26 @@ msgstr ""
 "<emphasis role=\"bold\">drakwizard squid</emphasis> sebagai root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 "Alat ini<placeholder type=\"footnote\" id=\"0\"/> hanya bisa dijalankan dan "
 "digunakan di baris perintah."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 #, fuzzy
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -6134,34 +6277,34 @@ msgstr ""
 "menyederhanakan dan mengendalikan kerumitannya."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 #, fuzzy
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 #, fuzzy
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 #, fuzzy
 msgid ""
 "Select the proxy port browsers will connect through, then click "
@@ -6171,18 +6314,18 @@ msgstr ""
 "guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 #, fuzzy
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 #, fuzzy
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
@@ -6190,69 +6333,69 @@ msgstr ""
 "Pilih opsi yang disukai lalu tekan tombol <guibutton>Selanjutnya</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 #, fuzzy
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 #, fuzzy
 msgid "Grant Network Access"
 msgstr "Layanan Jaringan"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 #, fuzzy
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 #, fuzzy
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 #, fuzzy
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 #, fuzzy
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
@@ -6261,24 +6404,24 @@ msgstr ""
 "Pilih opsi yang disukai lalu tekan tombol <guibutton>Selanjutnya</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 #, fuzzy
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 #, fuzzy
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 #, fuzzy
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
@@ -6287,11 +6430,71 @@ msgstr ""
 "Pilih opsi yang disukai lalu tekan tombol <guibutton>Selanjutnya</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 #, fuzzy
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakwizard-ntp1.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -8592,23 +8795,48 @@ msgstr ""
 "Untuk bekerja, rpmdrake memerlukan repository yang terkonfigurasi dengan "
 "<xref linkend=\"drakrpm-edit-media\"/> ."
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "Bagian utama layar"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Filter tipe paket:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -8623,7 +8851,7 @@ msgstr ""
 "paket backport dari versi Mageia terbaru."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -8636,7 +8864,7 @@ msgstr ""
 "Mageia, jadi alangkah baiknya untuk mengatur filter ini ke \"Semua\"."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
@@ -8645,7 +8873,7 @@ msgstr ""
 "firstterm>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -8655,12 +8883,12 @@ msgstr ""
 "yang tidak terinstall atau semua paket, yang terinstall dan tidak terinstall."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr "<emphasis role=\"bold\">Mode pencarian:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -8670,12 +8898,12 @@ msgstr ""
 "deskripsi lengkap atau melalui file yang terkandung di dalam paket."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr "<emphasis role=\"bold\">Kotak \"Temukan\":</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -8687,12 +8915,12 @@ msgstr ""
 "'mplayer | xine'."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr "<emphasis role=\"bold\">Hapus semua:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
@@ -8701,12 +8929,12 @@ msgstr ""
 "di kotak \"Temukan\"."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr "<emphasis role=\"bold\">Daftar kategori:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
@@ -8715,12 +8943,12 @@ msgstr ""
 "subkategori yang jelas."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr "<emphasis role=\"bold\">Panel deskripsi:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -8733,12 +8961,12 @@ msgstr ""
 "terakhir yang dibuat oleh pengelolanya."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "Kolom status"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -8757,77 +8985,77 @@ msgstr ""
 "sebelum nama paket lalu klik <guibutton>Terapkan</guibutton>."
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Ikon"
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr "Tulisan"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "../rpmdrake2.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr "Paket ini sudah diinstall"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "../rpmdrake3.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr "Paket ini akan diinstall"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "../rpmdrake4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr "Paket ini tidak bisa dimodifikasi"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "../rpmdrake5.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr "Ini adalah paket update"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "../rpmdrake6.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr "Paket ini akan diuninstall"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr "Contoh pada gambar di atas:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -8838,7 +9066,7 @@ msgstr ""
 "akan diuninstall ketika mengklik <guibutton>Terapkan</guibutton>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -8849,17 +9077,17 @@ msgstr ""
 "ketika mengklik <guibutton>Terapkan</guibutton>."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr "Dependensi"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/it.po b/docs/mcc-help/it.po
index f683535a..80a687eb 100644
--- a/docs/mcc-help/it.po
+++ b/docs/mcc-help/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-02-09 11:09+0100\n"
 "Last-Translator: Matteo Pasotti <matteo@mageia.org>\n"
 "Language-Team: Italian <i18n-discuss@ml.mageia.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Introduzione"
@@ -762,8 +762,8 @@ msgstr ""
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -4182,9 +4182,9 @@ msgstr ""
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
@@ -4641,8 +4641,8 @@ msgid "drakwizard-web-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
@@ -4712,8 +4712,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
@@ -4724,8 +4724,8 @@ msgid "drakwizard-web-step6.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click <guibutton>Next</guibutton>."
@@ -4733,7 +4733,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -4744,7 +4744,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr ""
 
@@ -4771,41 +4771,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -4814,117 +4815,205 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 msgid "drakwizard-dhcp-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 msgid "drakwizard-dhcp-step2.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 msgid "drakwizard-dhcp-step3.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 msgid "drakwizard-dhcp-step4.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 msgid "drakwizard-dhcp-step5.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 msgid "drakwizard-dhcp-step6.png"
 msgstr ""
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -4932,54 +5021,104 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
 "because this server always points to available time servers."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+msgid "This tool executes the following steps:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -5094,43 +5233,44 @@ msgid "drakwizard-ftp-step6.png"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -5139,144 +5279,204 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 msgid "drakwizard-proxy-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 msgid "drakwizard-proxy-step2.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 msgid "drakwizard-proxy-step3.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 msgid "drakwizard-proxy-step4.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 msgid "Grant Network Access"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 msgid "drakwizard-proxy-step5.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 msgid "drakwizard-proxy-step6.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 msgid "drakwizard-proxy-step7.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 msgid "drakwizard-proxy-step8.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 msgid "drakwizard-proxy-step9.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 msgid "drakwizard-proxy-step10.png"
 msgstr ""
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -7310,23 +7510,48 @@ msgstr ""
 "Per funzionare, rpmdrake necessita della configurazione dei repositories con "
 "<xref linkend=\"drakrpm-edit-media\"/> ."
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "drak3d.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "La parte principale dello schermo"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Filtro per tipo pacchetto:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -7342,7 +7567,7 @@ msgstr ""
 "recenti di Mageia."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -7351,14 +7576,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -7366,12 +7591,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -7379,12 +7604,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -7392,36 +7617,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -7430,12 +7655,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -7447,77 +7672,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -7525,7 +7750,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -7533,17 +7758,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/mcc-help.pot b/docs/mcc-help/mcc-help.pot
index eeb71ef6..4c955222 100644
--- a/docs/mcc-help/mcc-help.pot
+++ b/docs/mcc-help/mcc-help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21 en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29 en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27 en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27 en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17 en/system-config-printer.xml:21
+#: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21 en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29 en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27 en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27 en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17 en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr ""
 
@@ -677,8 +677,8 @@ msgstr ""
 msgid "drakboot--boot.png"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis "
 "role=\"bold\">drakboot --boot</emphasis> as root."
@@ -4095,7 +4095,7 @@ msgid "draksambashare17.png"
 msgstr ""
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89 en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157 en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187 en/rpmdrake.xml:222
+#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89 en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173 en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203 en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
@@ -4554,7 +4554,7 @@ msgid "drakwizard-web-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34 en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54 en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
 
@@ -4623,7 +4623,7 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60 en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104 en/drakwizard_sshd.xml:105
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90 en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144 en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
 
@@ -4633,14 +4633,14 @@ msgid "drakwizard-web-step6.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67 en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111 en/drakwizard_sshd.xml:112
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99 en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153 en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82 en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82 en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -4650,7 +4650,7 @@ msgid "drakwizard-web-step7.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89 en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89 en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr ""
 
@@ -4677,41 +4677,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis "
 "role=\"bold\">drakwizard dhcp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -4720,117 +4721,203 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 msgid "drakwizard-dhcp-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 msgid "drakwizard-dhcp-step2.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click "
+"<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 msgid "drakwizard-dhcp-step3.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 msgid "drakwizard-dhcp-step4.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 msgid "drakwizard-dhcp-step5.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 msgid "drakwizard-dhcp-step6.png"
 msgstr ""
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87 en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid "Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from "
+"<code>/usr/share/wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and "
+"adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+msgid ""
+"Also modifying Webmin configuration file "
+"<code>/etc/webmin/dhcpd/config</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis "
 "role=\"bold\">drakwizard ntp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -4838,54 +4925,104 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
 "because this server always points to available time servers."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+msgid "This tool executes the following steps:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to "
+"<code>/etc/sysconfig/clock.orig</code> and "
+"<code>/etc/ntp/step-tickers</code> to "
+"<code>/etc/ntp/step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and "
+"<code>ntpd</code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid "Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -5000,43 +5137,44 @@ msgid "drakwizard-ftp-step6.png"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr ""
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis "
 "role=\"bold\">drakwizard squid</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -5045,143 +5183,202 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 msgid "drakwizard-proxy-step1.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 msgid "drakwizard-proxy-step2.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 msgid "drakwizard-proxy-step3.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 msgid "drakwizard-proxy-step4.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 msgid "Grant Network Access"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 msgid "drakwizard-proxy-step5.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 msgid "drakwizard-proxy-step6.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 msgid "drakwizard-proxy-step7.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 msgid "drakwizard-proxy-step8.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 msgid "drakwizard-proxy-step9.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 msgid "drakwizard-proxy-step10.png"
 msgstr ""
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in "
+"<code>/etc/squid/squid.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from "
+"<code>squid.conf.default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid "<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -7209,23 +7406,47 @@ msgid ""
 "linkend=\"drakrpm-edit-media\"/> ."
 msgstr ""
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+msgid "rpmdrake8.png"
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up window "
+": <placeholder type=\"mediaobject\" id=\"0\"/>If the above message annoys "
+"you and you have a good internet connection without too strict download "
+"limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -7235,7 +7456,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -7244,14 +7465,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> "
 "</firstterm>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -7259,12 +7480,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -7272,12 +7493,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -7285,36 +7506,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -7323,12 +7544,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -7340,77 +7561,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -7418,7 +7639,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -7426,17 +7647,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/nl.po b/docs/mcc-help/nl.po
index e3951c33..ee2d96e5 100644
--- a/docs/mcc-help/nl.po
+++ b/docs/mcc-help/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-02-28 21:17+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Introductie"
@@ -854,8 +854,8 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -4396,9 +4396,9 @@ msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
@@ -4878,8 +4878,8 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
@@ -4953,8 +4953,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
@@ -4966,8 +4966,8 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click <guibutton>Next</guibutton>."
@@ -4975,7 +4975,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -4987,7 +4987,7 @@ msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr ""
 
@@ -5016,22 +5016,22 @@ msgstr ""
 "\"bold\">drakwizard bind</emphasis> te typen."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
@@ -5040,23 +5040,24 @@ msgstr ""
 "\"bold\">drakwizard dhcp</emphasis> te typen."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 "Deze tool<placeholder type=\"footnote\" id=\"0\"/> stelt u in staat de wijze "
 "waarop u als gebruiker van de machine of het netwerk herkend wordt, aan te "
 "passen."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -5065,116 +5066,204 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 #, fuzzy
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 #, fuzzy
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 #, fuzzy
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 #, fuzzy
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 #, fuzzy
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 #, fuzzy
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard_dhcp.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
@@ -5183,7 +5272,7 @@ msgstr ""
 "\"bold\">drakwizard ntp</emphasis> te typen."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -5191,54 +5280,104 @@ msgid ""
 "packages."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
 "because this server always points to available time servers."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr ""
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+msgid "This tool executes the following steps:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -5366,22 +5505,22 @@ msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
@@ -5390,25 +5529,26 @@ msgstr ""
 "\"bold\">drakwizard squid</emphasis> te typen."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 "Deze tool<placeholder type=\"footnote\" id=\"0\"/> stelt u in staat de wijze "
 "waarop u als gebruiker van de machine of het netwerk herkend wordt, aan te "
 "passen."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -5417,155 +5557,215 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 #, fuzzy
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 #, fuzzy
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 #, fuzzy
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 #, fuzzy
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 #, fuzzy
 msgid "Grant Network Access"
 msgstr "Netwerkdiensten"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 #, fuzzy
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 #, fuzzy
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 #, fuzzy
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 #, fuzzy
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 #, fuzzy
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 #, fuzzy
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakwizard-ntp1.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -7716,23 +7916,48 @@ msgstr ""
 "Alvorens rpmdrake kan werken, moeten eerst de mediabronnen geconfigureerd "
 "worden met <xref linkend=\"drakrpm-edit-media\"/> ."
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "De hoofddelen van het scherm"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Pakketsoortfilter:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -7747,7 +7972,7 @@ msgstr ""
 "bijgewerkte paketten, of Backports (pakketten van een nieuwere Mageiaversie)."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -7760,7 +7985,7 @@ msgstr ""
 "kennis van Linux en Mageia, dus is het beter dit filter \"Alle\" te zetten."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
@@ -7769,7 +7994,7 @@ msgstr ""
 "firstterm>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -7780,12 +8005,12 @@ msgstr ""
 "geïnstalleerde."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr "<emphasis role=\"bold\">Zoekmodus:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -7796,12 +8021,12 @@ msgstr ""
 "geïnstalleerd."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr "<emphasis role=\"bold\">\"Zoeken\" box:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -7812,24 +8037,24 @@ msgstr ""
 "gelijktijdig naar \"mplayer\" en \"xine\" te zoeken."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr "<emphasis role=\"bold\">Alles wissen:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
 msgstr "Met het aanklikken van dit icoon wist u alles in het zoekveld"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr "<emphasis role=\"bold\">Groepenlijst:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
@@ -7838,12 +8063,12 @@ msgstr ""
 "categorieën en subcategorieën."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr "<emphasis role=\"bold\">Omschrijvingspaneel:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -7857,12 +8082,12 @@ msgstr ""
 "pakketbouwer."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "De statuskolom"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -7881,77 +8106,77 @@ msgstr ""
 "hokje voor de pakketnaam en op <guibutton>Toepassen</guibutton> te klikken."
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Icoon"
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "../rpmdrake2.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "../rpmdrake3.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "../rpmdrake4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "../rpmdrake5.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "../rpmdrake6.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr "Voorbeelden in de schermafbeelding hierboven:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -7963,7 +8188,7 @@ msgstr ""
 "<guibutton>Toepassen</guibutton> klikt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -7971,17 +8196,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/ro.po b/docs/mcc-help/ro.po
index fca8a3a9..d76ade28 100644
--- a/docs/mcc-help/ro.po
+++ b/docs/mcc-help/ro.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-03-04 17:33+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -61,8 +61,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Introducere"
@@ -859,8 +859,8 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -5035,9 +5035,9 @@ msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
@@ -5525,8 +5525,8 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
@@ -5601,8 +5601,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr ""
@@ -5614,8 +5614,8 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click <guibutton>Next</guibutton>."
@@ -5623,7 +5623,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr ""
 
@@ -5635,7 +5635,7 @@ msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 #, fuzzy
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "<guibutton>Editează:</guibutton>"
@@ -5665,22 +5665,22 @@ msgstr ""
 "\"bold\">drakwizard bind</emphasis> ca root."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr "Configurare DHCP"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr "drakwizard dhcp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
@@ -5689,22 +5689,23 @@ msgstr ""
 "\"bold\">drakwizard dhcp</emphasis> ca root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 "Această unealtă<placeholder type=\"footnote\" id=\"0\"/> poate fi lansată și "
 "utilizată numai în linie de comandă."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -5713,116 +5714,204 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 #, fuzzy
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 #, fuzzy
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 #, fuzzy
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 #, fuzzy
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 #, fuzzy
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 #, fuzzy
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard_dhcp.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr "Configurare dată și oră"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr "drakwizard ntp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
@@ -5831,7 +5920,7 @@ msgstr ""
 "\"bold\">drakwizard ntp</emphasis> ca root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -5843,56 +5932,107 @@ msgstr ""
 "mod implicit și trebuie de asemenea să instalați pachetele drakwizard și "
 "drakwizard-base."
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr ""
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
 "because this server always points to available time servers."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr "<author> <personname/> </author> <pubdate/>"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 "Faceți clic pe butonul <guibutton>Finalizează</guibutton> pentru a închide "
 "unealta."
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+#, fuzzy
+msgid "This tool executes the following steps:"
+msgstr "Această comandă colectează următoarele informații despre acest sistem:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -6019,22 +6159,22 @@ msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr "Configurare proxy"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr "drakwizard squid"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
@@ -6043,25 +6183,26 @@ msgstr ""
 "\"bold\">drakwizard squid</emphasis> ca root."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 #, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 "Această unealtă<placeholder type=\"footnote\" id=\"0\"/> poate fi lansată și "
 "utilizată numai în linie de comandă."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 #, fuzzy
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -6077,155 +6218,215 @@ msgstr ""
 "analizează cererea pentru a-i simplifica și controla complexitatea."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 #, fuzzy
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-ntp1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 #, fuzzy
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-ntp2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 #, fuzzy
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-ntp3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 #, fuzzy
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 #, fuzzy
 msgid "Grant Network Access"
 msgstr "Servicii de rețea"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 #, fuzzy
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 #, fuzzy
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 #, fuzzy
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 #, fuzzy
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 #, fuzzy
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 #, fuzzy
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakwizard-ntp1.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -8351,23 +8552,48 @@ msgid ""
 "\"drakrpm-edit-media\"/> ."
 msgstr ""
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "Părțile principale ale ecranului"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Filtru de tip de pachete:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -8377,7 +8603,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -8386,7 +8612,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
@@ -8395,7 +8621,7 @@ msgstr ""
 "firstterm>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -8403,12 +8629,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr "<emphasis role=\"bold\">Mod de căutare:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -8416,12 +8642,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr "<emphasis role=\"bold\">Cîmpul „Caută”:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -8429,36 +8655,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr "<emphasis role=\"bold\">Șterge tot:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr "<emphasis role=\"bold\">Listă categorii:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr "<emphasis role=\"bold\">Panou descriere:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -8467,12 +8693,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "Coloana de stare"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -8484,77 +8710,77 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Pictogramă"
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr "Legendă"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "rpmdrake2.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr "Acest pachet este deja instalat"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "rpmdrake3.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr "Acest pachet va fi instalat"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "rpmdrake4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr "Acest pachet nu poate fi modificat"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "rpmdrake5.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr "Acest pachet este o actualizare"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "rpmdrake6.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr "Acest pachet va fi dezinstalat"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr "Exemple în imaginea de mai sus:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -8562,7 +8788,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -8570,17 +8796,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr "Dependențele"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
diff --git a/docs/mcc-help/ru.po b/docs/mcc-help/ru.po
index 64cc5660..e6e57176 100644
--- a/docs/mcc-help/ru.po
+++ b/docs/mcc-help/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia rpmdrake help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-03-25 22:16+0300\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian <kde-i18n-uk@kde.org>\n"
@@ -36,36 +36,49 @@ msgstr "diskdrake--dav1.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--dav.xml:24
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">diskdrake --dav</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">diskdrake --dav</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --dav</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">diskdrake --dav</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--dav.xml:24
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia Control Center, under the Network Sharing tab, labeled <guilabel>Configure WebDAV shares</guilabel>."
-msgstr "Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно получить из Центра управления Mageia (MCC), пункт «Общие сетевые службы», раздел <guilabel>Настройка ресурсов WebDAV</guilabel>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
+"Control Center, under the Network Sharing tab, labeled <guilabel>Configure "
+"WebDAV shares</guilabel>."
+msgstr ""
+"Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить из Центра управления Mageia (MCC), пункт «Общие сетевые службы», "
+"раздел <guilabel>Настройка ресурсов WebDAV</guilabel>."
 
 #. type: Content of: <section><section><title>
-#: en/diskdrake--dav.xml:30
-#: en/diskdrake--nfs.xml:22
-#: en/diskdrake--smb.xml:21
-#: en/drak3d.xml:15
-#: en/drakconnect.xml:16
-#: en/draknetcenter.xml:29
-#: en/draksambashare.xml:27
-#: en/drakvpn.xml:16
-#: en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27
-#: en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27
-#: en/keyboarddrake.xml:17
+#: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
+#: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
+#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Введение"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:32
-msgid "<link xlink:href=\"http://en.wikipedia.org/wiki/WebDAV\">WebDAV</link> is a protocol that allows to mount a web server's directory locally, so that it appears as a local directory. It is necessary that the remote machine run a WebDAV server. This is not the aim of this tool to configure the WebDAV server."
-msgstr "<link xlink:href=\"http://en.wikipedia.org/wiki/WebDAV\">WebDAV</link> - протокол, с помощью которого можно монтировать каталог веб-сервера локально так, что в системе соответствующий каталог отобразится как локальный. На компьютере-сервере должен быть запущен сервер WebDAV. Этот инструмент не предназначен для настройки сервера WebDAV."
+msgid ""
+"<link xlink:href=\"http://en.wikipedia.org/wiki/WebDAV\">WebDAV</link> is a "
+"protocol that allows to mount a web server's directory locally, so that it "
+"appears as a local directory. It is necessary that the remote machine run a "
+"WebDAV server. This is not the aim of this tool to configure the WebDAV "
+"server."
+msgstr ""
+"<link xlink:href=\"http://en.wikipedia.org/wiki/WebDAV\">WebDAV</link> - "
+"протокол, с помощью которого можно монтировать каталог веб-сервера локально "
+"так, что в системе соответствующий каталог отобразится как локальный. На "
+"компьютере-сервере должен быть запущен сервер WebDAV. Этот инструмент не "
+"предназначен для настройки сервера WebDAV."
 
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:40
@@ -74,13 +87,31 @@ msgstr "Создание собственного пункта"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:42
-msgid "The first screen of the tool displays the already configured entries, if any, and a <guibutton>New</guibutton> button. Use it to create a new entry. Insert the server URL in the field of the new screen."
-msgstr "На первой странице программы будет показана уже настроенная запись, если таковая уже была создана и кнопка <guibutton>Новая</guibutton>. С помощью нажатия этой кнопки можно создать новую запись. Укажите URL-адрес сервера в поле страницы, которая будет открыта в ответ на нажатие кнопки."
+msgid ""
+"The first screen of the tool displays the already configured entries, if "
+"any, and a <guibutton>New</guibutton> button. Use it to create a new entry. "
+"Insert the server URL in the field of the new screen."
+msgstr ""
+"На первой странице программы будет показана уже настроенная запись, если "
+"таковая уже была создана и кнопка <guibutton>Новая</guibutton>. С помощью "
+"нажатия этой кнопки можно создать новую запись. Укажите URL-адрес сервера в "
+"поле страницы, которая будет открыта в ответ на нажатие кнопки."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:46
-msgid "Then you get a screen with radio buttons to select some actions.  Continue with the action <guibutton>Mount point</guibutton> by clicking <guibutton>OK</guibutton> after selecting the radio button, as the <guibutton>Server</guibutton> is already configured. You can however correct it, if needed."
-msgstr "После этого будет показано окно с пунктами-переключателями для выбора следующих действий. Продолжите с нажатия кнопки <guibutton>Точка монтирования</guibutton>. После выбора пункта, нажмите кнопку <guibutton>Готово</guibutton>, поскольку <guibutton>Сервер</guibutton> уже настроен. Впрочем, вы можете воспользоваться этим пунктом, если необходимо внести какие-либо изменения."
+msgid ""
+"Then you get a screen with radio buttons to select some actions.  Continue "
+"with the action <guibutton>Mount point</guibutton> by clicking "
+"<guibutton>OK</guibutton> after selecting the radio button, as the "
+"<guibutton>Server</guibutton> is already configured. You can however correct "
+"it, if needed."
+msgstr ""
+"После этого будет показано окно с пунктами-переключателями для выбора "
+"следующих действий. Продолжите с нажатия кнопки <guibutton>Точка "
+"монтирования</guibutton>. После выбора пункта, нажмите кнопку "
+"<guibutton>Готово</guibutton>, поскольку <guibutton>Сервер</guibutton> уже "
+"настроен. Впрочем, вы можете воспользоваться этим пунктом, если необходимо "
+"внести какие-либо изменения."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--dav.xml:54
@@ -89,13 +120,22 @@ msgstr "diskdrake--dav3.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:58
-msgid "The content of the remote directory will be accessible through this mount point."
-msgstr "Доступ к удаленному каталогу можно будет осуществлять с помощью указанной точки монтирования."
+msgid ""
+"The content of the remote directory will be accessible through this mount "
+"point."
+msgstr ""
+"Доступ к удаленному каталогу можно будет осуществлять с помощью указанной "
+"точки монтирования."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:61
-msgid "In the next step, give your user name and password. If you need some other options, you can give them in the <guibutton>advanced</guibutton> screen."
-msgstr "На следующем шаге вам необходимо указать - ваше имя пользователя и пароль. Если нужны другие настройки, нажмите кнопку <guibutton>Дополнительно</guibutton>."
+msgid ""
+"In the next step, give your user name and password. If you need some other "
+"options, you can give them in the <guibutton>advanced</guibutton> screen."
+msgstr ""
+"На следующем шаге вам необходимо указать - ваше имя пользователя и пароль. "
+"Если нужны другие настройки, нажмите кнопку <guibutton>Дополнительно</"
+"guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--dav.xml:67
@@ -104,13 +144,30 @@ msgstr "diskdrake--dav4.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:71
-msgid "The option <guibutton>Mount</guibutton> allows you to mount immediately the access."
-msgstr "С помощью кнопки <guibutton>Монтировать</guibutton> можно смонтировать каталог для немедленного использования."
+msgid ""
+"The option <guibutton>Mount</guibutton> allows you to mount immediately the "
+"access."
+msgstr ""
+"С помощью кнопки <guibutton>Монтировать</guibutton> можно смонтировать "
+"каталог для немедленного использования."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:74
-msgid "After you accepted the configuration with the radio button <guibutton>Done</guibutton>, the first screen is displayed again and your new mount point is listed. After you choose <guibutton>Quit</guibutton>, you are asked whether or not to save the modifications in <emphasis>/etc/fstab</emphasis>. Choose this option if you want that the remote directory is available at each boot. If your configuration is for one-time usage, do not save it."
-msgstr "После подтверждения настройки кнопкой <guibutton>Готово</guibutton>, будет снова показано первое окно с назначенной вами точкой монтирования. После нажатия кнопки <guibutton>Выйти</guibutton> программа спросит вас, следует ли записать внесённые изменения в <emphasis>/etc/fstab</emphasis>. Сохраните внесённые изменения, чтобы директория/раздел были доступны для использования сразу после загрузки системы. И не сохраняйте изменения, если монтируете для одноразового использования."
+msgid ""
+"After you accepted the configuration with the radio button <guibutton>Done</"
+"guibutton>, the first screen is displayed again and your new mount point is "
+"listed. After you choose <guibutton>Quit</guibutton>, you are asked whether "
+"or not to save the modifications in <emphasis>/etc/fstab</emphasis>. Choose "
+"this option if you want that the remote directory is available at each boot. "
+"If your configuration is for one-time usage, do not save it."
+msgstr ""
+"После подтверждения настройки кнопкой <guibutton>Готово</guibutton>, будет "
+"снова показано первое окно с назначенной вами точкой монтирования. После "
+"нажатия кнопки <guibutton>Выйти</guibutton> программа спросит вас, следует "
+"ли записать внесённые изменения в <emphasis>/etc/fstab</emphasis>. Сохраните "
+"внесённые изменения, чтобы директория/раздел были доступны для использования "
+"сразу после загрузки системы. И не сохраняйте изменения, если монтируете для "
+"одноразового использования."
 
 #. type: Content of: <section><info><title>
 #: en/diskdrake--fileshare.xml:3
@@ -129,50 +186,130 @@ msgstr "diskdrake--fileshare.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--fileshare.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">diskdrake --fileshare</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">diskdrake --fileshare</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --fileshare</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">diskdrake --fileshare</emphasis> от имени "
+"администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:15
-msgid "This simple tool<placeholder type=\"footnote\" id=\"0\"/> allows you, the administrator, to allow users to share parts of their own /home subdirectories with other users of a same local network which may have computers running either Linux or Windows operating system."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы, как администратор, сможете предоставить пользователям возможность предоставлять подкаталоги, из каталога пользователя в /home, в совместное пользование другим пользователям в локальной сети. Компьютеры этих пользователей могут работать под управлением операционных систем Linux или Windows."
+msgid ""
+"This simple tool<placeholder type=\"footnote\" id=\"0\"/> allows you, the "
+"administrator, to allow users to share parts of their own /home "
+"subdirectories with other users of a same local network which may have "
+"computers running either Linux or Windows operating system."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы, как "
+"администратор, сможете предоставить пользователям возможность предоставлять "
+"подкаталоги, из каталога пользователя в /home, в совместное пользование "
+"другим пользователям в локальной сети. Компьютеры этих пользователей могут "
+"работать под управлением операционных систем Linux или Windows."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:20
-msgid "It is found in the Mageia Control Center, under the Local Disk tab, labelled \"Share your hard disk partitions\"."
-msgstr "Доступ к этому модулю можно получить из Центра управления Mageia (MCC), пункт «Локальные диски», раздел «Совместный доступ к разделам вашего жёсткого диска»."
+msgid ""
+"It is found in the Mageia Control Center, under the Local Disk tab, labelled "
+"\"Share your hard disk partitions\"."
+msgstr ""
+"Доступ к этому модулю можно получить из Центра управления Mageia (MCC), "
+"пункт «Локальные диски», раздел «Совместный доступ к разделам вашего "
+"жёсткого диска»."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:23
-msgid "First, answer the question : \"<guilabel>Would you like to allow users to share some of their directories ?</guilabel>\", click on <guibutton>No sharing</guibutton> if the answer is no for all users, click on <guibutton>Allow all users</guibutton> for all users and click on <guibutton>Custom</guibutton> if the answer is no for some users and yes for the others. In this last case, the users that are authorised to share their directories must belong to the fileshare group, which is automatically created by the system. You will be asked about this later."
-msgstr "Сначала вам следует дать ответ на вопрос: «<guilabel>хотели бы вы позволить пользователям предоставлять доступ к некоторым из своих папок?</guilabel>» Отметьте пункт <guibutton>Нет общего доступа</guibutton>, если доступ следует запретить всем пользователям, пункт <guibutton>Разрешить всем пользователям</guibutton>, если доступ следует разрешить всем и <guibutton>Выборочно</guibutton>, если некоторым пользователям запретить доступ, а некоторым предоставить. В последнем случае пользователи, которые будут иметь доступ к каталогам общего пользования, должны принадлежать к группе fileshare, которая будет автоматически создана системой. Дополнительный вопрос, относительно этого будет задан программой на следующих шагах настройки."
+msgid ""
+"First, answer the question : \"<guilabel>Would you like to allow users to "
+"share some of their directories ?</guilabel>\", click on <guibutton>No "
+"sharing</guibutton> if the answer is no for all users, click on "
+"<guibutton>Allow all users</guibutton> for all users and click on "
+"<guibutton>Custom</guibutton> if the answer is no for some users and yes for "
+"the others. In this last case, the users that are authorised to share their "
+"directories must belong to the fileshare group, which is automatically "
+"created by the system. You will be asked about this later."
+msgstr ""
+"Сначала вам следует дать ответ на вопрос: «<guilabel>хотели бы вы позволить "
+"пользователям предоставлять доступ к некоторым из своих папок?</guilabel>» "
+"Отметьте пункт <guibutton>Нет общего доступа</guibutton>, если доступ "
+"следует запретить всем пользователям, пункт <guibutton>Разрешить всем "
+"пользователям</guibutton>, если доступ следует разрешить всем и "
+"<guibutton>Выборочно</guibutton>, если некоторым пользователям запретить "
+"доступ, а некоторым предоставить. В последнем случае пользователи, которые "
+"будут иметь доступ к каталогам общего пользования, должны принадлежать к "
+"группе fileshare, которая будет автоматически создана системой. "
+"Дополнительный вопрос, относительно этого будет задан программой на "
+"следующих шагах настройки."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:32
-msgid "Click on <guilabel>OK</guilabel>, a second screen appears which asks you choose between <guibutton>NFS</guibutton> or <guibutton>SMB</guibutton>.  Check <guibutton>NFS</guibutton> if Linux is the only operating system on the network, check <guibutton>SMB</guibutton> if the network includes both Linux and Windows machines and then click on <guibutton>OK</guibutton>. Any required packages will be installed if necessary."
-msgstr "После нажатия кнопки <guilabel>OK</guilabel>, появится вторая страница настроек, с помощью которой вы сможете выбрать тип совместных ресурсов, <guibutton>NFS</guibutton> или <guibutton>SMB</guibutton>. Выберите вариант <guibutton>NFS</guibutton>, если единственной операционной системой в локальной сети является Linux. Если же в сети есть компьютеры под управлением Windows, выберите пункт <guibutton>SMB</guibutton>. Как только выбор будет сделан, нажмите кнопку <guibutton>OK</guibutton>. Если это требуется, система выполнит установку пакетов, необходимых для работы с новыми настройками."
+msgid ""
+"Click on <guilabel>OK</guilabel>, a second screen appears which asks you "
+"choose between <guibutton>NFS</guibutton> or <guibutton>SMB</guibutton>.  "
+"Check <guibutton>NFS</guibutton> if Linux is the only operating system on "
+"the network, check <guibutton>SMB</guibutton> if the network includes both "
+"Linux and Windows machines and then click on <guibutton>OK</guibutton>. Any "
+"required packages will be installed if necessary."
+msgstr ""
+"После нажатия кнопки <guilabel>OK</guilabel>, появится вторая страница "
+"настроек, с помощью которой вы сможете выбрать тип совместных ресурсов, "
+"<guibutton>NFS</guibutton> или <guibutton>SMB</guibutton>. Выберите вариант "
+"<guibutton>NFS</guibutton>, если единственной операционной системой в "
+"локальной сети является Linux. Если же в сети есть компьютеры под "
+"управлением Windows, выберите пункт <guibutton>SMB</guibutton>. Как только "
+"выбор будет сделан, нажмите кнопку <guibutton>OK</guibutton>. Если это "
+"требуется, система выполнит установку пакетов, необходимых для работы с "
+"новыми настройками."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:39
-msgid "The configuration is now complete unless the Custom option was chosen.  In this case, an extra screen prompts you to open Userdrake. This tool allows you to add users authorised to share their directories to the fileshare group. In the User tab, click on the user to add to the fileshare group, then on <guimenuitem>Edit</guimenuitem>, In the Groups tab. Check the fileshare group and click on <guibutton>OK</guibutton>. For more information about Userdrake, see <link ns2:href=\"userdrake.xml\">this page</link>"
-msgstr "Если не выбран вариант «Выборочно», на этом настройка будет завершена. Если же вы выбрали вариант «Выборочно», появится страница, на которой программа попросит вас открыть окно программы Userdrake. С помощью Userdrake вы сможете добавить пользователей, которым будет разрешено предоставлять каталоги в общее пользование в группу fileshare. На вкладке «Пользователи» выберите пользователя, которого необходимо добавить к этой группе, затем нажмите кнопку <guimenuitem>Редактировать</guimenuitem>, на вкладке «Группы». Отметьте пункт группы fileshare и нажмите кнопку <guibutton>OK</guibutton>. Более подробное описание программы Userdrake можно найти на <link ns2:href=\"userdrake.xml\">этой странице</link>."
+msgid ""
+"The configuration is now complete unless the Custom option was chosen.  In "
+"this case, an extra screen prompts you to open Userdrake. This tool allows "
+"you to add users authorised to share their directories to the fileshare "
+"group. In the User tab, click on the user to add to the fileshare group, "
+"then on <guimenuitem>Edit</guimenuitem>, In the Groups tab. Check the "
+"fileshare group and click on <guibutton>OK</guibutton>. For more information "
+"about Userdrake, see <link ns2:href=\"userdrake.xml\">this page</link>"
+msgstr ""
+"Если не выбран вариант «Выборочно», на этом настройка будет завершена. Если "
+"же вы выбрали вариант «Выборочно», появится страница, на которой программа "
+"попросит вас открыть окно программы Userdrake. С помощью Userdrake вы "
+"сможете добавить пользователей, которым будет разрешено предоставлять "
+"каталоги в общее пользование в группу fileshare. На вкладке «Пользователи» "
+"выберите пользователя, которого необходимо добавить к этой группе, затем "
+"нажмите кнопку <guimenuitem>Редактировать</guimenuitem>, на вкладке "
+"«Группы». Отметьте пункт группы fileshare и нажмите кнопку <guibutton>OK</"
+"guibutton>. Более подробное описание программы Userdrake можно найти на "
+"<link ns2:href=\"userdrake.xml\">этой странице</link>."
 
 #. type: Content of: <section><note><para>
 #: en/diskdrake--fileshare.xml:50
-msgid "When adding a new user to the fileshare group, you have to disconnect and reconnect the network for the modifications to be taken into account."
-msgstr "Чтобы внесённые изменения вступили в силу, после добавления нового пользователя в группу fileshare, отключите компьютер от локальной сети, а затем установите соединение повторно."
+msgid ""
+"When adding a new user to the fileshare group, you have to disconnect and "
+"reconnect the network for the modifications to be taken into account."
+msgstr ""
+"Чтобы внесённые изменения вступили в силу, после добавления нового "
+"пользователя в группу fileshare, отключите компьютер от локальной сети, а "
+"затем установите соединение повторно."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:55
-msgid "From now on each user belonging to the fileshare group can select in his/her file manager the directories to be shared, although not all file managers have this facility."
-msgstr "После этой операции каждый из участников группы fileshare сможет просто обозначить в программе для управления файлами своей графической среды пункт каталога, данные из которого следует предоставить в общее пользование и воспользоваться возможностями общего доступа этой программы (такие возможности предусмотрены не во всех программах)."
+msgid ""
+"From now on each user belonging to the fileshare group can select in his/her "
+"file manager the directories to be shared, although not all file managers "
+"have this facility."
+msgstr ""
+"После этой операции каждый из участников группы fileshare сможет просто "
+"обозначить в программе для управления файлами своей графической среды пункт "
+"каталога, данные из которого следует предоставить в общее пользование и "
+"воспользоваться возможностями общего доступа этой программы (такие "
+"возможности предусмотрены не во всех программах)."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1
-#: en/mcc-network.xml:1
-#: en/MCC.xml:1
-#: en/software-management.xml:2
-#: en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "ru"
 
@@ -198,29 +335,55 @@ msgstr "."
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/diskdrake--nfs.xml:25
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">diskdrake --nfs</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">diskdrake --nfs</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --nfs</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">diskdrake --nfs</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:24
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to declare some shared directories to be accessible to all users on the machine. The protocol used for this is NFS which is available on most Linux or Unix systems. The shared directory will be thus available directly at boot. Shared directories can be also accessible directly in a single session for a user with tools such as file browsers."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете объявить некоторые из каталогов общего пользования доступными всем пользователям компьютера. Протокол NFS используется в большинстве систем Linux или Unix. Такие совместные каталоги станут доступными для пользователей сразу после загрузки системы. Доступ к общим каталогам можно осуществлять непосредственно во время рабочего сеанса пользователя с помощью программ для управления файлами."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to declare "
+"some shared directories to be accessible to all users on the machine. The "
+"protocol used for this is NFS which is available on most Linux or Unix "
+"systems. The shared directory will be thus available directly at boot. "
+"Shared directories can be also accessible directly in a single session for a "
+"user with tools such as file browsers."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете "
+"объявить некоторые из каталогов общего пользования доступными всем "
+"пользователям компьютера. Протокол NFS используется в большинстве систем "
+"Linux или Unix. Такие совместные каталоги станут доступными для "
+"пользователей сразу после загрузки системы. Доступ к общим каталогам можно "
+"осуществлять непосредственно во время рабочего сеанса пользователя с помощью "
+"программ для управления файлами."
 
 #. type: Content of: <section><section><title>
-#: en/diskdrake--nfs.xml:36
-#: en/diskdrake--smb.xml:38
+#: en/diskdrake--nfs.xml:36 en/diskdrake--smb.xml:38
 msgid "Procedure"
 msgstr "Процедура"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:38
-msgid "Select <guibutton>search servers</guibutton> to obtain a list of servers which share directories."
-msgstr "Нажмите кнопку <guibutton>Поиск серверов</guibutton>, чтобы получить список серверов, которые предоставляют каталоги в общее пользование."
+msgid ""
+"Select <guibutton>search servers</guibutton> to obtain a list of servers "
+"which share directories."
+msgstr ""
+"Нажмите кнопку <guibutton>Поиск серверов</guibutton>, чтобы получить список "
+"серверов, которые предоставляют каталоги в общее пользование."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:41
-msgid "Click on the > symbol before the server name to display the list of the shared directories and select the directory you want to access."
-msgstr "Нажмите пункт с названием сервера, а затем кнопку > перед этим названием, чтобы просмотреть список общих каталогов. Отметьте пункт каталога, к которому вы хотите получить доступ."
+msgid ""
+"Click on the > symbol before the server name to display the list of the "
+"shared directories and select the directory you want to access."
+msgstr ""
+"Нажмите пункт с названием сервера, а затем кнопку > перед этим названием, "
+"чтобы просмотреть список общих каталогов. Отметьте пункт каталога, к "
+"которому вы хотите получить доступ."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:47
@@ -229,8 +392,12 @@ msgstr "diskdrake--nfs2.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:51
-msgid "The button <guibutton>Mount point</guibutton> will be available and you have to specify where to mount the directory."
-msgstr "Станет доступной кнопка <guibutton>Точка монтирования</guibutton>, с помощью которой вы сможете указать точку монтирования для каталога."
+msgid ""
+"The button <guibutton>Mount point</guibutton> will be available and you have "
+"to specify where to mount the directory."
+msgstr ""
+"Станет доступной кнопка <guibutton>Точка монтирования</guibutton>, с помощью "
+"которой вы сможете указать точку монтирования для каталога."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:56
@@ -239,8 +406,15 @@ msgstr "diskdrake--nfs3.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:60
-msgid "After choosing the mount point, You can mount it. You can also verify and change some options with the <guibutton>Options</guibutton> button. After mounting the directory, you can unmount it with the same button."
-msgstr "После выбора точки монтирования вы можете смонтировать каталог. Вы также можете проверить или изменить параметры монтирования с помощью кнопки <guibutton>Параметры</guibutton>. После монтирования каталога его можно размонтировать с помощью той же кнопки."
+msgid ""
+"After choosing the mount point, You can mount it. You can also verify and "
+"change some options with the <guibutton>Options</guibutton> button. After "
+"mounting the directory, you can unmount it with the same button."
+msgstr ""
+"После выбора точки монтирования вы можете смонтировать каталог. Вы также "
+"можете проверить или изменить параметры монтирования с помощью кнопки "
+"<guibutton>Параметры</guibutton>. После монтирования каталога его можно "
+"размонтировать с помощью той же кнопки."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:67
@@ -254,8 +428,19 @@ msgstr "diskdrake--nfs5.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
-msgid "On accepting the configuration with the <guibutton>Done</guibutton> button, a message will displayed, asking \"Do you want to save the /etc/fstab modifications\". This will make the directory available at each boot, if the network is accessible. The new directory is then available in your file browser, for example in Dolphin."
-msgstr "После подтверждения настроек, нажатием кнопки <guibutton>Готово</guibutton> система попросит вас ответить на вопрос относительно того, желаете ли вы сохранить изменения в /etc/fstab. Внесение изменений в этот файл сделает каталог доступным сразу после загрузки системы, если локальная сеть доступна. После этого доступ к новому каталогу можно будет осуществлять с помощью программы для управления файлами вашей системы, например Dolphin."
+msgid ""
+"On accepting the configuration with the <guibutton>Done</guibutton> button, "
+"a message will displayed, asking \"Do you want to save the /etc/fstab "
+"modifications\". This will make the directory available at each boot, if the "
+"network is accessible. The new directory is then available in your file "
+"browser, for example in Dolphin."
+msgstr ""
+"После подтверждения настроек, нажатием кнопки <guibutton>Готово</guibutton> "
+"система попросит вас ответить на вопрос относительно того, желаете ли вы "
+"сохранить изменения в /etc/fstab. Внесение изменений в этот файл сделает "
+"каталог доступным сразу после загрузки системы, если локальная сеть "
+"доступна. После этого доступ к новому каталогу можно будет осуществлять с "
+"помощью программы для управления файлами вашей системы, например Dolphin."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:85
@@ -279,23 +464,44 @@ msgstr "diskdrake--removable.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--removable.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">diskdrake --removable</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">diskdrake --removable</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --removable</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">diskdrake --removable</emphasis> от имени "
+"администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--removable.xml:14
-msgid "This tool <placeholder type=\"footnote\" id=\"0\"/>is found under the tab Local disks in the Mageia Control Center labelled accordingly with your removable hardware (CD/DVD players and burners and floppy drives only)."
-msgstr "Доступ к этому модулю <placeholder type=\"footnote\" id=\"0\"/>можно получить с помощью пункта «Локальные диски» из Центра управления Mageia. Модуль подписан в соответствии с названием вашего съёмного носителя данных (только для CD/DVD и дисководов)."
+msgid ""
+"This tool <placeholder type=\"footnote\" id=\"0\"/>is found under the tab "
+"Local disks in the Mageia Control Center labelled accordingly with your "
+"removable hardware (CD/DVD players and burners and floppy drives only)."
+msgstr ""
+"Доступ к этому модулю <placeholder type=\"footnote\" id=\"0\"/>можно "
+"получить с помощью пункта «Локальные диски» из Центра управления Mageia. "
+"Модуль подписан в соответствии с названием вашего съёмного носителя данных "
+"(только для CD/DVD и дисководов)."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--removable.xml:20
 msgid "Its goal is to define the way your removable disk is mounted."
-msgstr "Модуль предназначен для определения способа монтирования съёмных дисков."
+msgstr ""
+"Модуль предназначен для определения способа монтирования съёмных дисков."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--removable.xml:22
-msgid "At the top of the window there is a short description of your hardware and the chosen options to mount it. Use the menu on the bottom to change them. Check the item to be changed and then on the <guibutton>OK</guibutton> button."
-msgstr "В верхней части окна будет показано краткое описание оборудования и параметров его монтирования. С помощью меню, показанного в нижней части окна, вы сможете изменить параметры монтирования. Отметьте в меню пункт и нажмите кнопку <guibutton>OK</guibutton>."
+msgid ""
+"At the top of the window there is a short description of your hardware and "
+"the chosen options to mount it. Use the menu on the bottom to change them. "
+"Check the item to be changed and then on the <guibutton>OK</guibutton> "
+"button."
+msgstr ""
+"В верхней части окна будет показано краткое описание оборудования и "
+"параметров его монтирования. С помощью меню, показанного в нижней части "
+"окна, вы сможете изменить параметры монтирования. Отметьте в меню пункт и "
+"нажмите кнопку <guibutton>OK</guibutton>."
 
 #. type: Content of: <section><section><title>
 #: en/diskdrake--removable.xml:28
@@ -304,19 +510,26 @@ msgstr "Точка монтирования"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--removable.xml:30
-msgid "Check this box to change the mount point. The default one is /media/cdrom."
-msgstr "Отметьте этот пункт, чтобы изменить точку монтирования. По умолчанию это /media/cdrom."
+msgid ""
+"Check this box to change the mount point. The default one is /media/cdrom."
+msgstr ""
+"Отметьте этот пункт, чтобы изменить точку монтирования. По умолчанию это /"
+"media/cdrom."
 
 #. type: Content of: <section><section><para><bridgehead>
-#: en/diskdrake--removable.xml:37
-#: en/harddrake2.xml:66
+#: en/diskdrake--removable.xml:37 en/harddrake2.xml:66
 msgid "Options"
 msgstr "Параметры"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--removable.xml:39
-msgid "Many mount options can be chosen here either directly in the list or via the <guilabel>Advanced</guilabel> submenu. The main are:"
-msgstr "Изменить параметры монтирования можно непосредственно с помощью списка или нажатием кнопки <guilabel>Дополнительно</guilabel>. Основными параметрами являются:"
+msgid ""
+"Many mount options can be chosen here either directly in the list or via the "
+"<guilabel>Advanced</guilabel> submenu. The main are:"
+msgstr ""
+"Изменить параметры монтирования можно непосредственно с помощью списка или "
+"нажатием кнопки <guilabel>Дополнительно</guilabel>. Основными параметрами "
+"являются:"
 
 #. type: Content of: <section><section><section><title>
 #: en/diskdrake--removable.xml:45
@@ -325,8 +538,15 @@ msgstr "user/nouser"
 
 #. type: Content of: <section><section><section><para>
 #: en/diskdrake--removable.xml:47
-msgid "user allows an ordinary user (not root) to mount the removable disk, this option involves noexec, nosuid and nodev. The user who mounted the disk is the only one who can umount it."
-msgstr "Обозначением пункта «user» можно позволить обычному пользователю (не root) монтировать съёмные диски. Выбор пункта приведёт к обозначению пунктов noexec, nosuid и nodev. Размонтировать смонтированный диск может только пользователь, который его смонтировал."
+msgid ""
+"user allows an ordinary user (not root) to mount the removable disk, this "
+"option involves noexec, nosuid and nodev. The user who mounted the disk is "
+"the only one who can umount it."
+msgstr ""
+"Обозначением пункта «user» можно позволить обычному пользователю (не root) "
+"монтировать съёмные диски. Выбор пункта приведёт к обозначению пунктов "
+"noexec, nosuid и nodev. Размонтировать смонтированный диск может только "
+"пользователь, который его смонтировал."
 
 #. type: Content of: <section><info><title>
 #: en/diskdrake--smb.xml:11
@@ -340,33 +560,68 @@ msgstr "diskdrake --smb"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/diskdrake--smb.xml:24
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">diskdrake --smb</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">diskdrake --smb</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --smb</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">diskdrake --smb</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:23
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to declare which shared directories to be accessible to all users on the machine. The protocol used for this is SMB which has been popularized on Windows(R) systems. The shared directory will be available directly at boot. Shared directories can be also accessed directly in a single session by a user with tools such as file browsers."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете указать каталоги, доступ к которым смогут получать все пользователи компьютера. Для доступа будет использоваться протокол SMB, который приобрел популярность вместе с операционными системами Windows®. Доступ к каталогам общего пользования можно будет получить сразу после загрузки системы. Доступ к каталогам общего пользования можно также получить в пределах отдельного сеанса с помощью программ для управления файлами."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to declare "
+"which shared directories to be accessible to all users on the machine. The "
+"protocol used for this is SMB which has been popularized on Windows(R) "
+"systems. The shared directory will be available directly at boot. Shared "
+"directories can be also accessed directly in a single session by a user with "
+"tools such as file browsers."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете "
+"указать каталоги, доступ к которым смогут получать все пользователи "
+"компьютера. Для доступа будет использоваться протокол SMB, который приобрел "
+"популярность вместе с операционными системами Windows®. Доступ к каталогам "
+"общего пользования можно будет получить сразу после загрузки системы. Доступ "
+"к каталогам общего пользования можно также получить в пределах отдельного "
+"сеанса с помощью программ для управления файлами."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:33
-msgid "Before starting the tool, it is a good idea to declare the names of available servers, for example with <xref linkend=\"drakhosts\"/>"
-msgstr "До запуска этой программы следует определить названия доступных серверов, например с помощью <xref linkend=\"drakhosts\"/>"
+msgid ""
+"Before starting the tool, it is a good idea to declare the names of "
+"available servers, for example with <xref linkend=\"drakhosts\"/>"
+msgstr ""
+"До запуска этой программы следует определить названия доступных серверов, "
+"например с помощью <xref linkend=\"drakhosts\"/>"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:40
-msgid "Select <guibutton>search servers</guibutton> to obtain a list of servers who share directories."
-msgstr "Нажмите кнопку <guibutton>Поиск серверов</guibutton>, чтобы получить список серверов, которые предоставляют каталоги в общее пользование."
+msgid ""
+"Select <guibutton>search servers</guibutton> to obtain a list of servers who "
+"share directories."
+msgstr ""
+"Нажмите кнопку <guibutton>Поиск серверов</guibutton>, чтобы получить список "
+"серверов, которые предоставляют каталоги в общее пользование."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:43
-msgid "Click on the server name and on &gt; before the server name to display the list of the shared directories and select the directory you want to access."
-msgstr "Нажмите пункт с названием сервера, а затем кнопку > перед этим названием, чтобы просмотреть список общих каталогов. Отметьте пункт каталога, к которому вы хотите получить доступ."
+msgid ""
+"Click on the server name and on &gt; before the server name to display the "
+"list of the shared directories and select the directory you want to access."
+msgstr ""
+"Нажмите пункт с названием сервера, а затем кнопку > перед этим названием, "
+"чтобы просмотреть список общих каталогов. Отметьте пункт каталога, к "
+"которому вы хотите получить доступ."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:47
-msgid "The <guibutton>Mount point</guibutton> button will become available, you have to specify where to mount the directory."
-msgstr "Станет доступной кнопка <guibutton>Точка монтирования</guibutton>, с помощью которой вы сможете указать точку монтирования для каталога."
+msgid ""
+"The <guibutton>Mount point</guibutton> button will become available, you "
+"have to specify where to mount the directory."
+msgstr ""
+"Станет доступной кнопка <guibutton>Точка монтирования</guibutton>, с помощью "
+"которой вы сможете указать точку монтирования для каталога."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--smb.xml:52
@@ -375,13 +630,26 @@ msgstr "diskdrake--smb2.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:56
-msgid "After choosing the mount point, it can be mounted with the <guimenu>Mount button</guimenu>. You can also verify and change some options with the <guibutton>Options</guibutton> button."
-msgstr "После выбора точки монтирования вы можете смонтировать каталог с помощью кнопки <guimenu>Монтировать</guimenu>. Вы также можете проверить или изменить параметры монтирования с помощью кнопки <guibutton>Параметры</guibutton>."
+msgid ""
+"After choosing the mount point, it can be mounted with the <guimenu>Mount "
+"button</guimenu>. You can also verify and change some options with the "
+"<guibutton>Options</guibutton> button."
+msgstr ""
+"После выбора точки монтирования вы можете смонтировать каталог с помощью "
+"кнопки <guimenu>Монтировать</guimenu>. Вы также можете проверить или "
+"изменить параметры монтирования с помощью кнопки <guibutton>Параметры</"
+"guibutton>."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:60
-msgid "In options, you can specify the user name and the password of those able to connect to the SMB server. After mounting the directory, you can unmount it with the same button."
-msgstr "С помощью окна параметров вы можете указать имя пользователя и пароль, которым должны пользоваться те, кто хочет соединиться с сервером SMB. После монтирования каталога его можно размонтировать с помощью той же кнопки."
+msgid ""
+"In options, you can specify the user name and the password of those able to "
+"connect to the SMB server. After mounting the directory, you can unmount it "
+"with the same button."
+msgstr ""
+"С помощью окна параметров вы можете указать имя пользователя и пароль, "
+"которым должны пользоваться те, кто хочет соединиться с сервером SMB. После "
+"монтирования каталога его можно размонтировать с помощью той же кнопки."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--smb.xml:66
@@ -395,8 +663,18 @@ msgstr "diskdrake--smb4.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:76
-msgid "After accepting the configuration with the Done button, a message will ask \"Do you want to save the /etc/fstab modifications\". Saving, will allow directory to made available at each boot, if the network is accessible. The new directory is then available in your file browser, for example in dolphin."
-msgstr "После подтверждения настроек нажатием кнопки <guibutton>Готово</guibutton> система попросит вас ответить на вопрос относительно того, желаете ли вы сохранить изменения в /etc/fstab. Внесение изменений в этот файл сделает каталог доступным сразу после загрузки системы, если локальная сеть доступна. После этого доступ к новому каталогу можно будет осуществлять с помощью программы для управления файлами вашей системы, например Dolphin."
+msgid ""
+"After accepting the configuration with the Done button, a message will ask "
+"\"Do you want to save the /etc/fstab modifications\". Saving, will allow "
+"directory to made available at each boot, if the network is accessible. The "
+"new directory is then available in your file browser, for example in dolphin."
+msgstr ""
+"После подтверждения настроек нажатием кнопки <guibutton>Готово</guibutton> "
+"система попросит вас ответить на вопрос относительно того, желаете ли вы "
+"сохранить изменения в /etc/fstab. Внесение изменений в этот файл сделает "
+"каталог доступным сразу после загрузки системы, если локальная сеть "
+"доступна. После этого доступ к новому каталогу можно будет осуществлять с "
+"помощью программы для управления файлами вашей системы, например Dolphin."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--smb.xml:84
@@ -420,13 +698,23 @@ msgstr "drak3d.png"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drak3d.xml:18
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drak3d</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drak3d</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drak3d</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drak3d</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:17
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> lets you manage the 3D desktop effects on your operating system. 3D effects are turned off by default."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете управлять эффектами пространственного воспроизведения (3D) в вашей операционной системе. Обычно такие эффекты отключены."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> lets you manage the 3D "
+"desktop effects on your operating system. 3D effects are turned off by "
+"default."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете "
+"управлять эффектами пространственного воспроизведения (3D) в вашей "
+"операционной системе. Обычно такие эффекты отключены."
 
 #. type: Content of: <section><section><title>
 #: en/drak3d.xml:25
@@ -435,18 +723,44 @@ msgstr "Первоначальные замечания"
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:27
-msgid "To use this tool, you need to have the glxinfo package installed. If the package is not installed, you will be prompted to do so before drak3d can start."
-msgstr "Чтобы воспользоваться этим инструментом, вам следует установить пакет glxinfo. Если этот пакет ещё не был установлен, система попросит вас установить его до того, как запустит drak3d."
+msgid ""
+"To use this tool, you need to have the glxinfo package installed. If the "
+"package is not installed, you will be prompted to do so before drak3d can "
+"start."
+msgstr ""
+"Чтобы воспользоваться этим инструментом, вам следует установить пакет "
+"glxinfo. Если этот пакет ещё не был установлен, система попросит вас "
+"установить его до того, как запустит drak3d."
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:31
-msgid "After starting drak3d, you will be presented with a menu window.  Here you can choose either <guilabel>No 3D Desktop Effects</guilabel> or <guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a composite/window manager, which includes hardware-accelerated special effects for your desktop. Choose <guilabel>Compiz Fusion</guilabel> to turn it on."
-msgstr "После запуска drak3d будет показано окно меню. С помощью этого окна вы сможете выбрать вариант работы: <guilabel>Без эффектов 3D-рабочего стола</guilabel> или <guilabel>Compiz Fusion</guilabel>. Compiz Fusion является частью композитной системы управления окнами, которая делает возможным использование специальных эффектов с аппаратным ускорением на рабочем столе. Выберите <guilabel>Compiz Fusion</guilabel>, чтобы включить такую композитную систему управления окнами."
+msgid ""
+"After starting drak3d, you will be presented with a menu window.  Here you "
+"can choose either <guilabel>No 3D Desktop Effects</guilabel> or "
+"<guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a composite/"
+"window manager, which includes hardware-accelerated special effects for your "
+"desktop. Choose <guilabel>Compiz Fusion</guilabel> to turn it on."
+msgstr ""
+"После запуска drak3d будет показано окно меню. С помощью этого окна вы "
+"сможете выбрать вариант работы: <guilabel>Без эффектов 3D-рабочего стола</"
+"guilabel> или <guilabel>Compiz Fusion</guilabel>. Compiz Fusion является "
+"частью композитной системы управления окнами, которая делает возможным "
+"использование специальных эффектов с аппаратным ускорением на рабочем столе. "
+"Выберите <guilabel>Compiz Fusion</guilabel>, чтобы включить такую "
+"композитную систему управления окнами."
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:38
-msgid "If this is your first time using this program after a clean installation of Mageia, you will get a warning message telling you which packages need to be installed in order to use Compiz Fusion. Click on the <guibutton>Ok</guibutton> button to continue."
-msgstr "Если вы впервые пользуетесь этой программой после первоначальной установки Mageia, система покажет сообщение с предупреждением относительно того, что для работы Compiz Fusion следует установить некоторые пакеты. Нажмите кнопку <guibutton>OK</guibutton>."
+msgid ""
+"If this is your first time using this program after a clean installation of "
+"Mageia, you will get a warning message telling you which packages need to be "
+"installed in order to use Compiz Fusion. Click on the <guibutton>Ok</"
+"guibutton> button to continue."
+msgstr ""
+"Если вы впервые пользуетесь этой программой после первоначальной установки "
+"Mageia, система покажет сообщение с предупреждением относительно того, что "
+"для работы Compiz Fusion следует установить некоторые пакеты. Нажмите кнопку "
+"<guibutton>OK</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/drak3d.xml:45
@@ -455,13 +769,24 @@ msgstr "drak3d_installing_CompizFusion.png"
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:49
-msgid "Once the appropriate packages are installed, you will notice that Compiz Fusion is selected in the drak3d menu, but you must log out and log back in for the changes to take effect."
-msgstr "Как только будут установлены соответствующие пакеты, вы увидите обозначенный пункт Compiz Fusion в меню drak3d. Впрочем, для пользования новыми эффектами следует выйти из учётной записи пользователя и снова войти в неё."
+msgid ""
+"Once the appropriate packages are installed, you will notice that Compiz "
+"Fusion is selected in the drak3d menu, but you must log out and log back in "
+"for the changes to take effect."
+msgstr ""
+"Как только будут установлены соответствующие пакеты, вы увидите обозначенный "
+"пункт Compiz Fusion в меню drak3d. Впрочем, для пользования новыми эффектами "
+"следует выйти из учётной записи пользователя и снова войти в неё."
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:53
-msgid "After logging back in, Compiz Fusion will be activated. To configure Compiz Fusion, see the page for the ccsm (CompizConfig Settings Manager)  tool."
-msgstr "После повторного входа в систему будет задействована Compiz Fusion. Настроить Compiz Fusion можно с помощью утилиты ccsm (CompizConfig Settings Manager)."
+msgid ""
+"After logging back in, Compiz Fusion will be activated. To configure Compiz "
+"Fusion, see the page for the ccsm (CompizConfig Settings Manager)  tool."
+msgstr ""
+"После повторного входа в систему будет задействована Compiz Fusion. "
+"Настроить Compiz Fusion можно с помощью утилиты ccsm (CompizConfig Settings "
+"Manager)."
 
 #. type: Content of: <section><section><title>
 #: en/drak3d.xml:59
@@ -475,8 +800,15 @@ msgstr "После входа в систему не видно рабочего
 
 #. type: Content of: <section><section><section><para>
 #: en/drak3d.xml:64
-msgid "If after turning on Compiz Fusion you attempt to log back into your desktop but can't see anything, restart your computer to get back to the log in screen. Once there, click on the Desktop icon and select drak3d."
-msgstr "Если после включения Compiz Fusion и попытке войти под своей учётной записью, вы ничего не увидите, перезагрузите операционную систему, чтобы вернуться к экрану входа в систему. В этом окне нажмите кнопку «Рабочий стол» и выберите drak3d."
+msgid ""
+"If after turning on Compiz Fusion you attempt to log back into your desktop "
+"but can't see anything, restart your computer to get back to the log in "
+"screen. Once there, click on the Desktop icon and select drak3d."
+msgstr ""
+"Если после включения Compiz Fusion и попытке войти под своей учётной "
+"записью, вы ничего не увидите, перезагрузите операционную систему, чтобы "
+"вернуться к экрану входа в систему. В этом окне нажмите кнопку «Рабочий "
+"стол» и выберите drak3d."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/drak3d.xml:71
@@ -485,8 +817,17 @@ msgstr "drak3d_troubleshooting_login_option.png"
 
 #. type: Content of: <section><section><section><para>
 #: en/drak3d.xml:75
-msgid "When you log in, if your account is listed as an administrator, you will be prompted for your password again. Otherwise, use the administrator login with his/her account. Then you can undo any changes that may have caused the log in problem."
-msgstr "После входа в систему, если ваша учётная запись не является административной, система попросит вас ввести пароль к вашей учётной записи. Если же ваша учётная запись является административной (root), воспользуйтесь ей. После входа под административной учётной записью вы сможете отменить изменения в системе, которые привели к её неработоспособности."
+msgid ""
+"When you log in, if your account is listed as an administrator, you will be "
+"prompted for your password again. Otherwise, use the administrator login "
+"with his/her account. Then you can undo any changes that may have caused the "
+"log in problem."
+msgstr ""
+"После входа в систему, если ваша учётная запись не является "
+"административной, система попросит вас ввести пароль к вашей учётной записи. "
+"Если же ваша учётная запись является административной (root), воспользуйтесь "
+"ей. После входа под административной учётной записью вы сможете отменить "
+"изменения в системе, которые привели к её неработоспособности."
 
 #. type: Content of: <section><info><title>
 #: en/drakauth.xml:9
@@ -505,18 +846,33 @@ msgstr "drakauth.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakauth.xml:21
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakauth</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakauth</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakauth</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakauth</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakauth.xml:21
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> enables you to modify the manner in which you can be recognized as user of the machine or on the net."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете изменить способ признания вас в качестве пользователя машины или сети."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> enables you to modify the "
+"manner in which you can be recognized as user of the machine or on the net."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете "
+"изменить способ признания вас в качестве пользователя машины или сети."
 
 #. type: Content of: <section><para>
 #: en/drakauth.xml:25
-msgid "By default, information for your authentication is stored in a file on your computer. Modify it only if your network administrator invites you to do so and give information about that."
-msgstr "По умолчанию данные для вашей авторизации сохраняются в файле на вашем компьютере. Внесите в него изменения, если вас об этом попросит администратор сети. Соответствующие данные для внесения изменений должны быть предоставлены администратором сети."
+msgid ""
+"By default, information for your authentication is stored in a file on your "
+"computer. Modify it only if your network administrator invites you to do so "
+"and give information about that."
+msgstr ""
+"По умолчанию данные для вашей авторизации сохраняются в файле на вашем "
+"компьютере. Внесите в него изменения, если вас об этом попросит "
+"администратор сети. Соответствующие данные для внесения изменений должны "
+"быть предоставлены администратором сети."
 
 #. type: Content of: <section><info><title>
 #: en/drakboot--boot.xml:3
@@ -533,46 +889,97 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><para><footnote><para>
 #: en/drakboot--boot.xml:15
-#: en/drakboot--boot.xml:120
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakboot --boot</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakboot --boot</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot --boot</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakboot --boot</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:14
-msgid "this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure the boot options (choice of the bootloader, set a password, the default boot, etc.)"
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> можно настроить варианты загрузки компьютера (выбрать загрузчик, установить пароль, определить вариант загрузки по умолчанию и др.)."
+msgid ""
+"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"the boot options (choice of the bootloader, set a password, the default "
+"boot, etc.)"
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> можно "
+"настроить варианты загрузки компьютера (выбрать загрузчик, установить "
+"пароль, определить вариант загрузки по умолчанию и др.)."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:19
-msgid "It is found under the Boot tab in the Mageia Control Center labelled \"Set up boot system\"."
-msgstr "Доступ к этой программе можно получить с помощью пункта «Загрузка» из Центра управления Mageia. Раздел «Настройка загрузки»."
+msgid ""
+"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
+"up boot system\"."
+msgstr ""
+"Доступ к этой программе можно получить с помощью пункта «Загрузка» из Центра "
+"управления Mageia. Раздел «Настройка загрузки»."
 
 #. type: Content of: <section><warning><para>
 #: en/drakboot--boot.xml:23
-msgid "Don't use this tool if you don't know exactly what you are doing.  Changing some settings may prevent your machine from booting again !"
-msgstr "Не пользуйтесь этой программой, если вы не уверены относительно последствий своих действий. Внесение изменений в определённые параметры загрузки может помешать штатной загрузке вашей системы!"
+msgid ""
+"Don't use this tool if you don't know exactly what you are doing.  Changing "
+"some settings may prevent your machine from booting again !"
+msgstr ""
+"Не пользуйтесь этой программой, если вы не уверены относительно последствий "
+"своих действий. Внесение изменений в определённые параметры загрузки может "
+"помешать штатной загрузке вашей системы!"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:28
-msgid "In the first part, called <guilabel>Bootloader</guilabel>, it is possible to choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and with a graphical or a text menu. It is just a question of taste, there are no other consequences. You can also set the <guibutton>Boot device</guibutton>, don't change anything here unless you are an expert. The boot device is where the bootloader is installed and any modification can prevent you machine from booting."
-msgstr "С помощью первой части с названием <guilabel>Загрузчик</guilabel> можно выбрать загрузчик, который следует использовать Grub или Lilo, и определить каким будет меню, графическим или текстовым. Выбор типа меню является лишь вопросом вкуса, никаких других последствий для работы компьютера он иметь не будет. Кроме того, вы можете установить <guibutton>Устройство загрузки</guibutton>. Не изменяйте его, если вы не являетесь знатоком в вопросах загрузки. Устройство загрузки - это устройство, на котором будет установлен загрузчик, любые изменения могут помешать загрузке системы."
+msgid ""
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
+"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
+"with a graphical or a text menu. It is just a question of taste, there are "
+"no other consequences. You can also set the <guibutton>Boot device</"
+"guibutton>, don't change anything here unless you are an expert. The boot "
+"device is where the bootloader is installed and any modification can prevent "
+"you machine from booting."
+msgstr ""
+"С помощью первой части с названием <guilabel>Загрузчик</guilabel> можно "
+"выбрать загрузчик, который следует использовать Grub или Lilo, и определить "
+"каким будет меню, графическим или текстовым. Выбор типа меню является лишь "
+"вопросом вкуса, никаких других последствий для работы компьютера он иметь не "
+"будет. Кроме того, вы можете установить <guibutton>Устройство загрузки</"
+"guibutton>. Не изменяйте его, если вы не являетесь знатоком в вопросах "
+"загрузки. Устройство загрузки - это устройство, на котором будет установлен "
+"загрузчик, любые изменения могут помешать загрузке системы."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:36
-msgid "In the second part, called <guilabel>Main options</guilabel>, you can set the <guibutton>Delay before booting default image</guibutton>, in seconds. During this delay, grub or Lilo will display the list of available operating systems, prompting you to make your choice, if no selection is made, the bootloader will boot the default one once the delay elapses."
-msgstr "С помощью второй части, <guilabel>Основные параметры</guilabel>, вы можете установить <guibutton>Паузу перед загрузкой системы по умолчанию</guibutton> в секундах. Во время этой паузы grub или Lilo будет отображать список операционных систем и попросит вас выбрать желаемую систему. Если в течение паузы выбор не будет сделан, загрузчиком будет загружена система по умолчанию."
+msgid ""
+"In the second part, called <guilabel>Main options</guilabel>, you can set "
+"the <guibutton>Delay before booting default image</guibutton>, in seconds. "
+"During this delay, grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice, if no selection is made, the "
+"bootloader will boot the default one once the delay elapses."
+msgstr ""
+"С помощью второй части, <guilabel>Основные параметры</guilabel>, вы можете "
+"установить <guibutton>Паузу перед загрузкой системы по умолчанию</guibutton> "
+"в секундах. Во время этой паузы grub или Lilo будет отображать список "
+"операционных систем и попросит вас выбрать желаемую систему. Если в течение "
+"паузы выбор не будет сделан, загрузчиком будет загружена система по "
+"умолчанию."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:43
-msgid "In the third and last part, called <guibutton>Security</guibutton>, it is possible to set a password."
-msgstr "С помощью третьей и последней части, которая называется <guibutton>Безопасность</guibutton>, можно установить пароль для загрузчика."
+msgid ""
+"In the third and last part, called <guibutton>Security</guibutton>, it is "
+"possible to set a password."
+msgstr ""
+"С помощью третьей и последней части, которая называется "
+"<guibutton>Безопасность</guibutton>, можно установить пароль для загрузчика."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:46
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
-msgstr "С помощью кнопки <guibutton>Дополнительно</guibutton> можно получить доступ к дополнительным параметрам."
+msgstr ""
+"С помощью кнопки <guibutton>Дополнительно</guibutton> можно получить доступ "
+"к дополнительным параметрам."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:49
@@ -581,8 +988,17 @@ msgstr "<guibutton>Включить ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:51
-msgid "ACPI (Advanced Configuration and Power Interface) is a standard for the power management. It can save energy by stopping unused devices, this was the method used before APM. Check this box if your hardware is ACPI compatible."
-msgstr "ACPI (Advanced Configuration and Power Interface или интерфейс дополнительного конфигурирования и питания) - стандарт управления питанием. С его помощью можно экономить энергию, приостанавливать работу устройств, которые не используются. Этот способ использовался ранее в APM. Отметьте этот пункт, если ваше оборудование является совместимым с ACPI."
+msgid ""
+"ACPI (Advanced Configuration and Power Interface) is a standard for the "
+"power management. It can save energy by stopping unused devices, this was "
+"the method used before APM. Check this box if your hardware is ACPI "
+"compatible."
+msgstr ""
+"ACPI (Advanced Configuration and Power Interface или интерфейс "
+"дополнительного конфигурирования и питания) - стандарт управления питанием. "
+"С его помощью можно экономить энергию, приостанавливать работу устройств, "
+"которые не используются. Этот способ использовался ранее в APM. Отметьте "
+"этот пункт, если ваше оборудование является совместимым с ACPI."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:56
@@ -591,23 +1007,53 @@ msgstr "<guibutton>Включить SMP:</guibutton>"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:58
-msgid "SMP stands for Symmetric Multi Processors, it's an architecture for multicore processors."
-msgstr "SMP - сокращение от Symmetric Multi Processors (симметричный многопроцессорный), так называется архитектура многопроцессорных систем."
+msgid ""
+"SMP stands for Symmetric Multi Processors, it's an architecture for "
+"multicore processors."
+msgstr ""
+"SMP - сокращение от Symmetric Multi Processors (симметричный "
+"многопроцессорный), так называется архитектура многопроцессорных систем."
 
 #. type: Content of: <section><note><para>
 #: en/drakboot--boot.xml:62
-msgid "If you have a processor with HyperThreading, Mageia will see it as a dual processor and enable SMP."
-msgstr "Если в вашем компьютере установлен процессор с поддержкой технологии HyperThreading, Mageia определит его как двойной процессор и включит SMP."
+msgid ""
+"If you have a processor with HyperThreading, Mageia will see it as a dual "
+"processor and enable SMP."
+msgstr ""
+"Если в вашем компьютере установлен процессор с поддержкой технологии "
+"HyperThreading, Mageia определит его как двойной процессор и включит SMP."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:66
-msgid "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</guibutton>"
-msgstr "<guibutton>Включить APIC</guibutton> и <guibutton>Включить локальный APIC:</guibutton>"
+msgid ""
+"<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
+"guibutton>"
+msgstr ""
+"<guibutton>Включить APIC</guibutton> и <guibutton>Включить локальный APIC:</"
+"guibutton>"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:69
-msgid "APIC stands for Advanced Programmable Interrupt Controller. There are two components in the Intel APIC system, the local APIC (LAPIC) and the I/O APIC. This one routes the interrupts it receives them from peripheral buses to one or more local APICs that are in the processor. It is really useful for multi-processor systems. Some computers have problems with the APIC system which can cause freezes or incorrect device detection (error message \"spurious 8259A interrupt: IRQ7\"). In this case, disable APIC and/or Local APIC."
-msgstr "APIC - аббревиатура от Advanced Programmable Interrupt Controller (улучшенный программируемый контроллер прерываний). Существуют два компонента Intel APIC системы: локальный APIC (LAPIC) и APIC ввода-вывода. Этот контроллер направляет прерывания, которые он получает из периферийных каналов на один или несколько APIC в процессоре. Такие контроллеры являются весьма полезными в многопроцессорных системах. Некоторые компьютеры могут иметь проблемы с системой APIC, что приводит к зависанию работы или ложного обнаружения устройств (сообщение об ошибке «spurious 8259A interrupt: IRQ7»). Если с вашим компьютером случаются такие проблемы, отключите APIC и/или локальный APIC."
+msgid ""
+"APIC stands for Advanced Programmable Interrupt Controller. There are two "
+"components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
+"APIC. This one routes the interrupts it receives them from peripheral buses "
+"to one or more local APICs that are in the processor. It is really useful "
+"for multi-processor systems. Some computers have problems with the APIC "
+"system which can cause freezes or incorrect device detection (error message "
+"\"spurious 8259A interrupt: IRQ7\"). In this case, disable APIC and/or Local "
+"APIC."
+msgstr ""
+"APIC - аббревиатура от Advanced Programmable Interrupt Controller "
+"(улучшенный программируемый контроллер прерываний). Существуют два "
+"компонента Intel APIC системы: локальный APIC (LAPIC) и APIC ввода-вывода. "
+"Этот контроллер направляет прерывания, которые он получает из периферийных "
+"каналов на один или несколько APIC в процессоре. Такие контроллеры являются "
+"весьма полезными в многопроцессорных системах. Некоторые компьютеры могут "
+"иметь проблемы с системой APIC, что приводит к зависанию работы или ложного "
+"обнаружения устройств (сообщение об ошибке «spurious 8259A interrupt: "
+"IRQ7»). Если с вашим компьютером случаются такие проблемы, отключите APIC и/"
+"или локальный APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakboot--boot.xml:80
@@ -616,8 +1062,24 @@ msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:84
-msgid "In the <guibutton>Next</guibutton> screen, you can see the list of all the available entries at boot time. The default one is asterisked. To change the order of the menu entries, click on the up or down arrows to move the selected item. If you click on the <guibutton>Add</guibutton> or <guibutton>Modify </guibutton>buttons, a new window appears to add a new entry in the Grub menu or to modify an existing one. You need to be familiar with Lilo or Grub to be able to use these tools."
-msgstr "После нажатия кнопки <guibutton>Далее</guibutton> вы увидите список всех доступных пунктов меню загрузки. Пункт по умолчанию помечен звёздочкой. Чтобы изменить порядок пунктов меню, отметьте какой-либо из пунктов и нажмите кнопку со стрелкой вверх или вниз, чтобы переместить его. В ответ на нажатие кнопки <guibutton>Добавить</guibutton> или <guibutton>Изменить</guibutton> будет показано новое окно, с помощью которого вы сможете добавить новый пункт меню Grub или изменить уже существующий пункт меню. Не используйте эти кнопки, если вы не знакомы с синтаксисом команд Lilo или Grub."
+msgid ""
+"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
+"available entries at boot time. The default one is asterisked. To change the "
+"order of the menu entries, click on the up or down arrows to move the "
+"selected item. If you click on the <guibutton>Add</guibutton> or "
+"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
+"entry in the Grub menu or to modify an existing one. You need to be familiar "
+"with Lilo or Grub to be able to use these tools."
+msgstr ""
+"После нажатия кнопки <guibutton>Далее</guibutton> вы увидите список всех "
+"доступных пунктов меню загрузки. Пункт по умолчанию помечен звёздочкой. "
+"Чтобы изменить порядок пунктов меню, отметьте какой-либо из пунктов и "
+"нажмите кнопку со стрелкой вверх или вниз, чтобы переместить его. В ответ на "
+"нажатие кнопки <guibutton>Добавить</guibutton> или <guibutton>Изменить</"
+"guibutton> будет показано новое окно, с помощью которого вы сможете добавить "
+"новый пункт меню Grub или изменить уже существующий пункт меню. Не "
+"используйте эти кнопки, если вы не знакомы с синтаксисом команд Lilo или "
+"Grub."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakboot--boot.xml:94
@@ -626,33 +1088,63 @@ msgstr "drakboot2.png"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:98
-msgid "The <guilabel>Label</guilabel> field is freeform, write here what you want to be displayed in the menu. It matches the Grub command \"title\". For example: Mageia3."
-msgstr "Содержимое поля <guilabel>Метка</guilabel> может быть произвольным. Сюда вы можете вписать что угодно, что хотите видеть в меню. Этот пункт соответствует команде Grub «title». Пример: Mageia3."
+msgid ""
+"The <guilabel>Label</guilabel> field is freeform, write here what you want "
+"to be displayed in the menu. It matches the Grub command \"title\". For "
+"example: Mageia3."
+msgstr ""
+"Содержимое поля <guilabel>Метка</guilabel> может быть произвольным. Сюда вы "
+"можете вписать что угодно, что хотите видеть в меню. Этот пункт "
+"соответствует команде Grub «title». Пример: Mageia3."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:102
-msgid "The <guilabel>Image</guilabel> field contains the kernel name. It matches the Grub command \"kernel\". For example /boot/vmlinuz."
-msgstr "В поле <guilabel>Образ</guilabel> должно быть указано название ядра. Этот пункт соответствует команде Grub «kernel». Пример: /boot/vmlinuz."
+msgid ""
+"The <guilabel>Image</guilabel> field contains the kernel name. It matches "
+"the Grub command \"kernel\". For example /boot/vmlinuz."
+msgstr ""
+"В поле <guilabel>Образ</guilabel> должно быть указано название ядра. Этот "
+"пункт соответствует команде Grub «kernel». Пример: /boot/vmlinuz."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:105
-msgid "The <guilabel>Root</guilabel> field contains the device name where the kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
-msgstr "В поле <guilabel>Корень</guilabel> должно быть указано название устройства, на котором хранится ядро. Этот пункт соответствует команде Grub «root». Пример: (hd0,1)."
+msgid ""
+"The <guilabel>Root</guilabel> field contains the device name where the "
+"kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
+msgstr ""
+"В поле <guilabel>Корень</guilabel> должно быть указано название устройства, "
+"на котором хранится ядро. Этот пункт соответствует команде Grub «root». "
+"Пример: (hd0,1)."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:109
-msgid "The <guilabel>Append</guilabel> field contains the options to be given to the kernel at boot time."
-msgstr "В поле <guilabel>Добавить</guilabel> должны быть указаны параметры, которые передаются ядру во время загрузки."
+msgid ""
+"The <guilabel>Append</guilabel> field contains the options to be given to "
+"the kernel at boot time."
+msgstr ""
+"В поле <guilabel>Добавить</guilabel> должны быть указаны параметры, которые "
+"передаются ядру во время загрузки."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:112
-msgid "If the box <guilabel>Default</guilabel> is checked, Grub will boot this entry by default."
-msgstr "Если будет выбрана опция <guilabel>По умолчанию</guilabel>, Grub загружает соответствующую систему по умолчанию."
+msgid ""
+"If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
+"entry by default."
+msgstr ""
+"Если будет выбрана опция <guilabel>По умолчанию</guilabel>, Grub загружает "
+"соответствующую систему по умолчанию."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:115
-msgid "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> file and a <xref linkend=\"draknetprofile\"></xref> in the drop-down lists."
-msgstr "С помощью дополнительного окна, открыть которое можно нажатием кнопки <guilabel>Дополнительно</guilabel>, <guilabel>Режим видео</guilabel>, <guilabel>initrd</guilabel> и <xref linkend=\"draknetprofile\">Сетевой профиль</xref> из выпадающих списков."
+msgid ""
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
+"file and a <xref linkend=\"draknetprofile\"></xref> in the drop-down lists."
+msgstr ""
+"С помощью дополнительного окна, открыть которое можно нажатием кнопки "
+"<guilabel>Дополнительно</guilabel>, <guilabel>Режим видео</guilabel>, "
+"<guilabel>initrd</guilabel> и <xref linkend=\"draknetprofile\">Сетевой "
+"профиль</xref> из выпадающих списков."
 
 #. type: Content of: <section><info><title>
 #: en/drakboot.xml:3
@@ -671,18 +1163,36 @@ msgstr "drakboot.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakboot.xml:16
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakboot</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakboot</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakboot</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:15
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to automatically login the same user, in her/his desktop environment, without asking for any password. It's called autologin.  This is generally a good idea when there is only one user like to be using the machine."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> можно приказать системе загружаться в аккаунт того же пользователя и в той же рабочей среде без необходимости ввода пароля. Такая возможность называется автовход. Как правило, такой способ загрузки является удобным, если компьютером будет пользоваться только один пользователь."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> можно "
+"приказать системе загружаться в аккаунт того же пользователя и в той же "
+"рабочей среде без необходимости ввода пароля. Такая возможность называется "
+"автовход. Как правило, такой способ загрузки является удобным, если "
+"компьютером будет пользоваться только один пользователь."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:22
-msgid "It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the Mageia Control Center labelled \"Set up autologin to automatically log in\"."
-msgstr "Доступ к этой программе можно получить с помощью пункта <emphasis role=\"bold\">«Загрузка»</emphasis> из Центра управления Mageia. Раздел «Настройка автовхода»."
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Доступ к этой программе можно получить с помощью пункта <emphasis role=\"bold"
+"\">«Загрузка»</emphasis> из Центра управления Mageia. Раздел «Настройка "
+"автовхода»."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:26
@@ -691,18 +1201,44 @@ msgstr "Назначение кнопок интерфейса является
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:28
-msgid "Check <guibutton>Launch the graphical environment when your system starts</guibutton>, if you want X Window System to be executed after the boot. If not, the system will start in text mode. Nevertheless, it will be possible to launch the graphic interface manually. This can be done by launching the command 'startx' or 'systemctl start dm'."
-msgstr "Отметьте пункт <guibutton>Запускать графическую оболочку при загрузке</guibutton>, если вы хотите запускать систему X Window во время загрузки. Если параметр отмечен не будет, система запустится в текстовом режиме. Впрочем, графический интерфейс можно будет запустить из текстового режима вручную. Сделать это можно с помощью команды 'startx' или 'systemctl start dm'."
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Отметьте пункт <guibutton>Запускать графическую оболочку при загрузке</"
+"guibutton>, если вы хотите запускать систему X Window во время загрузки. "
+"Если параметр отмечен не будет, система запустится в текстовом режиме. "
+"Впрочем, графический интерфейс можно будет запустить из текстового режима "
+"вручную. Сделать это можно с помощью команды 'startx' или 'systemctl start "
+"dm'."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:34
-msgid "If the first box is checked, two other options are available, check either <guibutton>No, I don't want autologin</guibutton>, if you want the system to continue to ask for which user to connect (and password) or check <guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if needed. In this case, you also need to supply the <guilabel>Default username</guilabel> and the <guilabel>Default desktop</guilabel>."
-msgstr "Если установлен первый пункт, вы получите доступ к двум другим пунктам. Вы можете выбрать пункт <guibutton>Нет, я не хочу использовать автоматический вход</guibutton>, если вы хотите, чтобы система продолжала спрашивать вас о том, под какой из учётных записей пользователей следует войти и будет просить ввести пароль. Другим вариантом является обозначение пункта <guibutton>Да, я хочу осуществлять автовход под этим (пользователем, рабочим столом)</guibutton>, в этом случае вам следует указать значения параметров <guilabel>Пользователь</guilabel> и <guilabel>Рабочий стол</guilabel>."
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Если установлен первый пункт, вы получите доступ к двум другим пунктам. Вы "
+"можете выбрать пункт <guibutton>Нет, я не хочу использовать автоматический "
+"вход</guibutton>, если вы хотите, чтобы система продолжала спрашивать вас о "
+"том, под какой из учётных записей пользователей следует войти и будет "
+"просить ввести пароль. Другим вариантом является обозначение пункта "
+"<guibutton>Да, я хочу осуществлять автовход под этим (пользователем, рабочим "
+"столом)</guibutton>, в этом случае вам следует указать значения параметров "
+"<guilabel>Пользователь</guilabel> и <guilabel>Рабочий стол</guilabel>."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
 msgid "Collect Logs and System Information for Bug Reports"
-msgstr "Сбор данных из журналов (логов) и системы для создания отчётов о проблемах"
+msgstr ""
+"Сбор данных из журналов (логов) и системы для создания отчётов о проблемах"
 
 #. type: Content of: <section><info><subtitle>
 #: en/drakbug_report.xml:12
@@ -711,23 +1247,45 @@ msgstr "drakbug_report"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakbug_report.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakbug_report</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakbug_report</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakbug_report</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakbug_report</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/drakbug_report.xml:15
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> can only be started and used on the command line."
-msgstr "Эту программу<placeholder type=\"footnote\" id=\"0\"/> можно запустить только из командной строки."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can only be started and "
+"used on the command line."
+msgstr ""
+"Эту программу<placeholder type=\"footnote\" id=\"0\"/> можно запустить "
+"только из командной строки."
 
 #. type: Content of: <section><para>
 #: en/drakbug_report.xml:20
-msgid "It is advised to write the output of this command to a file, for instance by doing <emphasis role=\"bold\">drakbug_report > drakbugreport.txt</emphasis>, but make sure you have enough disk space first: the file can easily be several GBs large."
-msgstr "Вам стоит вывести данные, полученные с помощью этой программы, в файл например так: <emphasis role=\"bold\">drakbug_report > drakbugreport.txt</emphasis>. Впрочем, сначала следует убедиться, что в системе есть достаточно свободного места на диске: объём файла может достичь значения в несколько гигабайт."
+msgid ""
+"It is advised to write the output of this command to a file, for instance by "
+"doing <emphasis role=\"bold\">drakbug_report > drakbugreport.txt</emphasis>, "
+"but make sure you have enough disk space first: the file can easily be "
+"several GBs large."
+msgstr ""
+"Вам стоит вывести данные, полученные с помощью этой программы, в файл "
+"например так: <emphasis role=\"bold\">drakbug_report > drakbugreport.txt</"
+"emphasis>. Впрочем, сначала следует убедиться, что в системе есть достаточно "
+"свободного места на диске: объём файла может достичь значения в несколько "
+"гигабайт."
 
 #. type: Content of: <section><note><para>
 #: en/drakbug_report.xml:24
-msgid "The output is far too large to attach to a bug report without first removing the unneeded parts."
-msgstr "Выведенные данные слишком велики, чтобы прикрепить их к сообщению об ошибке, без предварительного удаления ненужных частей."
+msgid ""
+"The output is far too large to attach to a bug report without first removing "
+"the unneeded parts."
+msgstr ""
+"Выведенные данные слишком велики, чтобы прикрепить их к сообщению об ошибке, "
+"без предварительного удаления ненужных частей."
 
 #. type: Content of: <section><para>
 #: en/drakbug_report.xml:26
@@ -901,8 +1459,24 @@ msgstr "df"
 
 #. type: Content of: <section><note><para>
 #: en/drakbug_report.xml:65
-msgid "At the time this help page was written, the \"syslog\" part of this command's output was empty, because this tool had not yet been adjusted to our switch to systemd. If it is still empty, you can retrieve the \"syslog\" by doing (as root) <emphasis role=\"bold\"> journalctl -a > journalctl.txt</emphasis>. If you don't have a lot of diskspace, you can, for instance, take the last 5000 lines of the log instead with: <emphasis role=\"bold\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
-msgstr "Во время написания этой страницы справки, часть «syslog» выведенных этой программой данных была пустой, поскольку эта утилита ещё не приспособлена к новой системе ведения журнала, используемой в systemd. Если в вашей системе эта часть является пустой, получить соответствующие данные можно с помощью следующей команды (команду следует отдавать от имени пользователя root): <emphasis role=\"bold\"> journalctl -a > journalctl.txt</emphasis>. Если на диске не слишком много места, вы можете, например, вывести лишь последние 5000 строк журнала: <emphasis role=\"bold\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
+msgid ""
+"At the time this help page was written, the \"syslog\" part of this "
+"command's output was empty, because this tool had not yet been adjusted to "
+"our switch to systemd. If it is still empty, you can retrieve the \"syslog\" "
+"by doing (as root) <emphasis role=\"bold\"> journalctl -a > journalctl.txt</"
+"emphasis>. If you don't have a lot of diskspace, you can, for instance, take "
+"the last 5000 lines of the log instead with: <emphasis role=\"bold"
+"\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
+msgstr ""
+"Во время написания этой страницы справки, часть «syslog» выведенных этой "
+"программой данных была пустой, поскольку эта утилита ещё не приспособлена к "
+"новой системе ведения журнала, используемой в systemd. Если в вашей системе "
+"эта часть является пустой, получить соответствующие данные можно с помощью "
+"следующей команды (команду следует отдавать от имени пользователя root): "
+"<emphasis role=\"bold\"> journalctl -a > journalctl.txt</emphasis>. Если на "
+"диске не слишком много места, вы можете, например, вывести лишь последние "
+"5000 строк журнала: <emphasis role=\"bold\">journalctl -a | tail -n5000 > "
+"journalctl5000.txt</emphasis>."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug.xml:9
@@ -921,23 +1495,51 @@ msgstr "drakbug.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakbug.xml:19
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakbug</emphasis>."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakbug</emphasis>."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakbug</emphasis>."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakbug</emphasis>."
 
 #. type: Content of: <section><para>
 #: en/drakbug.xml:19
-msgid "Usually, this tool<placeholder type=\"footnote\" id=\"0\"/> starts automatically when a Mageia tool crashes. However, it is also possible that, after filing a bug report, you are asked to start this tool to check some of the information it gives, and then provide that in that existing bug report."
-msgstr "Обычно этот инструмент<placeholder type=\"footnote\" id=\"0\"/> запускается автоматически после сбоя какой-либо программы Mageia. Впрочем, может так случиться, что после создания отчёта об ошибках вас попросят запустить этот инструмент для проверки предоставленных им данных с последующим предоставлением их в уже созданном отчёте об ошибках."
+msgid ""
+"Usually, this tool<placeholder type=\"footnote\" id=\"0\"/> starts "
+"automatically when a Mageia tool crashes. However, it is also possible that, "
+"after filing a bug report, you are asked to start this tool to check some of "
+"the information it gives, and then provide that in that existing bug report."
+msgstr ""
+"Обычно этот инструмент<placeholder type=\"footnote\" id=\"0\"/> запускается "
+"автоматически после сбоя какой-либо программы Mageia. Впрочем, может так "
+"случиться, что после создания отчёта об ошибках вас попросят запустить этот "
+"инструмент для проверки предоставленных им данных с последующим "
+"предоставлением их в уже созданном отчёте об ошибках."
 
 #. type: Content of: <section><para>
 #: en/drakbug.xml:21
-msgid "If a new bug report needs to be filed and you are not used to doing that, then please read <link xlink:href=\"https://wiki.mageia.org/en/How_to_report_a_bug_properly\">How to report a bug report properly</link> before clicking on the \"Report\" button."
-msgstr "Если возникнет потребность в создании отчёта об ошибках, а вы этого еще никогда не делали, пожалуйста, ознакомьтесь со страницей <link xlink:href=\"https://wiki.mageia.org/en/How_to_report_a_bug_properly\">Как создать надлежащий отчёт об ошибках</link>, прежде чем нажимать кнопку «Отчёт»."
+msgid ""
+"If a new bug report needs to be filed and you are not used to doing that, "
+"then please read <link xlink:href=\"https://wiki.mageia.org/en/"
+"How_to_report_a_bug_properly\">How to report a bug report properly</link> "
+"before clicking on the \"Report\" button."
+msgstr ""
+"Если возникнет потребность в создании отчёта об ошибках, а вы этого еще "
+"никогда не делали, пожалуйста, ознакомьтесь со страницей <link xlink:href="
+"\"https://wiki.mageia.org/en/How_to_report_a_bug_properly\">Как создать "
+"надлежащий отчёт об ошибках</link>, прежде чем нажимать кнопку «Отчёт»."
 
 #. type: Content of: <section><para>
 #: en/drakbug.xml:23
-msgid "In case the bug has already been filed by someone else (the error message that drakbug gave will be the same, then), it is useful to add a comment to that existing report that you saw the bug, too."
-msgstr "Если отчёт об этой ошибке уже оформлен кем-то другим (в этом случае сообщение об ошибках, созданное drakbug, будет тем же), стоит добавить комментарий к этому отчёту, чтобы разработчики увидели, что ошибка встречается не только в одной системе."
+msgid ""
+"In case the bug has already been filed by someone else (the error message "
+"that drakbug gave will be the same, then), it is useful to add a comment to "
+"that existing report that you saw the bug, too."
+msgstr ""
+"Если отчёт об этой ошибке уже оформлен кем-то другим (в этом случае "
+"сообщение об ошибках, созданное drakbug, будет тем же), стоит добавить "
+"комментарий к этому отчёту, чтобы разработчики увидели, что ошибка "
+"встречается не только в одной системе."
 
 #. type: Content of: <section><info><title>
 #: en/drakclock.xml:3
@@ -956,13 +1558,27 @@ msgstr "drakclock.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakclock.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakclock</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakclock</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakclock</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakclock</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:14
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the tab System in the Mageia Control Center labelled <guilabel>\"Manage date and time\"</guilabel>. In some desktop environments it is also available by a right click / Adjust date and Time ... on the clock in the system tray."
-msgstr "Эту программу<placeholder type=\"footnote\" id=\"0\"/> можно запустить с помощью пункта «Система» из Центра управления Mageia. Соответствующий раздел подписан как <guilabel>Настроить дату и время</guilabel>. В некоторых средах рабочего стола эту программу можно запустить с помощью щелчка правой кнопки мыши на виджете часы в системном лотке с последующим выбором пункта «Настроить дату и время...»."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the tab "
+"System in the Mageia Control Center labelled <guilabel>\"Manage date and time"
+"\"</guilabel>. In some desktop environments it is also available by a right "
+"click / Adjust date and Time ... on the clock in the system tray."
+msgstr ""
+"Эту программу<placeholder type=\"footnote\" id=\"0\"/> можно запустить с "
+"помощью пункта «Система» из Центра управления Mageia. Соответствующий раздел "
+"подписан как <guilabel>Настроить дату и время</guilabel>. В некоторых средах "
+"рабочего стола эту программу можно запустить с помощью щелчка правой кнопки "
+"мыши на виджете часы в системном лотке с последующим выбором пункта "
+"«Настроить дату и время...»."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:21
@@ -971,28 +1587,72 @@ msgstr "Это очень простая программа."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:23
-msgid "On the upper left part, is the <emphasis role=\"bold\">calendar</emphasis>. On the screenshot above, the date is September (on the upper left), 2012 (on the upper right), the 2nd (in blue)  and it is a Sunday. Select the month (or year) by clicking on the little arrows on each side of September (or 2012). Select the day by clicking on its number."
-msgstr "В верхней левой части расположена панель <emphasis role=\"bold\">календарь</emphasis>. На приведенном выше скриншоте показана дата: «апрель» (в верхнем левом углу), 2013 (в верхнем правом углу), 6 число (синим цветом), воскресенье. Выбрать месяц (или год) можно нажатием маленьких стрелочек по бокам от надписи «апрель» (или «2013»). День можно выбрать нажатием соответствующего пункта в календаре."
+msgid ""
+"On the upper left part, is the <emphasis role=\"bold\">calendar</emphasis>. "
+"On the screenshot above, the date is September (on the upper left), 2012 (on "
+"the upper right), the 2nd (in blue)  and it is a Sunday. Select the month "
+"(or year) by clicking on the little arrows on each side of September (or "
+"2012). Select the day by clicking on its number."
+msgstr ""
+"В верхней левой части расположена панель <emphasis role=\"bold\">календарь</"
+"emphasis>. На приведенном выше скриншоте показана дата: «апрель» (в верхнем "
+"левом углу), 2013 (в верхнем правом углу), 6 число (синим цветом), "
+"воскресенье. Выбрать месяц (или год) можно нажатием маленьких стрелочек по "
+"бокам от надписи «апрель» (или «2013»). День можно выбрать нажатием "
+"соответствующего пункта в календаре."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:29
-msgid "On the bottom left is the <emphasis role=\"bold\">Network Time Protocol</emphasis> synchronising, it is possible to have a clock always on time by synchronising it with a server. Check <guilabel>Enable Network Time Protocol</guilabel> and choose the closest server."
-msgstr "В нижней левой части окна находится панель синхронизации <emphasis role=\"bold\">Протокол сетевого времени</emphasis>. Вы можете поддерживать всегда точные показания часов с помощью синхронизации времени с сервером. Выберите <guilabel>Включить протокол сетевого времени</guilabel> и выберите ближайший к вашему местоположению сервер."
+msgid ""
+"On the bottom left is the <emphasis role=\"bold\">Network Time Protocol</"
+"emphasis> synchronising, it is possible to have a clock always on time by "
+"synchronising it with a server. Check <guilabel>Enable Network Time "
+"Protocol</guilabel> and choose the closest server."
+msgstr ""
+"В нижней левой части окна находится панель синхронизации <emphasis role="
+"\"bold\">Протокол сетевого времени</emphasis>. Вы можете поддерживать всегда "
+"точные показания часов с помощью синхронизации времени с сервером. Выберите "
+"<guilabel>Включить протокол сетевого времени</guilabel> и выберите ближайший "
+"к вашему местоположению сервер."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:34
-msgid "On the right part is the <emphasis role=\"bold\">clock</emphasis>. It's useless to set the clock if NTP is enabled. Three boxes display hours, minutes and seconds (15, 28 and 22 on the screenshot). Use the little arrows to set the clock to the correct time. The format can't be changed here, see your desktop environment settings for that."
-msgstr "В правой части окна находится панель <emphasis role=\"bold\">часы</emphasis>. Если включено NTP, изменение показаний данных на ней не имеет смысла. В трех полях часов показано значение часов, минут и секунд (17, 8 и 13 на скриншоте). Воспользуйтесь небольшими стрелочками, чтобы установить на часах должное значение времени. Формат показа времени изменить нельзя. Для изменения формата показа, воспользуйтесь соответствующей программой вашего рабочего окружения."
+msgid ""
+"On the right part is the <emphasis role=\"bold\">clock</emphasis>. It's "
+"useless to set the clock if NTP is enabled. Three boxes display hours, "
+"minutes and seconds (15, 28 and 22 on the screenshot). Use the little arrows "
+"to set the clock to the correct time. The format can't be changed here, see "
+"your desktop environment settings for that."
+msgstr ""
+"В правой части окна находится панель <emphasis role=\"bold\">часы</"
+"emphasis>. Если включено NTP, изменение показаний данных на ней не имеет "
+"смысла. В трех полях часов показано значение часов, минут и секунд (17, 8 и "
+"13 на скриншоте). Воспользуйтесь небольшими стрелочками, чтобы установить на "
+"часах должное значение времени. Формат показа времени изменить нельзя. Для "
+"изменения формата показа, воспользуйтесь соответствующей программой вашего "
+"рабочего окружения."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:40
-msgid "At least, on the bottom right, select your time zone by clicking on the <guibutton>Change Time Zone</guibutton> button and choosing in the list the nearest town."
-msgstr "Наконец, в правой нижней части окна можно выбрать часовой пояс. Для этого следует нажать кнопку <guibutton>Изменить часовой пояс</guibutton> и выбрать соответствующий пункт из предоставленного списка."
+msgid ""
+"At least, on the bottom right, select your time zone by clicking on the "
+"<guibutton>Change Time Zone</guibutton> button and choosing in the list the "
+"nearest town."
+msgstr ""
+"Наконец, в правой нижней части окна можно выбрать часовой пояс. Для этого "
+"следует нажать кнопку <guibutton>Изменить часовой пояс</guibutton> и выбрать "
+"соответствующий пункт из предоставленного списка."
 
 #. type: Content of: <section><note><para>
 #: en/drakclock.xml:45
-msgid "Even if it isn't possible to choose a date or time format in this tool, they will be displayed on your desktop in accordance with the localisation settings."
-msgstr "Несмотря на то, что выбрать формат даты и времени с помощью этой программы невозможно, эти данные будут показаны на вашем рабочем столе в соответствии с указанными вами параметрами локализации."
+msgid ""
+"Even if it isn't possible to choose a date or time format in this tool, they "
+"will be displayed on your desktop in accordance with the localisation "
+"settings."
+msgstr ""
+"Несмотря на то, что выбрать формат даты и времени с помощью этой программы "
+"невозможно, эти данные будут показаны на вашем рабочем столе в соответствии "
+"с указанными вами параметрами локализации."
 
 #. type: Content of: <section><info><title>
 #: en/drakconnect--del.xml:3
@@ -1011,22 +1671,37 @@ msgstr "drakconnect--del.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakconnect--del.xml:12
-msgid "You can also start this tool from the command line, by typing <emphasis role=\"bold\">drakconnect --del</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakconnect --del</emphasis> от имени администратора (root)."
+msgid ""
+"You can also start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconnect --del</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakconnect --del</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/drakconnect--del.xml:12
-msgid "Here, you can delete a network interface<placeholder type=\"footnote\" id=\"0\"/>."
-msgstr "С помощью окна программы вы можете удалить сетевой интерфейс<placeholder type=\"footnote\" id=\"0\"/>."
+msgid ""
+"Here, you can delete a network interface<placeholder type=\"footnote\" id="
+"\"0\"/>."
+msgstr ""
+"С помощью окна программы вы можете удалить сетевой интерфейс<placeholder "
+"type=\"footnote\" id=\"0\"/>."
 
 #. type: Content of: <section><para>
 #: en/drakconnect--del.xml:14
-msgid "Click on the drop down menu, choose the one you want to remove and then click <emphasis>next</emphasis>."
-msgstr "Нажмите пункт выпадающего меню, выберите пункт, который следует удалить, а затем нажмите кнопку <emphasis>Далее</emphasis>."
+msgid ""
+"Click on the drop down menu, choose the one you want to remove and then "
+"click <emphasis>next</emphasis>."
+msgstr ""
+"Нажмите пункт выпадающего меню, выберите пункт, который следует удалить, а "
+"затем нажмите кнопку <emphasis>Далее</emphasis>."
 
 #. type: Content of: <section><para>
 #: en/drakconnect--del.xml:15
-msgid "You'll see a message that the network interface has been deleted successfully."
+msgid ""
+"You'll see a message that the network interface has been deleted "
+"successfully."
 msgstr "Программа покажет сообщение, что сетевой интерфейс был успешно удален."
 
 #. type: Content of: <section><info><title>
@@ -1046,18 +1721,35 @@ msgstr "drakconnect.png"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakconnect.xml:19
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakconnect</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakconnect</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconnect</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakconnect</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><section><para>
 #: en/drakconnect.xml:18
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> allows to configure much of local network or Internet access. You have to know some information from your access provider or your network administrator."
-msgstr "С помощью этого модуля<placeholder type=\"footnote\" id=\"0\"/> вы можете настроить доступ вашего компьютера к локальной сети или интернету. Вам понадобятся некоторые данные от вашей компании-поставщика услуг (провайдера) или администратора вашей сети."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows to configure much "
+"of local network or Internet access. You have to know some information from "
+"your access provider or your network administrator."
+msgstr ""
+"С помощью этого модуля<placeholder type=\"footnote\" id=\"0\"/> вы можете "
+"настроить доступ вашего компьютера к локальной сети или интернету. Вам "
+"понадобятся некоторые данные от вашей компании-поставщика услуг (провайдера) "
+"или администратора вашей сети."
 
 #. type: Content of: <section><section><para>
 #: en/drakconnect.xml:25
-msgid "Select the type of connection you want to set, according to which hardware and provider you have."
-msgstr "Выберите тип соединения, которое нужно настроить. Тип определяется используемым вами оборудованием и параметрами работы компании-поставщика услуг (провайдером)."
+msgid ""
+"Select the type of connection you want to set, according to which hardware "
+"and provider you have."
+msgstr ""
+"Выберите тип соединения, которое нужно настроить. Тип определяется "
+"используемым вами оборудованием и параметрами работы компании-поставщика "
+"услуг (провайдером)."
 
 #. type: Content of: <section><section><title>
 #: en/drakconnect.xml:30
@@ -1065,28 +1757,52 @@ msgid "A new Wired connection (Ethernet)"
 msgstr "Новое проводное соединение (Ethernet)"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/drakconnect.xml:34
-#: en/drakconnect.xml:162
-msgid "The first window lists the interfaces which are available.  Select the one to configure."
-msgstr "В первом окне будет показан список доступных интерфейсов. Выберите тот из них, который следует настроить."
+#: en/drakconnect.xml:34 en/drakconnect.xml:162
+msgid ""
+"The first window lists the interfaces which are available.  Select the one "
+"to configure."
+msgstr ""
+"В первом окне будет показан список доступных интерфейсов. Выберите тот из "
+"них, который следует настроить."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/drakconnect.xml:39
-#: en/drakconnect.xml:167
-msgid "At this point, the choice is given between an automatic or a manual IP address."
-msgstr "На этом шаге можно определиться со способом получения компьютером IP-адреса: автоматически или вручную."
+#: en/drakconnect.xml:39 en/drakconnect.xml:167
+msgid ""
+"At this point, the choice is given between an automatic or a manual IP "
+"address."
+msgstr ""
+"На этом шаге можно определиться со способом получения компьютером IP-адреса: "
+"автоматически или вручную."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/drakconnect.xml:44
-#: en/drakconnect.xml:187
-#: en/drakconnect.xml:557
+#: en/drakconnect.xml:44 en/drakconnect.xml:187 en/drakconnect.xml:557
 msgid "Automatic IP"
 msgstr "Автоматический IP"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:48
-msgid "<emphasis>Ethernet/IP settings</emphasis>: you have to select if DNS servers are declared by the DHCP server or are manually specified, as explained below. In the last case, the IP address of DNS servers has to be set. The HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, the name <literal>localhost.localdomain</literal> is attributed by default.  The Hostname can also be provided by the DHCP server with the option <emphasis>Assign host name from DHCP server</emphasis>. Not all DHCP servers have such a function and if you're setting up your PC to get an IP address from a domestic ADSL router, it is unlikely."
-msgstr "<emphasis>Ethernet/Параметры IP</emphasis>: вам следует определить, будет ли получать компьютер, данные о DNS-серверах с сервера DHCP или эти данные будут указаны вручную, как описано ниже. Во втором случае вам нужно будет указать адреса DNS-серверов. Здесь также можно указать название узла компьютера. Если название узла указано не будет, будет назначено название по умолчанию, <literal>localhost.localdomain</literal>. Название узла может быть предоставлено сервером DHCP, если будет отмечен пункт <emphasis>Определить имя узла с адреса DHCP</emphasis>. Возможность, определения названия узла, предусмотрена не на всех серверах DHCP. Если вы настраиваете ваш компьютер на получение IP-адреса с домашнего маршрутизатора ADSL, вряд ли следует обозначать этот пункт."
+msgid ""
+"<emphasis>Ethernet/IP settings</emphasis>: you have to select if DNS servers "
+"are declared by the DHCP server or are manually specified, as explained "
+"below. In the last case, the IP address of DNS servers has to be set. The "
+"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, "
+"the name <literal>localhost.localdomain</literal> is attributed by default.  "
+"The Hostname can also be provided by the DHCP server with the option "
+"<emphasis>Assign host name from DHCP server</emphasis>. Not all DHCP servers "
+"have such a function and if you're setting up your PC to get an IP address "
+"from a domestic ADSL router, it is unlikely."
+msgstr ""
+"<emphasis>Ethernet/Параметры IP</emphasis>: вам следует определить, будет ли "
+"получать компьютер, данные о DNS-серверах с сервера DHCP или эти данные "
+"будут указаны вручную, как описано ниже. Во втором случае вам нужно будет "
+"указать адреса DNS-серверов. Здесь также можно указать название узла "
+"компьютера. Если название узла указано не будет, будет назначено название по "
+"умолчанию, <literal>localhost.localdomain</literal>. Название узла может "
+"быть предоставлено сервером DHCP, если будет отмечен пункт "
+"<emphasis>Определить имя узла с адреса DHCP</emphasis>. Возможность, "
+"определения названия узла, предусмотрена не на всех серверах DHCP. Если вы "
+"настраиваете ваш компьютер на получение IP-адреса с домашнего маршрутизатора "
+"ADSL, вряд ли следует обозначать этот пункт."
 
 #. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:62
@@ -1094,81 +1810,109 @@ msgid "drakconnect5.png"
 msgstr "drakconnect5.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
-#: en/drakconnect.xml:68
-#: en/drakconnect.xml:205
-#: en/drakconnect.xml:572
+#: en/drakconnect.xml:68 en/drakconnect.xml:205 en/drakconnect.xml:572
 msgid "The advanced button give the opportunity to specify:"
-msgstr "С помощью кнопки <guibutton>Дополнительно</guibutton> можно дополнительно указать следующие параметры:"
+msgstr ""
+"С помощью кнопки <guibutton>Дополнительно</guibutton> можно дополнительно "
+"указать следующие параметры:"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
-#: en/drakconnect.xml:72
-#: en/drakconnect.xml:209
-#: en/drakconnect.xml:576
+#: en/drakconnect.xml:72 en/drakconnect.xml:209 en/drakconnect.xml:576
 msgid "Search domain (not accessible, as provided by the DHCP server)"
-msgstr "Поиск имён доменов (недоступно, если адрес предоставляется сервером DHCP)"
+msgstr ""
+"Поиск имён доменов (недоступно, если адрес предоставляется сервером DHCP)"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
-#: en/drakconnect.xml:77
-#: en/drakconnect.xml:214
-#: en/drakconnect.xml:581
+#: en/drakconnect.xml:77 en/drakconnect.xml:214 en/drakconnect.xml:581
 msgid "the DHCP client"
 msgstr "Клиент DHCP"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
-#: en/drakconnect.xml:81
-#: en/drakconnect.xml:218
-#: en/drakconnect.xml:585
+#: en/drakconnect.xml:81 en/drakconnect.xml:218 en/drakconnect.xml:585
 msgid "DHCP timeout"
 msgstr "Задержка DHCP"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
-#: en/drakconnect.xml:85
-#: en/drakconnect.xml:222
+#: en/drakconnect.xml:85 en/drakconnect.xml:222
 msgid "Get YP server from DHCP (checked by default): specify the NIS server"
 msgstr "Получить серверы YP с DHCP (по умолчанию включен): укажите сервер NIS"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
-#: en/drakconnect.xml:90
-#: en/drakconnect.xml:227
-#: en/drakconnect.xml:594
+#: en/drakconnect.xml:90 en/drakconnect.xml:227 en/drakconnect.xml:594
 msgid "Get NTPD server from DHCP (synchronisation of clocks)"
-msgstr "Получить серверы NTPD от DHCP (определяет сервер синхронизации времени)"
+msgstr ""
+"Получить серверы NTPD от DHCP (определяет сервер синхронизации времени)"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
-#: en/drakconnect.xml:95
-#: en/drakconnect.xml:232
-#: en/drakconnect.xml:599
-msgid "the HOSTNAME required by DHCP. Only use this option if the DHCP server requires the client to specify a hostname before receiving an IP address. This option is not dealt by some DHCP servers."
-msgstr "DHCP требуется имя узла. Используйте эту опцию только в случае, если DHCP-сервер требует от клиента указать имя узла до получения IP-адреса. Этот вариант не рассматривается некоторыми серверами DHCP."
+#: en/drakconnect.xml:95 en/drakconnect.xml:232 en/drakconnect.xml:599
+msgid ""
+"the HOSTNAME required by DHCP. Only use this option if the DHCP server "
+"requires the client to specify a hostname before receiving an IP address. "
+"This option is not dealt by some DHCP servers."
+msgstr ""
+"DHCP требуется имя узла. Используйте эту опцию только в случае, если DHCP-"
+"сервер требует от клиента указать имя узла до получения IP-адреса. Этот "
+"вариант не рассматривается некоторыми серверами DHCP."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
-#: en/drakconnect.xml:104
-#: en/drakconnect.xml:241
-msgid "After accepting, the last steps which are common to all connection configurations are explained: <xref linkend=\"drakconnect-end\"/>"
-msgstr "После подтверждения внесённых изменений, следующие шаги настройки могут быть выполнены для всех типов соединения способом: <xref linkend=\"drakconnect-end\"/>"
+#: en/drakconnect.xml:104 en/drakconnect.xml:241
+msgid ""
+"After accepting, the last steps which are common to all connection "
+"configurations are explained: <xref linkend=\"drakconnect-end\"/>"
+msgstr ""
+"После подтверждения внесённых изменений, следующие шаги настройки могут быть "
+"выполнены для всех типов соединения способом: <xref linkend=\"drakconnect-end"
+"\"/>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/drakconnect.xml:111
-#: en/drakconnect.xml:248
-#: en/drakconnect.xml:615
+#: en/drakconnect.xml:111 en/drakconnect.xml:248 en/drakconnect.xml:615
 msgid "Manual configuration"
 msgstr "Настройка вручную"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:115
-msgid "<emphasis>Ethernet/IP settings</emphasis>: you need to declare what DNS servers to use. The HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, the name <literal>localhost.localdomain</literal> is attributed by default."
-msgstr "<emphasis>Ethernet/Параметры IP</emphasis>: вам следует определить, будет ли получать компьютер данные о DNS-серверах с сервера DHCP или эти данные будут указаны вручную, как описано ниже. Во втором случае вам нужно будет указать адреса DNS-серверов. Здесь также можно указать название узла компьютера. Если название узла указано не будет, будет назначено название по умолчанию, <literal>localhost.localdomain</literal>."
+msgid ""
+"<emphasis>Ethernet/IP settings</emphasis>: you need to declare what DNS "
+"servers to use. The HOSTNAME of the computer can be specified here. If no "
+"HOSTNAME is specified, the name <literal>localhost.localdomain</literal> is "
+"attributed by default."
+msgstr ""
+"<emphasis>Ethernet/Параметры IP</emphasis>: вам следует определить, будет ли "
+"получать компьютер данные о DNS-серверах с сервера DHCP или эти данные будут "
+"указаны вручную, как описано ниже. Во втором случае вам нужно будет указать "
+"адреса DNS-серверов. Здесь также можно указать название узла компьютера. "
+"Если название узла указано не будет, будет назначено название по умолчанию, "
+"<literal>localhost.localdomain</literal>."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
-#: en/drakconnect.xml:121
-#: en/drakconnect.xml:258
-msgid "For a residential network, the IP address usually looks like <emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</emphasis>, and the Gateway and DNS servers are available from your service provider's website."
-msgstr "В домашних сетях IP-адреса всегда имеют следующий формат: <emphasis>192.168.x.x</emphasis>. Маской сети является <emphasis>255.255.255.0</emphasis>. А данные по шлюзу и DNS-серверам можно получить с сайта вашего провайдера."
+#: en/drakconnect.xml:121 en/drakconnect.xml:258
+msgid ""
+"For a residential network, the IP address usually looks like "
+"<emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</"
+"emphasis>, and the Gateway and DNS servers are available from your service "
+"provider's website."
+msgstr ""
+"В домашних сетях IP-адреса всегда имеют следующий формат: <emphasis>192.168."
+"x.x</emphasis>. Маской сети является <emphasis>255.255.255.0</emphasis>. А "
+"данные по шлюзу и DNS-серверам можно получить с сайта вашего провайдера."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:126
-msgid "In advanced settings, you can specified a <emphasis>Search domain</emphasis>. It would usually be your home domain, i.e. if your computer is called \"splash\", and it's full domain name is \"splash.boatanchor.net\", the Search Domain would be \"boatanchor.net\". Unless you specifically need it, it's ok not to define this setting. Again, domestic ADSL would not need this setting."
-msgstr "С помощью дополнительных параметров вы можете указать <emphasis>Поиск домена</emphasis>. Он должен совпадать с названием вашего узла без первой части, до точки. Например, если ваш компьютер имеет название «comp1», а полное название домена - «comp1.domivka.net», доменом поиска должно быть «domivka.net». Если же вам точно не известно, следует ли указывать некий домен, то его можно просто не указывать. Опять же, этот пункт не нужен для настройки домашнего ADSL."
+msgid ""
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It would usually be your home domain, i.e. if your computer is "
+"called \"splash\", and it's full domain name is \"splash.boatanchor.net\", "
+"the Search Domain would be \"boatanchor.net\". Unless you specifically need "
+"it, it's ok not to define this setting. Again, domestic ADSL would not need "
+"this setting."
+msgstr ""
+"С помощью дополнительных параметров вы можете указать <emphasis>Поиск "
+"домена</emphasis>. Он должен совпадать с названием вашего узла без первой "
+"части, до точки. Например, если ваш компьютер имеет название «comp1», а "
+"полное название домена - «comp1.domivka.net», доменом поиска должно быть "
+"«domivka.net». Если же вам точно не известно, следует ли указывать некий "
+"домен, то его можно просто не указывать. Опять же, этот пункт не нужен для "
+"настройки домашнего ADSL."
 
 #. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:136
@@ -1176,12 +1920,8 @@ msgid "drakconnect30.png"
 msgstr "drakconnect30.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/drakconnect.xml:142
-#: en/drakconnect.xml:279
-#: en/drakconnect.xml:351
-#: en/drakconnect.xml:458
-#: en/drakconnect.xml:636
-#: en/drakconnect.xml:688
+#: en/drakconnect.xml:142 en/drakconnect.xml:279 en/drakconnect.xml:351
+#: en/drakconnect.xml:458 en/drakconnect.xml:636 en/drakconnect.xml:688
 #: en/drakconnect.xml:780
 msgid "The next steps are exposed at <xref linkend=\"drakconnect-end\"/>"
 msgstr "Следующие шаги описаны в разделе <xref linkend=\"drakconnect-end\"/>"
@@ -1192,13 +1932,17 @@ msgid "A new Satellite connection (DVB)"
 msgstr "Новое спутниковое соединение (DVB)"
 
 #. type: Content of: <section><section><para>
-#: en/drakconnect.xml:152
-#: en/drakconnect.xml:696
-#: en/draknetcenter.xml:136
-#: en/draknetcenter.xml:142
-#: en/draknetcenter.xml:203
-msgid "This section hasn't been written yet for lack of resources. If you think you can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
-msgstr "Этот раздел ещё не написан из-за отсутствия ресурсов. Если вы считаете, что можете написать эту справочную страницу, пожалуйста, свяжитесь с <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">команда по документации</link>. Заранее благодарны вам за помощь."
+#: en/drakconnect.xml:152 en/drakconnect.xml:696 en/draknetcenter.xml:136
+#: en/draknetcenter.xml:142 en/draknetcenter.xml:203
+msgid ""
+"This section hasn't been written yet for lack of resources. If you think you "
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
+msgstr ""
+"Этот раздел ещё не написан из-за отсутствия ресурсов. Если вы считаете, что "
+"можете написать эту справочную страницу, пожалуйста, свяжитесь с <link ns2:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">команда по "
+"документации</link>. Заранее благодарны вам за помощь."
 
 #. type: Content of: <section><section><title>
 #: en/drakconnect.xml:158
@@ -1217,23 +1961,70 @@ msgstr "Нет"
 
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:180
-msgid "BPALogin (necessary for Telstra). In this case you have to provide User name and password."
-msgstr "BPALogin (нужен для Telstra). В этом случае вам следует указать имя пользователя и пароль."
+msgid ""
+"BPALogin (necessary for Telstra). In this case you have to provide User name "
+"and password."
+msgstr ""
+"BPALogin (нужен для Telstra). В этом случае вам следует указать имя "
+"пользователя и пароль."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:191
-msgid "<emphasis>Cable/IP settings</emphasis>: you have to select if DNS servers are declared by the DHCP server or are manually specified, as explained below. In the last case, the IP address of DNS servers has to be set. The HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, the name <literal>localhost.localdomain</literal> is attributed by default.  The Hostname can also be provided by the DHCP server with the option <emphasis>Assign host name from DHCP server</emphasis>. Not all DHCP servers have such a function and if you're setting up your PC to get an IP address from a domestic ADSL router, it is unlikely."
-msgstr "<emphasis>Кабельный/Параметры IP</emphasis>: вам следует определить, будет ли получать компьютер данные о DNS-серверах с сервера DHCP или эти данные будут указаны вручную, как описано ниже. Во втором случае вам нужно будет указать адреса DNS-серверов. Здесь также можно указать название узла компьютера. Если название узла указано не будет, будет назначено название по умолчанию <literal>localhost.localdomain</literal>. Название узла может быть предоставлено сервером DHCP, если будет отмечен пункт <emphasis>Определить имя узла через DHCP</emphasis>. Возможность определения названия узла предусмотрена не на всех серверах DHCP. Если вы настраиваете ваш компьютер на получение IP-адреса с домашнего маршрутизатора ADSL, вряд ли следует обозначать этот пункт."
+msgid ""
+"<emphasis>Cable/IP settings</emphasis>: you have to select if DNS servers "
+"are declared by the DHCP server or are manually specified, as explained "
+"below. In the last case, the IP address of DNS servers has to be set. The "
+"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, "
+"the name <literal>localhost.localdomain</literal> is attributed by default.  "
+"The Hostname can also be provided by the DHCP server with the option "
+"<emphasis>Assign host name from DHCP server</emphasis>. Not all DHCP servers "
+"have such a function and if you're setting up your PC to get an IP address "
+"from a domestic ADSL router, it is unlikely."
+msgstr ""
+"<emphasis>Кабельный/Параметры IP</emphasis>: вам следует определить, будет "
+"ли получать компьютер данные о DNS-серверах с сервера DHCP или эти данные "
+"будут указаны вручную, как описано ниже. Во втором случае вам нужно будет "
+"указать адреса DNS-серверов. Здесь также можно указать название узла "
+"компьютера. Если название узла указано не будет, будет назначено название по "
+"умолчанию <literal>localhost.localdomain</literal>. Название узла может быть "
+"предоставлено сервером DHCP, если будет отмечен пункт <emphasis>Определить "
+"имя узла через DHCP</emphasis>. Возможность определения названия узла "
+"предусмотрена не на всех серверах DHCP. Если вы настраиваете ваш компьютер "
+"на получение IP-адреса с домашнего маршрутизатора ADSL, вряд ли следует "
+"обозначать этот пункт."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:252
-msgid "<emphasis>Cable/IP settings</emphasis>: you need to declare what DNS servers to use. The HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, the name <literal>localhost.localdomain</literal> is attributed by default."
-msgstr "<emphasis>Кабельный/Параметры IP</emphasis>: вам следует определить, будет ли получать компьютер данные о DNS-серверах с сервера DHCP или эти данные будут указаны вручную, как описано ниже. Во втором случае вам нужно будет указать адреса DNS-серверов. Здесь также можно указать название узла компьютера. Если название узла указано не будет, будет назначено название по умолчанию <literal>localhost.localdomain</literal>."
+msgid ""
+"<emphasis>Cable/IP settings</emphasis>: you need to declare what DNS servers "
+"to use. The HOSTNAME of the computer can be specified here. If no HOSTNAME "
+"is specified, the name <literal>localhost.localdomain</literal> is "
+"attributed by default."
+msgstr ""
+"<emphasis>Кабельный/Параметры IP</emphasis>: вам следует определить, будет "
+"ли получать компьютер данные о DNS-серверах с сервера DHCP или эти данные "
+"будут указаны вручную, как описано ниже. Во втором случае вам нужно будет "
+"указать адреса DNS-серверов. Здесь также можно указать название узла "
+"компьютера. Если название узла указано не будет, будет назначено название по "
+"умолчанию <literal>localhost.localdomain</literal>."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:263
-msgid "In advanced settings, you can specified a <emphasis>Search domain</emphasis>. It would usually be your home domain, i.e. if your computer is called \"splash\", and it's full domain name is \"splash.boatanchor.net\", the Search Domain would be \"boatanchor.net\". Unless you specifically need it, it's ok not to define this setting. Again, domestic connection would not need this setting."
-msgstr "С помощью дополнительных параметров вы можете указать <emphasis>Домен поиска</emphasis>. Он должен совпадать с названием вашего узла без первой части, до точки. Например, если ваш компьютер имеет название «comp1», а полное название домена - «comp1.domivka.net», доменом поиска должно быть «domivka.net». Если же вам точно не известно, следует ли указывать некий домен, его можно просто не указывать. Опять же, этот пункт не нужен для настройки домашнего соединения."
+msgid ""
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It would usually be your home domain, i.e. if your computer is "
+"called \"splash\", and it's full domain name is \"splash.boatanchor.net\", "
+"the Search Domain would be \"boatanchor.net\". Unless you specifically need "
+"it, it's ok not to define this setting. Again, domestic connection would not "
+"need this setting."
+msgstr ""
+"С помощью дополнительных параметров вы можете указать <emphasis>Домен "
+"поиска</emphasis>. Он должен совпадать с названием вашего узла без первой "
+"части, до точки. Например, если ваш компьютер имеет название «comp1», а "
+"полное название домена - «comp1.domivka.net», доменом поиска должно быть "
+"«domivka.net». Если же вам точно не известно, следует ли указывать некий "
+"домен, его можно просто не указывать. Опять же, этот пункт не нужен для "
+"настройки домашнего соединения."
 
 #. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:273
@@ -1247,18 +2038,27 @@ msgstr "Новое DSL-соединение"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:291
-msgid "If the tool detects network interfaces, it offers to select one and to configure it."
-msgstr "Если, программой будут обнаружены сетевые интерфейсы, то она предложит выбрать один из них и настроить его."
+msgid ""
+"If the tool detects network interfaces, it offers to select one and to "
+"configure it."
+msgstr ""
+"Если, программой будут обнаружены сетевые интерфейсы, то она предложит "
+"выбрать один из них и настроить его."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
-#: en/drakconnect.xml:296
-#: en/drakconnect.xml:663
-msgid "A list of providers is proposed, classified by countries.  Select your provider. If it is not listed, select the option <guilabel>Unlisted</guilabel> and then enter the options your provider gave."
-msgstr "Программа предложит список провайдеров, классифицированных по странам. Выберите вашего провайдера. Если же его нет в списке, выберите опцию <guilabel>Не в списке</guilabel>, а затем введите параметры, предоставленные вашим провайдером."
+#: en/drakconnect.xml:296 en/drakconnect.xml:663
+msgid ""
+"A list of providers is proposed, classified by countries.  Select your "
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave."
+msgstr ""
+"Программа предложит список провайдеров, классифицированных по странам. "
+"Выберите вашего провайдера. Если же его нет в списке, выберите опцию "
+"<guilabel>Не в списке</guilabel>, а затем введите параметры, предоставленные "
+"вашим провайдером."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
-#: en/drakconnect.xml:303
-#: en/drakconnect.xml:380
+#: en/drakconnect.xml:303 en/drakconnect.xml:380
 msgid "Select one of the protocols available:"
 msgstr "Выберите один из доступных протоколов:"
 
@@ -1293,15 +2093,12 @@ msgid "Access settings"
 msgstr "Параметры доступа"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
-#: en/drakconnect.xml:333
-#: en/drakconnect.xml:678
+#: en/drakconnect.xml:333 en/drakconnect.xml:678
 msgid "Account Login (user name)"
 msgstr "Логин (имя пользователя)"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
-#: en/drakconnect.xml:337
-#: en/drakconnect.xml:414
-#: en/drakconnect.xml:682
+#: en/drakconnect.xml:337 en/drakconnect.xml:414 en/drakconnect.xml:682
 msgid "Account password"
 msgstr "Пароль учётной записи"
 
@@ -1316,9 +2113,7 @@ msgid "(Advanced) Virtual Circuit ID (VCI)"
 msgstr "(Дополнительно) Виртуальный канал ID (VCI)"
 
 #. type: Content of: <section><section><para>
-#: en/drakconnect.xml:289
-#: en/drakconnect.xml:359
-#: en/drakconnect.xml:646
+#: en/drakconnect.xml:289 en/drakconnect.xml:359 en/drakconnect.xml:646
 msgid "<placeholder type=\"orderedlist\" id=\"0\"/>"
 msgstr "<placeholder type=\"orderedlist\" id=\"0\"/>"
 
@@ -1328,8 +2123,7 @@ msgid "A new ISDN connection"
 msgstr "Новое ISDN-соединение"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/drakconnect.xml:361
-#: en/drakconnect.xml:706
+#: en/drakconnect.xml:361 en/drakconnect.xml:706
 msgid "The wizard asks which device to configure:"
 msgstr "Программа-мастер попросит вас указать устройство для настройки:"
 
@@ -1345,8 +2139,12 @@ msgstr "Внешний модем ISDN"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:375
-msgid "A list of hardware is proposed, classified by category and manufacturer. Select your card."
-msgstr "Программа предложит вам список оборудования, распределенного по категориям и производителями. Выберите вашу карту."
+msgid ""
+"A list of hardware is proposed, classified by category and manufacturer. "
+"Select your card."
+msgstr ""
+"Программа предложит вам список оборудования, распределенного по категориям и "
+"производителями. Выберите вашу карту."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:384
@@ -1360,8 +2158,17 @@ msgstr "Протокол для Европы (EDSS1)"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:395
-msgid "A list of providers is then offered, classified by countries.  Select your provider. If it is not listed, select the option <guilabel>Unlisted</guilabel> and then enter the options your provider gave you. Then it is asked for parameters:"
-msgstr "Программа предложит список провайдеров, классифицированных по странам. Выберите вашего провайдера. Если же его нет в списке, выберите опцию <guilabel>Не в списке</guilabel>, а затем введите параметры, предоставленные вашим провайдером. После этого программа попросит вас указать следующие данные:"
+msgid ""
+"A list of providers is then offered, classified by countries.  Select your "
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave you. Then it is "
+"asked for parameters:"
+msgstr ""
+"Программа предложит список провайдеров, классифицированных по странам. "
+"Выберите вашего провайдера. Если же его нет в списке, выберите опцию "
+"<guilabel>Не в списке</guilabel>, а затем введите параметры, предоставленные "
+"вашим провайдером. После этого программа попросит вас указать следующие "
+"данные:"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:402
@@ -1385,13 +2192,23 @@ msgstr "Метод авторизации"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:424
-msgid "After that, you have to select if you get the IP address by automatic or manual method. In the last case, specify IP address and Subnet mask."
-msgstr "После этого выберите способ получения IP-адреса: автоматически или вручную. Во втором случае укажите IP-адрес и маску подсети."
+msgid ""
+"After that, you have to select if you get the IP address by automatic or "
+"manual method. In the last case, specify IP address and Subnet mask."
+msgstr ""
+"После этого выберите способ получения IP-адреса: автоматически или вручную. "
+"Во втором случае укажите IP-адрес и маску подсети."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:430
-msgid "The next step is to choose how DNS servers address are obtained, by automatic or manual method. In the case of manual configuration, you have to put:"
-msgstr "На следующем шаге следует выбрать способ получения адресов DNS-серверов: автоматически или вручную. В случае определения вручную вам следует указать следующие данные:"
+msgid ""
+"The next step is to choose how DNS servers address are obtained, by "
+"automatic or manual method. In the case of manual configuration, you have to "
+"put:"
+msgstr ""
+"На следующем шаге следует выбрать способ получения адресов DNS-серверов: "
+"автоматически или вручную. В случае определения вручную вам следует указать "
+"следующие данные:"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:436
@@ -1405,13 +2222,24 @@ msgstr "Первый и второй DNS сервер"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:444
-msgid "Select if the hostname is set from IP. This option is to select only if you are sure that your provider is configured to accept it."
-msgstr "Укажите, следует ли определять название узла на основе IP-адреса. Этот пункт следует указывать, только если вам известно, что поставщиком услуг предусмотрено такое определение."
+msgid ""
+"Select if the hostname is set from IP. This option is to select only if you "
+"are sure that your provider is configured to accept it."
+msgstr ""
+"Укажите, следует ли определять название узла на основе IP-адреса. Этот пункт "
+"следует указывать, только если вам известно, что поставщиком услуг "
+"предусмотрено такое определение."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:452
-msgid "The next step is to choose how the gateway address is obtained, by automatic or manual method. In the case of manual configuration, you have to enter the IP address."
-msgstr "На следующем шаге следует выбрать способ, в котором компьютер будет получать адрес шлюза, автоматически или вручную. Если вы выберете способ получения вручную, вам придется указать IP-адрес."
+msgid ""
+"The next step is to choose how the gateway address is obtained, by automatic "
+"or manual method. In the case of manual configuration, you have to enter the "
+"IP address."
+msgstr ""
+"На следующем шаге следует выбрать способ, в котором компьютер будет получать "
+"адрес шлюза, автоматически или вручную. Если вы выберете способ получения "
+"вручную, вам придется указать IP-адрес."
 
 #. type: Content of: <section><section><title>
 #: en/drakconnect.xml:464
@@ -1420,13 +2248,24 @@ msgstr "Новое беспроводное соединение (Wi-Fi)"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:468
-msgid "A first window lists the interfaces which are available and an entry for Windows driver (ndiswrapper). Select the one to configure.  Use ndiswrapper only if the other configuration methods did not work."
-msgstr "На первой странице будет показан список доступных интерфейсов и пункт для драйвера Windows (ndiswrapper). Выберите интерфейс, который вы хотите настроить. Воспользуйтесь пунктом ndiswrapper, только если другие способы настройки не приведут к желаемым результатам."
+msgid ""
+"A first window lists the interfaces which are available and an entry for "
+"Windows driver (ndiswrapper). Select the one to configure.  Use ndiswrapper "
+"only if the other configuration methods did not work."
+msgstr ""
+"На первой странице будет показан список доступных интерфейсов и пункт для "
+"драйвера Windows (ndiswrapper). Выберите интерфейс, который вы хотите "
+"настроить. Воспользуйтесь пунктом ndiswrapper, только если другие способы "
+"настройки не приведут к желаемым результатам."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:475
-msgid "At this step, the choice is given between the different access points that the card has detected."
-msgstr "На этом шаге вы сможете выбрать нужную вам точку доступа из списка точек, которые были обнаружены картой."
+msgid ""
+"At this step, the choice is given between the different access points that "
+"the card has detected."
+msgstr ""
+"На этом шаге вы сможете выбрать нужную вам точку доступа из списка точек, "
+"которые были обнаружены картой."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:480
@@ -1481,7 +2320,9 @@ msgstr "WPA/WPA2"
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
 #: en/drakconnect.xml:526
 msgid "This encryption mode is to prefer if your hardware allows it."
-msgstr "Стоит использовать именно этот режим шифрования, если предусмотрена его поддержка  со стороны вашего оборудования."
+msgstr ""
+"Стоит использовать именно этот режим шифрования, если предусмотрена его "
+"поддержка  со стороны вашего оборудования."
 
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
 #: en/drakconnect.xml:532
@@ -1491,7 +2332,9 @@ msgstr "WEP"
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
 #: en/drakconnect.xml:535
 msgid "Some old hardware deals only this encryption method."
-msgstr "На устаревшем оборудовании возможно использование только этого способа шифрования."
+msgstr ""
+"На устаревшем оборудовании возможно использование только этого способа "
+"шифрования."
 
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:543
@@ -1501,42 +2344,89 @@ msgstr "Ключ шифрования"
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:545
 msgid "It is generally provided with the hardware which give the access point."
-msgstr "Обычно предоставляется вместе с оборудованием, которое работает как точка доступа."
+msgstr ""
+"Обычно предоставляется вместе с оборудованием, которое работает как точка "
+"доступа."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:552
-msgid "At this step, the choice is given between an automatic IP address or a manual IP address."
-msgstr "На этом шаге можно выбрать между автоматическим назначением IP-адреса и определением его вручную."
+msgid ""
+"At this step, the choice is given between an automatic IP address or a "
+"manual IP address."
+msgstr ""
+"На этом шаге можно выбрать между автоматическим назначением IP-адреса и "
+"определением его вручную."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:561
-msgid "<emphasis>IP settings</emphasis>: you have to select if DNS servers are declared by the DHCP server or are manually specified, as explained below. In the last case, IP address of DNS servers has to be set. The HOSTNAME of the computer can be specified here.  If no HOSTNAME is specified, the name localhost.localdomain is attributed by default. The Hostname can also be provided by the DHCP server with the option <emphasis>Assign host name from DHCP server</emphasis>"
-msgstr "<emphasis>Параметры IP</emphasis>: вам следует определить, будет ли компьютер получать данные о DNS-серверах с сервера DHCP или эти данные будут указаны вручную, как описано ниже. Во втором случае вам нужно будет указать адреса DNS-серверов . Здесь также можно указать название узла компьютера. Если название узла указано не будет, будет назначено название по умолчанию <literal>localhost.localdomain</literal>. Название узла может быть предоставлено сервером DHCP, если будет отмечен пункт <emphasis>Определить имя узла через DHCP</emphasis>."
+msgid ""
+"<emphasis>IP settings</emphasis>: you have to select if DNS servers are "
+"declared by the DHCP server or are manually specified, as explained below. "
+"In the last case, IP address of DNS servers has to be set. The HOSTNAME of "
+"the computer can be specified here.  If no HOSTNAME is specified, the name "
+"localhost.localdomain is attributed by default. The Hostname can also be "
+"provided by the DHCP server with the option <emphasis>Assign host name from "
+"DHCP server</emphasis>"
+msgstr ""
+"<emphasis>Параметры IP</emphasis>: вам следует определить, будет ли "
+"компьютер получать данные о DNS-серверах с сервера DHCP или эти данные будут "
+"указаны вручную, как описано ниже. Во втором случае вам нужно будет указать "
+"адреса DNS-серверов . Здесь также можно указать название узла компьютера. "
+"Если название узла указано не будет, будет назначено название по умолчанию "
+"<literal>localhost.localdomain</literal>. Название узла может быть "
+"предоставлено сервером DHCP, если будет отмечен пункт <emphasis>Определить "
+"имя узла через DHCP</emphasis>."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:589
 msgid "Get YP server from DHCP (checked by default): specify the NIS servers"
-msgstr "Получить серверы YP через DHCP (по умолчанию включен): укажите серверы NIS"
+msgstr ""
+"Получить серверы YP через DHCP (по умолчанию включен): укажите серверы NIS"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:608
-msgid "After accepting the configuration the step, which is common to all connection configurations, is explained: <xref linkend=\"drakconnect-end\"/>"
-msgstr "После подтверждения настроек, определенных этим шагом, программа перейдет к шагу, который является общим для всех настроек соединений: <xref linkend=\"drakconnect-end\"/>"
+msgid ""
+"After accepting the configuration the step, which is common to all "
+"connection configurations, is explained: <xref linkend=\"drakconnect-end\"/>"
+msgstr ""
+"После подтверждения настроек, определенных этим шагом, программа перейдет к "
+"шагу, который является общим для всех настроек соединений: <xref linkend="
+"\"drakconnect-end\"/>"
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:619
-msgid "<emphasis>IP settings</emphasis>: you have to declare DNS servers. The HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, the name <literal>localhost.localdomain</literal> is attributed by default."
-msgstr "<emphasis>Параметры IP</emphasis>: вам следует указать DNS-серверы. Здесь также можно указать название узла компьютера. Если имя узла не будет указано, то будет назначено название по умолчанию <literal>localhost.localdomain</literal>."
+msgid ""
+"<emphasis>IP settings</emphasis>: you have to declare DNS servers. The "
+"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, "
+"the name <literal>localhost.localdomain</literal> is attributed by default."
+msgstr ""
+"<emphasis>Параметры IP</emphasis>: вам следует указать DNS-серверы. Здесь "
+"также можно указать название узла компьютера. Если имя узла не будет "
+"указано, то будет назначено название по умолчанию <literal>localhost."
+"localdomain</literal>."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:625
-msgid "For a residential network, the IP address always looks like <emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</emphasis>, and the Gateway and DNS servers are available from your providers website."
-msgstr "В домашних сетях IP-адреса всегда имеют следующий формат: <emphasis>192.168.x.x</emphasis>. Маской сети является <emphasis>255.255.255.0</emphasis>. А данные по шлюзу и DNS-серверам можно получить с сайта вашего провайдера."
+msgid ""
+"For a residential network, the IP address always looks like "
+"<emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</"
+"emphasis>, and the Gateway and DNS servers are available from your providers "
+"website."
+msgstr ""
+"В домашних сетях IP-адреса всегда имеют следующий формат: <emphasis>192.168."
+"x.x</emphasis>. Маской сети является <emphasis>255.255.255.0</emphasis>. А "
+"данные по шлюзу и DNS-серверам можно получить с сайта вашего провайдера."
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:630
-msgid "In advanced settings, you can specified a <emphasis>Search domain</emphasis>. It must seem to your hostname without the first name, before the period."
-msgstr "С помощью дополнительных параметров вы можете указать <emphasis>Домен поиска</emphasis>. Он должен совпадать с названием вашего узла без первой части, до точки."
+msgid ""
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It must seem to your hostname without the first name, before the "
+"period."
+msgstr ""
+"С помощью дополнительных параметров вы можете указать <emphasis>Домен "
+"поиска</emphasis>. Он должен совпадать с названием вашего узла без первой "
+"части, до точки."
 
 #. type: Content of: <section><section><title>
 #: en/drakconnect.xml:644
@@ -1545,18 +2435,27 @@ msgstr "Новое соединение GPRS/Edge/3G"
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:648
-msgid "If the tool detects wireless interfaces, it offers to select one and to configure it."
-msgstr "Если программой будут обнаружены интерфейсы беспроводной сети, она предложит выбрать один из них и настроить его."
+msgid ""
+"If the tool detects wireless interfaces, it offers to select one and to "
+"configure it."
+msgstr ""
+"Если программой будут обнаружены интерфейсы беспроводной сети, она предложит "
+"выбрать один из них и настроить его."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:653
 msgid "The PIN number is asked. Keep left if this PIN number is not required."
-msgstr "Программа попросит вас указать PIN-код. Не указывайте, если PIN-код не нужен."
+msgstr ""
+"Программа попросит вас указать PIN-код. Не указывайте, если PIN-код не нужен."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:658
-msgid "The wizard asks for network. If it is not detected, select the option <guilabel>Unlisted</guilabel>."
-msgstr "Программа-мастер попросит вас указать сеть. Если сеть не будет обнаружена автоматически, выберите <guilabel>Не в списке</guilabel>."
+msgid ""
+"The wizard asks for network. If it is not detected, select the option "
+"<guilabel>Unlisted</guilabel>."
+msgstr ""
+"Программа-мастер попросит вас указать сеть. Если сеть не будет обнаружена "
+"автоматически, выберите <guilabel>Не в списке</guilabel>."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:670
@@ -1595,13 +2494,26 @@ msgstr "Список предлагаемых портов. Выберите н�
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:724
-msgid "If not yet installed, it will be suggested that you install the package <emphasis>kppp-provider</emphasis>."
-msgstr "Если этот пакет еще не установлен, программа предложит вам установить пакет <emphasis>kppp-provider</emphasis>."
+msgid ""
+"If not yet installed, it will be suggested that you install the package "
+"<emphasis>kppp-provider</emphasis>."
+msgstr ""
+"Если этот пакет еще не установлен, программа предложит вам установить пакет "
+"<emphasis>kppp-provider</emphasis>."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:729
-msgid "A list of providers is proposed, classified by countries. Select your provider. If it is not listed, select the option <guilabel>Unlisted</guilabel> and then enter the options your provider gave. Then it is asked for Dialup options:"
-msgstr "Программа предложит список провайдеров, классифицированных по странам. Выберите в нём вашего провайдера. Если соответствующего пункта в списке не окажется, выберите <guilabel>Не в списке</guilabel>, а затем укажите значения параметров, предоставленные вашим провайдером. После этого программа попросит вас указать параметры дозвона:"
+msgid ""
+"A list of providers is proposed, classified by countries. Select your "
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave. Then it is asked "
+"for Dialup options:"
+msgstr ""
+"Программа предложит список провайдеров, классифицированных по странам. "
+"Выберите в нём вашего провайдера. Если соответствующего пункта в списке не "
+"окажется, выберите <guilabel>Не в списке</guilabel>, а затем укажите "
+"значения параметров, предоставленные вашим провайдером. После этого "
+"программа попросит вас указать параметры дозвона:"
 
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:736
@@ -1680,18 +2592,29 @@ msgstr "<emphasis>Включить подсчёт трафика</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakconnect.xml:804
-msgid "<emphasis>Allow interface to be controlled by Network Manager</emphasis>"
-msgstr "<emphasis>Разрешить управление интерфейсом с помощью Network Manager</emphasis>"
+msgid ""
+"<emphasis>Allow interface to be controlled by Network Manager</emphasis>"
+msgstr ""
+"<emphasis>Разрешить управление интерфейсом с помощью Network Manager</"
+"emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakconnect.xml:809
-msgid "In the case of a wireless connection, a supplemental box is <emphasis>Allow access point roaming</emphasis> which give the possibility to switch automatically between access point according to the signal strength."
-msgstr "В случае беспроводного соединения будет предложен дополнительный пункт <emphasis>Разрешить роуминг точки доступа</emphasis>. С помощью этого пункта можно разрешить компьютеру автоматически переключаться между точками доступа в зависимости от силы сигнала."
+msgid ""
+"In the case of a wireless connection, a supplemental box is <emphasis>Allow "
+"access point roaming</emphasis> which give the possibility to switch "
+"automatically between access point according to the signal strength."
+msgstr ""
+"В случае беспроводного соединения будет предложен дополнительный пункт "
+"<emphasis>Разрешить роуминг точки доступа</emphasis>. С помощью этого пункта "
+"можно разрешить компьютеру автоматически переключаться между точками доступа "
+"в зависимости от силы сигнала."
 
 #. type: Content of: <section><section><para>
 #: en/drakconnect.xml:816
 msgid "With the advanced button, you can specify:"
-msgstr "С помощью кнопки <guibutton>Дополнительно</guibutton> вы можете указать:"
+msgstr ""
+"С помощью кнопки <guibutton>Дополнительно</guibutton> вы можете указать:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakconnect.xml:820
@@ -1715,8 +2638,12 @@ msgstr "Включить туннелирование с IPv6 в IPv4"
 
 #. type: Content of: <section><section><para>
 #: en/drakconnect.xml:836
-msgid "The last step allows you to specify if the connection is to start immediately or not."
-msgstr "На последнем шаге можно определить, будет ли выполнена попытка соединиться немедленно или нет."
+msgid ""
+"The last step allows you to specify if the connection is to start "
+"immediately or not."
+msgstr ""
+"На последнем шаге можно определить, будет ли выполнена попытка соединиться "
+"немедленно или нет."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:841
@@ -1740,13 +2667,25 @@ msgstr "drakconsole.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakconsole.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakconsole</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakconsole</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconsole</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakconsole</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/drakconsole.xml:14
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> gives you access to a console which is directly opened as root. We do not think that you need more information about that."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете получить доступ к консоли, открытой от имени администратора системы (пользователя root). Думаем, этого описания достаточно, чтобы понять, о чем идет речь."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> gives you access to a "
+"console which is directly opened as root. We do not think that you need more "
+"information about that."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете "
+"получить доступ к консоли, открытой от имени администратора системы "
+"(пользователя root). Думаем, этого описания достаточно, чтобы понять, о чем "
+"идет речь."
 
 #. type: Content of: <section><info><title>
 #: en/drakdisk.xml:8
@@ -1765,18 +2704,40 @@ msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
 #: en/drakdisk.xml:21
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakdisk</emphasis> или <emphasis role=\"bold\">diskdrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
+"as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakdisk</emphasis> или <emphasis role=\"bold"
+"\">diskdrake</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><warning><para>
 #: en/drakdisk.xml:20
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny error or a cat jumping on your keyboard can lead to losing all data on a partition or even to erasing the entire hard disk. For that reason, you'll see the screen above on top of the tool screen. Click on <emphasis>Exit</emphasis> if you're not sure you want to continue."
-msgstr "Эта программа<placeholder type=\"footnote\" id=\"0\"/> является очень мощной - малейшая ошибка или случайное нажатие клавиш может привести к потере всех данных на разделе или даже стиранию всего жёсткого диска. По этой причине вам будет показано приведённое выше окно над окном программы. Нажмите кнопку <emphasis>Выйти</emphasis>, если вы не уверены, что хотите продолжать работу с программой."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
+"error or a cat jumping on your keyboard can lead to losing all data on a "
+"partition or even to erasing the entire hard disk. For that reason, you'll "
+"see the screen above on top of the tool screen. Click on <emphasis>Exit</"
+"emphasis> if you're not sure you want to continue."
+msgstr ""
+"Эта программа<placeholder type=\"footnote\" id=\"0\"/> является очень мощной "
+"- малейшая ошибка или случайное нажатие клавиш может привести к потере всех "
+"данных на разделе или даже стиранию всего жёсткого диска. По этой причине "
+"вам будет показано приведённое выше окно над окном программы. Нажмите кнопку "
+"<emphasis>Выйти</emphasis>, если вы не уверены, что хотите продолжать работу "
+"с программой."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:30
-msgid "If you have more than one hard disk, you can switch to the hard disk you want to work on by selecting the correct tab (sda, sdb, sdc etc)."
-msgstr "Если в вашей системе несколько жёстких дисков, вы можете переключиться на нужный вам жёсткий диск выбором соответствующей вкладки (sda, sdb, sdc и т.д.)."
+msgid ""
+"If you have more than one hard disk, you can switch to the hard disk you "
+"want to work on by selecting the correct tab (sda, sdb, sdc etc)."
+msgstr ""
+"Если в вашей системе несколько жёстких дисков, вы можете переключиться на "
+"нужный вам жёсткий диск выбором соответствующей вкладки (sda, sdb, sdc и т."
+"д.)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakdisk.xml:35
@@ -1785,28 +2746,61 @@ msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:39
-msgid "You can choose from many actions to adjust your hard disk to your preferences. Wiping an entire hard disk, splitting or merging partitions, resizing them or changing the filesystem, formatting or viewing what is in a partition: it is all possible. The <emphasis><guibutton>Clear all</guibutton></emphasis> button at the bottom is to erase the complete disk, the other buttons become visible on the right after you click on a partition."
-msgstr "Вы можете выбрать одно из многих действий, с помощью которых вы можете скорректировать разметку вашего диска в соответствии с вашими потребностями. Стирание всего жёсткого диска, разделение и объединение разделов, изменение размеров разделов или файловой системы разделов, форматирование или просмотр содержимого раздела: все это можно сделать с помощью этой программы. Кнопка <emphasis><guibutton>Очистить все</guibutton></emphasis> в нижней части окна предназначена для стирания всего диска. Доступ к другим кнопкам действий, расположенных справа, можно получить после нажатия на картинке раздела диска."
+msgid ""
+"You can choose from many actions to adjust your hard disk to your "
+"preferences. Wiping an entire hard disk, splitting or merging partitions, "
+"resizing them or changing the filesystem, formatting or viewing what is in a "
+"partition: it is all possible. The <emphasis><guibutton>Clear all</"
+"guibutton></emphasis> button at the bottom is to erase the complete disk, "
+"the other buttons become visible on the right after you click on a partition."
+msgstr ""
+"Вы можете выбрать одно из многих действий, с помощью которых вы можете "
+"скорректировать разметку вашего диска в соответствии с вашими потребностями. "
+"Стирание всего жёсткого диска, разделение и объединение разделов, изменение "
+"размеров разделов или файловой системы разделов, форматирование или просмотр "
+"содержимого раздела: все это можно сделать с помощью этой программы. Кнопка "
+"<emphasis><guibutton>Очистить все</guibutton></emphasis> в нижней части окна "
+"предназначена для стирания всего диска. Доступ к другим кнопкам действий, "
+"расположенных справа, можно получить после нажатия на картинке раздела диска."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:47
-msgid "If the selected partition is mounted, like in the example below, you cannot choose to resize, format or delete it. To be able to do that the partition must be unmounted first."
-msgstr "Если обозначенный вами раздел смонтирован, как в приведённом ниже примере, вы не сможете воспользоваться действиями по изменению размера, форматированию или удалению раздела. Чтобы получить доступ к этим действиям, вам следует сначала размонтировать раздел."
+msgid ""
+"If the selected partition is mounted, like in the example below, you cannot "
+"choose to resize, format or delete it. To be able to do that the partition "
+"must be unmounted first."
+msgstr ""
+"Если обозначенный вами раздел смонтирован, как в приведённом ниже примере, "
+"вы не сможете воспользоваться действиями по изменению размера, "
+"форматированию или удалению раздела. Чтобы получить доступ к этим действиям, "
+"вам следует сначала размонтировать раздел."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:51
 msgid "It is only possible to resize a partition on its right side"
-msgstr "Изменение размеров раздела можно выполнять только за счет правой границы раздела."
+msgstr ""
+"Изменение размеров раздела можно выполнять только за счет правой границы "
+"раздела."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:53
-msgid "To change a partition type (change ext3 to ext4 for example) you have to delete the partition and then re-create it with the new type. The button <guibutton role=\"bold\">Create</guibutton> appears when a disk empty part is selected"
-msgstr "Чтобы изменить тип раздела (например, с ext3 на ext4), вам следует удалить раздел, а затем повторно создать его с новым типом. Если будет обозначена пустая часть диска, в окне программы появится кнопка <guibutton role=\"bold\">Создать</guibutton>."
+msgid ""
+"To change a partition type (change ext3 to ext4 for example) you have to "
+"delete the partition and then re-create it with the new type. The button "
+"<guibutton role=\"bold\">Create</guibutton> appears when a disk empty part "
+"is selected"
+msgstr ""
+"Чтобы изменить тип раздела (например, с ext3 на ext4), вам следует удалить "
+"раздел, а затем повторно создать его с новым типом. Если будет обозначена "
+"пустая часть диска, в окне программы появится кнопка <guibutton role=\"bold"
+"\">Создать</guibutton>."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:58
 msgid "You can choose a mount point that doesn't exist, it will be created."
-msgstr "Вы можете выбрать точку монтирования, которой не существует. Если будет осуществлен такой выбор, соответствующая точка монтирования будет создана."
+msgstr ""
+"Вы можете выбрать точку монтирования, которой не существует. Если будет "
+"осуществлен такой выбор, соответствующая точка монтирования будет создана."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakdisk.xml:63
@@ -1815,8 +2809,15 @@ msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:67
-msgid "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> gives some extra available actions, like labelling the partition, as can be seen in the screenshot below."
-msgstr "Нажатие кнопки <emphasis><guibutton>Переключить в режим эксперта</guibutton></emphasis> предоставит вам доступ к дополнительным действиям, в частности определения метки раздела, как это показано на приведённом ниже снимке."
+msgid ""
+"Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
+"gives some extra available actions, like labelling the partition, as can be "
+"seen in the screenshot below."
+msgstr ""
+"Нажатие кнопки <emphasis><guibutton>Переключить в режим эксперта</"
+"guibutton></emphasis> предоставит вам доступ к дополнительным действиям, в "
+"частности определения метки раздела, как это показано на приведённом ниже "
+"снимке."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakdisk.xml:73
@@ -1840,18 +2841,37 @@ msgstr "drakedm.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakedm.xml:17
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakedm</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakedm</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakedm</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakedm</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakedm.xml:16
-msgid "Here<placeholder type=\"footnote\" id=\"0\"/> you can choose which display manager to use to log into your desktop environment. Only the ones available on your system will be shown."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете выбрать средство управления сеансами (менеджер регистрации), который будет использоваться для входа в ваше рабочее окружение. В списке будут показаны только те среды окружения рабочего стола, которые установлены в вашей системе."
+msgid ""
+"Here<placeholder type=\"footnote\" id=\"0\"/> you can choose which display "
+"manager to use to log into your desktop environment. Only the ones available "
+"on your system will be shown."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы можете "
+"выбрать средство управления сеансами (менеджер регистрации), который будет "
+"использоваться для входа в ваше рабочее окружение. В списке будут показаны "
+"только те среды окружения рабочего стола, которые установлены в вашей "
+"системе."
 
 #. type: Content of: <section><para>
 #: en/drakedm.xml:24
-msgid "Most users will only notice that the provided login screens look different. However, there are differences in supported features, too. LXDM is a lightweight display manager, KDM and GDM have more extras."
-msgstr "Большинство пользователей заметят лишь то, что изменится окно входа в систему. Впрочем, различные менеджеры входа имеют также и различные возможности. LXDM является самым нетребовательным и простым, KDM и GDM имеют значительно более широкие возможности."
+msgid ""
+"Most users will only notice that the provided login screens look different. "
+"However, there are differences in supported features, too. LXDM is a "
+"lightweight display manager, KDM and GDM have more extras."
+msgstr ""
+"Большинство пользователей заметят лишь то, что изменится окно входа в "
+"систему. Впрочем, различные менеджеры входа имеют также и различные "
+"возможности. LXDM является самым нетребовательным и простым, KDM и GDM имеют "
+"значительно более широкие возможности."
 
 #. type: Content of: <section><info><title>
 #: en/drakfirewall.xml:3
@@ -1870,23 +2890,58 @@ msgstr "drakfirewall.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakfirewall.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakfirewall</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakfirewall</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakfirewall</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakfirewall</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:14
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the Security tab in the Mageia Control Center labelled \"Set up your personal firewall\". It is the same tool in the first tab of \"Configure system security, permissions and audit\"."
-msgstr "Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно получить с помощью пункта «Безопасность» из Центра управления Mageia, раздел «Настройка персонального файервола». Доступ к этому же инструменту можно получить и с помощью первой вкладки пункта «Настройка безопасности системы, прав доступа и аудита системы»."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
+"Security tab in the Mageia Control Center labelled \"Set up your personal "
+"firewall\". It is the same tool in the first tab of \"Configure system "
+"security, permissions and audit\"."
+msgstr ""
+"Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить с помощью пункта «Безопасность» из Центра управления Mageia, раздел "
+"«Настройка персонального файервола». Доступ к этому же инструменту можно "
+"получить и с помощью первой вкладки пункта «Настройка безопасности системы, "
+"прав доступа и аудита системы»."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:20
-msgid "A basic firewall is installed by default with Mageia. All the incoming connections from the outside are blocked if they aren't authorised. In the first screen above, you can select the services for which outside connection attempts are accepted. For your security, uncheck the first box - <guilabel>Everything (no firewall)</guilabel> - unless you want to disable the firewall, and only check the needed services."
-msgstr "Персональный файервол с базовыми возможностями по умолчанию устанавливается вместе с Mageia. Все входящие соединения извне блокируются, если они не были явным образом разрешены. С помощью окна, снимок которого показан выше, вы можете выбрать службы, для которых будут приниматься внешние соединения. Если вы цените вашу безопасность, снимите отметку с первого пункта, <guilabel>Ко всем(файервол отключен)</guilabel>, (вам ведь нужна хоть какая-то защита?) и отметьте только службы, необходимые для работы."
+msgid ""
+"A basic firewall is installed by default with Mageia. All the incoming "
+"connections from the outside are blocked if they aren't authorised. In the "
+"first screen above, you can select the services for which outside connection "
+"attempts are accepted. For your security, uncheck the first box - "
+"<guilabel>Everything (no firewall)</guilabel> - unless you want to disable "
+"the firewall, and only check the needed services."
+msgstr ""
+"Персональный файервол с базовыми возможностями по умолчанию устанавливается "
+"вместе с Mageia. Все входящие соединения извне блокируются, если они не были "
+"явным образом разрешены. С помощью окна, снимок которого показан выше, вы "
+"можете выбрать службы, для которых будут приниматься внешние соединения. "
+"Если вы цените вашу безопасность, снимите отметку с первого пункта, "
+"<guilabel>Ко всем(файервол отключен)</guilabel>, (вам ведь нужна хоть какая-"
+"то защита?) и отметьте только службы, необходимые для работы."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:27
-msgid "It is possible to manually enter the port numbers to open. Click on <guibutton>Advanced</guibutton> and a new window is opened. In the field <guilabel>Other ports</guilabel>, enter the needed ports following these examples :"
-msgstr "Номера портов, которые необходимо открыть, можно указать вручную. Нажмите кнопку <guibutton>Дополнительно</guibutton>, чтобы открыть новое окно. В поле <guilabel>Другие порты</guilabel> введите желаемые номера портов. Например:"
+msgid ""
+"It is possible to manually enter the port numbers to open. Click on "
+"<guibutton>Advanced</guibutton> and a new window is opened. In the field "
+"<guilabel>Other ports</guilabel>, enter the needed ports following these "
+"examples :"
+msgstr ""
+"Номера портов, которые необходимо открыть, можно указать вручную. Нажмите "
+"кнопку <guibutton>Дополнительно</guibutton>, чтобы открыть новое окно. В "
+"поле <guilabel>Другие порты</guilabel> введите желаемые номера портов. "
+"Например:"
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:32
@@ -1905,8 +2960,13 @@ msgstr "Порты в списке разделяются пробелами."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:39
-msgid "If the box <guilabel>Log firewall messages in system logs</guilabel> is checked, the firewall messages will be saved in system logs"
-msgstr "Если будет выбрана опция <guilabel>Записывать сообщения файервола в системный журнал</guilabel>, то сообщения файервола будут записываться в системный журнал."
+msgid ""
+"If the box <guilabel>Log firewall messages in system logs</guilabel> is "
+"checked, the firewall messages will be saved in system logs"
+msgstr ""
+"Если будет выбрана опция <guilabel>Записывать сообщения файервола в "
+"системный журнал</guilabel>, то сообщения файервола будут записываться в "
+"системный журнал."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakfirewall.xml:44
@@ -1915,18 +2975,44 @@ msgstr "drakfirewall2.png"
 
 #. type: Content of: <section><note><para>
 #: en/drakfirewall.xml:49
-msgid "If you don't host specific services (web or mail server, file sharing, ...) it is completely possible to have nothing checked at all, it is even recommended, it won't prevent you from connecting to the internet."
-msgstr "Если на вашем компьютере не работают специфические службы (интернет-сервер, почтовый сервер, сервер предоставления файлов в общее пользование и т.п.), то в таком случае не обозначайте ни одного пункта. Это даже рекомендуется, поскольку необозначенные пункты не мешают соединению с интернетом."
+msgid ""
+"If you don't host specific services (web or mail server, file sharing, ...) "
+"it is completely possible to have nothing checked at all, it is even "
+"recommended, it won't prevent you from connecting to the internet."
+msgstr ""
+"Если на вашем компьютере не работают специфические службы (интернет-сервер, "
+"почтовый сервер, сервер предоставления файлов в общее пользование и т.п.), "
+"то в таком случае не обозначайте ни одного пункта. Это даже рекомендуется, "
+"поскольку необозначенные пункты не мешают соединению с интернетом."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:55
-msgid "The next screen deals with the Interactive Firewall options. These feature allow you to be warned of connection attempts if at least the first box <guilabel>Use Interactive Firewall </guilabel>is checked. Check the second box to be warned if the ports are scanned (in order to find a failure somewhere and enter your machine). Each box from the third one onwards corresponds to a port you opened in the two first screens; in the screenshot below, there are two such boxes: SSH server and 80:150/tcp. Check them to be warned each time a connection is attempted on those ports."
-msgstr "С помощью следующей страницы настройки можно изменить параметры работы интерактивного файервола. Если обозначен лишь первый пункт, <guilabel>Использовать интерактивный файервол</guilabel>, то вы можете приказать файерволу предупреждать вас о попытках соединения. Отметьте второй пункт, если вы хотите, чтобы программа предупреждала вас, что выполняется сканирование портов (с целью поиска уязвимостей и входа в систему). Все остальные пункты соответствуют портам, которые были открыты с помощью предыдущих окон. На приведённом ниже снимке два таких пункта: «сервер SSH» и «80:150/tcp». Отметьте эти пункты, если вы хотите, чтобы программа предупреждала вас о каждой попытке установления соединения с этими портами."
+msgid ""
+"The next screen deals with the Interactive Firewall options. These feature "
+"allow you to be warned of connection attempts if at least the first box "
+"<guilabel>Use Interactive Firewall </guilabel>is checked. Check the second "
+"box to be warned if the ports are scanned (in order to find a failure "
+"somewhere and enter your machine). Each box from the third one onwards "
+"corresponds to a port you opened in the two first screens; in the screenshot "
+"below, there are two such boxes: SSH server and 80:150/tcp. Check them to be "
+"warned each time a connection is attempted on those ports."
+msgstr ""
+"С помощью следующей страницы настройки можно изменить параметры работы "
+"интерактивного файервола. Если обозначен лишь первый пункт, "
+"<guilabel>Использовать интерактивный файервол</guilabel>, то вы можете "
+"приказать файерволу предупреждать вас о попытках соединения. Отметьте второй "
+"пункт, если вы хотите, чтобы программа предупреждала вас, что выполняется "
+"сканирование портов (с целью поиска уязвимостей и входа в систему). Все "
+"остальные пункты соответствуют портам, которые были открыты с помощью "
+"предыдущих окон. На приведённом ниже снимке два таких пункта: «сервер SSH» и "
+"«80:150/tcp». Отметьте эти пункты, если вы хотите, чтобы программа "
+"предупреждала вас о каждой попытке установления соединения с этими портами."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:64
 msgid "These warning are given by alert popups through the network applet."
-msgstr "Эти предупреждения предоставляются всплывающими сообщениями сетевого апплета."
+msgstr ""
+"Эти предупреждения предоставляются всплывающими сообщениями сетевого апплета."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakfirewall.xml:69
@@ -1940,13 +3026,24 @@ msgstr "drakfirewall4.png"
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:79
-msgid "In the last screen, choose which network interfaces are connected to the Internet and must be protected. Once the OK button is clicked, the necessary packages are downloaded."
-msgstr "С помощью последней страницы программы можно выбрать, какие из интерфейсов сети соединены с интернетом, следовательно, какие из них следует защищать. Как только будет нажата кнопка <guibutton>Готово</guibutton>, система установит необходимые для работы пакеты."
+msgid ""
+"In the last screen, choose which network interfaces are connected to the "
+"Internet and must be protected. Once the OK button is clicked, the necessary "
+"packages are downloaded."
+msgstr ""
+"С помощью последней страницы программы можно выбрать, какие из интерфейсов "
+"сети соединены с интернетом, следовательно, какие из них следует защищать. "
+"Как только будет нажата кнопка <guibutton>Готово</guibutton>, система "
+"установит необходимые для работы пакеты."
 
 #. type: Content of: <section><tip><para>
 #: en/drakfirewall.xml:84
-msgid "If you don't know what to choose, have a look in MCC tab Network &amp; Internet, icon Set up a new network interface."
-msgstr "Если вы не знаете, что выбрать, посмотрите в Центре управления Mageia, пункт «Сеть и Интернет», раздел «Настройка нового сетевого интерфейса»."
+msgid ""
+"If you don't know what to choose, have a look in MCC tab Network &amp; "
+"Internet, icon Set up a new network interface."
+msgstr ""
+"Если вы не знаете, что выбрать, посмотрите в Центре управления Mageia, пункт "
+"«Сеть и Интернет», раздел «Настройка нового сетевого интерфейса»."
 
 #. type: Content of: <section><info><title>
 #: en/drakfont.xml:3
@@ -1965,13 +3062,25 @@ msgstr "drakfont.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakfont.xml:16
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakfont</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakfont</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakfont</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakfont</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:15
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia Control Center under the <emphasis role=\"bold\">System</emphasis> tab. It allows you to manage the fonts available on the computer. The main screen above shows:"
-msgstr "Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно получить из Центра управления Mageia, пункт <emphasis role=\"bold\">Система</emphasis>. С помощью этой программы вы сможете управлять шрифтами в операционной системе. В основном окне программы показано:"
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
+"Control Center under the <emphasis role=\"bold\">System</emphasis> tab. It "
+"allows you to manage the fonts available on the computer. The main screen "
+"above shows:"
+msgstr ""
+"Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить из Центра управления Mageia, пункт <emphasis role=\"bold\">Система</"
+"emphasis>. С помощью этой программы вы сможете управлять шрифтами в "
+"операционной системе. В основном окне программы показано:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/drakfont.xml:22
@@ -1991,12 +3100,18 @@ msgstr "кнопки, назначение которых описано ниж�
 #. type: Content of: <section><para>
 #: en/drakfont.xml:36
 msgid "<emphasis role=\"bold\">Get Windows Fonts: <emphasis/></emphasis>"
-msgstr "<emphasis role=\"bold\">Получить шрифты из Windows: <emphasis/></emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Получить шрифты из Windows: <emphasis/></emphasis>"
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:38
-msgid "This button automatically adds the fonts found on the Windows partition. You must have Microsoft Windows installed."
-msgstr "С помощью этой кнопки можно автоматически добавить шрифты, которые будут найдены на разделе с Windows. Чтобы этой кнопкой можно было воспользоваться, на вашем компьютере должена быть установлена Microsoft Windows."
+msgid ""
+"This button automatically adds the fonts found on the Windows partition. You "
+"must have Microsoft Windows installed."
+msgstr ""
+"С помощью этой кнопки можно автоматически добавить шрифты, которые будут "
+"найдены на разделе с Windows. Чтобы этой кнопкой можно было воспользоваться, "
+"на вашем компьютере должена быть установлена Microsoft Windows."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:41
@@ -2005,8 +3120,12 @@ msgstr "<emphasis role=\"bold\">Параметры:</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:43
-msgid "It allows you to specify the applications or devices (printers mostly)  able to use the fonts."
-msgstr "С помощью этого пункта вы можете указать программы или устройства (в основном принтеры), которые используют шрифты."
+msgid ""
+"It allows you to specify the applications or devices (printers mostly)  able "
+"to use the fonts."
+msgstr ""
+"С помощью этого пункта вы можете указать программы или устройства (в "
+"основном принтеры), которые используют шрифты."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:46
@@ -2015,8 +3134,14 @@ msgstr "<emphasis role=\"bold\">Удалить:</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:48
-msgid "This button is to remove installed fonts and possibly save some place.  Be careful when removing fonts because it may have serious consequences on the documents that use them."
-msgstr "Эта кнопка предназначена для удаления установленных шрифтов, для экономии места на диске. Будьте осторожны с удалением шрифтов, поскольку это может повредить просмотру документов, в которых эти шрифты использованы."
+msgid ""
+"This button is to remove installed fonts and possibly save some place.  Be "
+"careful when removing fonts because it may have serious consequences on the "
+"documents that use them."
+msgstr ""
+"Эта кнопка предназначена для удаления установленных шрифтов, для экономии "
+"места на диске. Будьте осторожны с удалением шрифтов, поскольку это может "
+"повредить просмотру документов, в которых эти шрифты использованы."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:52
@@ -2025,13 +3150,32 @@ msgstr "<emphasis role=\"bold\">Импортировать:</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:54
-msgid "Allows you to add fonts from a third party (CD, internet, ...). The supported formats are ttf, pfa, pfb, pcf, pfm and gsf. Click on the <emphasis role=\"bold\">Import</emphasis> button and then on <emphasis role=\"bold\">Add</emphasis>, a file manager pops up where you can select the fonts to install, click on <emphasis role=\"bold\">Install</emphasis> when done. They are installed in the folder /usr/share/fonts."
-msgstr "С помощью этой кнопки вы можете добавить сторонние шрифты (с компакт-дисков, интернета и т.д.). Среди поддерживаемых форматов: ttf, pfa, pfb, pcf, pfm и gsf. Нажмите кнопку <emphasis role=\"bold\">Импортировать</emphasis>, а затем кнопку <emphasis role=\"bold\">Добавить</emphasis>. В ответ будет открыто окно выбора файлов, с помощью которого вы можете выбрать файлы шрифтов для установки. Как только выбор будет сделан, нажмите кнопку <emphasis role=\"bold\">Установить</emphasis>. Шрифты будут установлены в каталог /usr/share/fonts."
+msgid ""
+"Allows you to add fonts from a third party (CD, internet, ...). The "
+"supported formats are ttf, pfa, pfb, pcf, pfm and gsf. Click on the "
+"<emphasis role=\"bold\">Import</emphasis> button and then on <emphasis role="
+"\"bold\">Add</emphasis>, a file manager pops up where you can select the "
+"fonts to install, click on <emphasis role=\"bold\">Install</emphasis> when "
+"done. They are installed in the folder /usr/share/fonts."
+msgstr ""
+"С помощью этой кнопки вы можете добавить сторонние шрифты (с компакт-дисков, "
+"интернета и т.д.). Среди поддерживаемых форматов: ttf, pfa, pfb, pcf, pfm и "
+"gsf. Нажмите кнопку <emphasis role=\"bold\">Импортировать</emphasis>, а "
+"затем кнопку <emphasis role=\"bold\">Добавить</emphasis>. В ответ будет "
+"открыто окно выбора файлов, с помощью которого вы можете выбрать файлы "
+"шрифтов для установки. Как только выбор будет сделан, нажмите кнопку "
+"<emphasis role=\"bold\">Установить</emphasis>. Шрифты будут установлены в "
+"каталог /usr/share/fonts."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:60
-msgid "If the newly installed (or removed) fonts doesn't appear in the Drakfont main screen, close and re open it to see the modifications."
-msgstr "Если в списке шрифтов Drakfont вы не увидите изменений в результате установки или удаления шрифтов, закройте окно программы и повторно откройте его. После этого внесённые изменения вступят в силу."
+msgid ""
+"If the newly installed (or removed) fonts doesn't appear in the Drakfont "
+"main screen, close and re open it to see the modifications."
+msgstr ""
+"Если в списке шрифтов Drakfont вы не увидите изменений в результате "
+"установки или удаления шрифтов, закройте окно программы и повторно откройте "
+"его. После этого внесённые изменения вступят в силу."
 
 #. type: Content of: <section><info><title>
 #: en/drakguard.xml:3
@@ -2050,39 +3194,75 @@ msgstr "drakguard.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakguard.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakguard</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakguard</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakguard</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakguard</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakguard.xml:14
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia Control Center, under the Security tab, labelled <guilabel>Parental Control</guilabel>. If you don't see this label, you have to install the drakguard package (not installed by default)."
-msgstr "Эту программу<placeholder type=\"footnote\" id=\"0\"/> можно запустить из Центра управления Mageia, пункт «Безопасность», раздел <guilabel>Родительский контроль</guilabel>. Если этого пункта на странице не будет, вам следует установить пакет drakguard (этот пакет по умолчанию не установлен)."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
+"Control Center, under the Security tab, labelled <guilabel>Parental Control</"
+"guilabel>. If you don't see this label, you have to install the drakguard "
+"package (not installed by default)."
+msgstr ""
+"Эту программу<placeholder type=\"footnote\" id=\"0\"/> можно запустить из "
+"Центра управления Mageia, пункт «Безопасность», раздел "
+"<guilabel>Родительский контроль</guilabel>. Если этого пункта на странице не "
+"будет, вам следует установить пакет drakguard (этот пакет по умолчанию не "
+"установлен)."
 
 #. type: Content of: <section><section><title>
-#: en/drakguard.xml:21
-#: en/msecgui.xml:19
+#: en/drakguard.xml:21 en/msecgui.xml:19
 msgid "Presentation"
 msgstr "Вступление"
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:23
-msgid "Drakguard is an easy way to set up parental controls on your computer to restrict who can do what, and at which times of day. Drakguard has three useful capabilities:"
-msgstr "Drakguard - это простой способ обеспечить работу родительского контроля на вашем компьютере, чтобы ограничить действий пользователей и определить временные рамки использования определённых программ в течение дня. В drakguard предусмотрены такие полезные возможности:"
+msgid ""
+"Drakguard is an easy way to set up parental controls on your computer to "
+"restrict who can do what, and at which times of day. Drakguard has three "
+"useful capabilities:"
+msgstr ""
+"Drakguard - это простой способ обеспечить работу родительского контроля на "
+"вашем компьютере, чтобы ограничить действий пользователей и определить "
+"временные рамки использования определённых программ в течение дня. В "
+"drakguard предусмотрены такие полезные возможности:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakguard.xml:29
-msgid "It restricts web access to named users to set times of day. It does this by controlling the shorewall firewall built into Mageia."
-msgstr "Ограничение доступа к интернету указанным пользователям в указанные временные интервалы. Это задание выполняется с помощью файервола shorewall, встроенного в Mageia."
+msgid ""
+"It restricts web access to named users to set times of day. It does this by "
+"controlling the shorewall firewall built into Mageia."
+msgstr ""
+"Ограничение доступа к интернету указанным пользователям в указанные "
+"временные интервалы. Это задание выполняется с помощью файервола shorewall, "
+"встроенного в Mageia."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakguard.xml:35
-msgid "It blocks execution of particular commands by named users so these users can only execute what you accept them to execute."
-msgstr "Запрет выполнения определенных команд указанным пользователям. Эти пользователи смогут выполнять только разрешённые вами команды."
+msgid ""
+"It blocks execution of particular commands by named users so these users can "
+"only execute what you accept them to execute."
+msgstr ""
+"Запрет выполнения определенных команд указанным пользователям. Эти "
+"пользователи смогут выполнять только разрешённые вами команды."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakguard.xml:40
-msgid "It restricts access to websites, both manually defined through blacklists/whitelists, but also dynamically based on the content of the website. To achieve this Drakguard uses the leading opensource parental control blocker DansGuardian."
-msgstr "Ограничение доступа к интернету на основе определённых вручную «чёрных» и «белых» списков или динамической блокировки на основе содержимого сайтов. Для выполнения этой задачи Drakguard использует ведущее решение с открытым кодом для родительского контроля - DansGuardian."
+msgid ""
+"It restricts access to websites, both manually defined through blacklists/"
+"whitelists, but also dynamically based on the content of the website. To "
+"achieve this Drakguard uses the leading opensource parental control blocker "
+"DansGuardian."
+msgstr ""
+"Ограничение доступа к интернету на основе определённых вручную «чёрных» и "
+"«белых» списков или динамической блокировки на основе содержимого сайтов. "
+"Для выполнения этой задачи Drakguard использует ведущее решение с открытым "
+"кодом для родительского контроля - DansGuardian."
 
 #. type: Content of: <section><section><title>
 #: en/drakguard.xml:49
@@ -2091,28 +3271,83 @@ msgstr "Настройка родительского контроля"
 
 #. type: Content of: <section><section><para><warning><para>
 #: en/drakguard.xml:52
-msgid "If your computer contains hard drive partitions that are formatted in Ext2, Ext3, or ReiserFS format you will see a pop up offering to configure ACL on your partitions. ACL stands for Access Control Lists, and is a Linux kernel feature that allows access to individual files to be restricted to named users. ACL is built into Ext4 and Btrfs file systems, but must be enabled by an option in Ext2, Ext3, or Reiserfs partitions. If you select 'Yes' to this prompt drakguard will configure all your partitions to support ACL, and will then suggest you reboot."
-msgstr "Если на вашем компьютере есть разделы жёсткого диска с файловыми системами Ext2, Ext3 или ReiserFS, то вы увидите контекстное окно с предложением настроить списки управления доступом ACL для этих разделов. ACL является возможностью ядра Linux, с помощью которой можно блокировать доступ к отдельным файлам указанным пользователям. ACL встроено в файловые системы Ext4 и Btrfs. Для разделов с файловыми системами Ext2, Ext3 или Reiserfs эти списки управления доступом следует включать отдельно. Если вы согласитесь с включением ACL, то drakguard настроит все разделы, которыми руководит операционная система с поддержкой ACL и предложит вам перезагрузить компьютер. (ACL - Access Control Lists расшифровывается как списки контроля доступа)."
+msgid ""
+"If your computer contains hard drive partitions that are formatted in Ext2, "
+"Ext3, or ReiserFS format you will see a pop up offering to configure ACL on "
+"your partitions. ACL stands for Access Control Lists, and is a Linux kernel "
+"feature that allows access to individual files to be restricted to named "
+"users. ACL is built into Ext4 and Btrfs file systems, but must be enabled by "
+"an option in Ext2, Ext3, or Reiserfs partitions. If you select 'Yes' to this "
+"prompt drakguard will configure all your partitions to support ACL, and will "
+"then suggest you reboot."
+msgstr ""
+"Если на вашем компьютере есть разделы жёсткого диска с файловыми системами "
+"Ext2, Ext3 или ReiserFS, то вы увидите контекстное окно с предложением "
+"настроить списки управления доступом ACL для этих разделов. ACL является "
+"возможностью ядра Linux, с помощью которой можно блокировать доступ к "
+"отдельным файлам указанным пользователям. ACL встроено в файловые системы "
+"Ext4 и Btrfs. Для разделов с файловыми системами Ext2, Ext3 или Reiserfs эти "
+"списки управления доступом следует включать отдельно. Если вы согласитесь с "
+"включением ACL, то drakguard настроит все разделы, которыми руководит "
+"операционная система с поддержкой ACL и предложит вам перезагрузить "
+"компьютер. (ACL - Access Control Lists расшифровывается как списки контроля "
+"доступа)."
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:61
-msgid "<guibutton>Enable parental control</guibutton>: If checked, the parental control is enabled and the access to <guilabel>Block programs</guilabel> tab is opened."
-msgstr "<guibutton>Включить родительский контроль</guibutton>: если отмечен этот пункт, родительский контроль будет включен. После этого программа откроет доступ к вкладке <guilabel>Заблокированные приложения</guilabel>."
+msgid ""
+"<guibutton>Enable parental control</guibutton>: If checked, the parental "
+"control is enabled and the access to <guilabel>Block programs</guilabel> tab "
+"is opened."
+msgstr ""
+"<guibutton>Включить родительский контроль</guibutton>: если отмечен этот "
+"пункт, родительский контроль будет включен. После этого программа откроет "
+"доступ к вкладке <guilabel>Заблокированные приложения</guilabel>."
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:65
-msgid "<guibutton>Block all network traffic</guibutton>: If checked, all the websites are blocked, except the ones in the whitelist tab. Otherwise, all the websites are allowed, except the ones in the blacklist tab."
-msgstr "<guibutton>Заблокировать весь сетевой трафик</guibutton>: если установлен этот пункт, все сайты будут заблокированы, кроме сайтов, указанных на вкладке «Белый список». Если пункт не выбран, то доступ ко всем сайтам будет открыт, кроме сайтов, указанных на вкладке «Чёрный список»."
+msgid ""
+"<guibutton>Block all network traffic</guibutton>: If checked, all the "
+"websites are blocked, except the ones in the whitelist tab. Otherwise, all "
+"the websites are allowed, except the ones in the blacklist tab."
+msgstr ""
+"<guibutton>Заблокировать весь сетевой трафик</guibutton>: если установлен "
+"этот пункт, все сайты будут заблокированы, кроме сайтов, указанных на "
+"вкладке «Белый список». Если пункт не выбран, то доступ ко всем сайтам будет "
+"открыт, кроме сайтов, указанных на вкладке «Чёрный список»."
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:69
-msgid "<guibutton>User access</guibutton>: Users on the left hand side will have their access restricted according to the rules you define. Users on the right hand side have unrestricted access so adult users of the computer are not inconvenienced. Select a user in the left hand side and click on <guibutton>Add</guibutton> to add him/her as an allowed user.  Select an user in the right hand side and click on <guibutton>Remove</guibutton> to remove him/her from the allowed users."
-msgstr "<guibutton>Доступ пользователей</guibutton>: доступ пользователей из левого списка будет ограничен в соответствии с определёнными вами правилами. Доступ пользователей из правого списка не будет ограничен, следовательно взрослые пользователи не будут иметь проблем. Выберите пользователя в левом списке и нажмите кнопку <guibutton>Добавить</guibutton>чтобы добавить пользователя к разрешенному списку. Выберите пользователя в правом списке и нажмите кнопку <guibutton>Удалить</guibutton>, чтобы удалить пользователя из списка пользователей без ограничения в доступе."
+msgid ""
+"<guibutton>User access</guibutton>: Users on the left hand side will have "
+"their access restricted according to the rules you define. Users on the "
+"right hand side have unrestricted access so adult users of the computer are "
+"not inconvenienced. Select a user in the left hand side and click on "
+"<guibutton>Add</guibutton> to add him/her as an allowed user.  Select an "
+"user in the right hand side and click on <guibutton>Remove</guibutton> to "
+"remove him/her from the allowed users."
+msgstr ""
+"<guibutton>Доступ пользователей</guibutton>: доступ пользователей из левого "
+"списка будет ограничен в соответствии с определёнными вами правилами. Доступ "
+"пользователей из правого списка не будет ограничен, следовательно взрослые "
+"пользователи не будут иметь проблем. Выберите пользователя в левом списке и "
+"нажмите кнопку <guibutton>Добавить</guibutton>чтобы добавить пользователя к "
+"разрешенному списку. Выберите пользователя в правом списке и нажмите кнопку "
+"<guibutton>Удалить</guibutton>, чтобы удалить пользователя из списка "
+"пользователей без ограничения в доступе."
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:77
-msgid "<guibutton>Time control:</guibutton> If checked, internet access is allowed with restrictions between the <guilabel>Start</guilabel> time and <guilabel>End</guilabel> time. It is totally blocked outside these time window."
-msgstr "<guibutton>Контроль времени:</guibutton> если установлен этот пункт, доступ к интернету будет разрешен с ограничениями в интервале от времени <guilabel>Начало</guilabel> до времени <guilabel>Конец</guilabel>. Доступ будет полностью заблокирован вне этих промежутков времени."
+msgid ""
+"<guibutton>Time control:</guibutton> If checked, internet access is allowed "
+"with restrictions between the <guilabel>Start</guilabel> time and "
+"<guilabel>End</guilabel> time. It is totally blocked outside these time "
+"window."
+msgstr ""
+"<guibutton>Контроль времени:</guibutton> если установлен этот пункт, доступ "
+"к интернету будет разрешен с ограничениями в интервале от времени "
+"<guilabel>Начало</guilabel> до времени <guilabel>Конец</guilabel>. Доступ "
+"будет полностью заблокирован вне этих промежутков времени."
 
 #. type: Content of: <section><section><section><title>
 #: en/drakguard.xml:83
@@ -2121,8 +3356,12 @@ msgstr "Вкладка «Чёрный»/«Белый» список"
 
 #. type: Content of: <section><section><section><para>
 #: en/drakguard.xml:85
-msgid "Enter the website URL in the first field at the top and click on the <guibutton>Add</guibutton> button."
-msgstr "Укажите адрес сайта в первом поле в верхней части окна и нажмите кнопку <guibutton>Добавить</guibutton>."
+msgid ""
+"Enter the website URL in the first field at the top and click on the "
+"<guibutton>Add</guibutton> button."
+msgstr ""
+"Укажите адрес сайта в первом поле в верхней части окна и нажмите кнопку "
+"<guibutton>Добавить</guibutton>."
 
 #. type: Content of: <section><section><section><title>
 #: en/drakguard.xml:90
@@ -2131,13 +3370,24 @@ msgstr "Вкладка «Заблокированные программы»"
 
 #. type: Content of: <section><section><section><para>
 #: en/drakguard.xml:92
-msgid "<guibutton>Block Defined Applications</guibutton>: Enables the use of ACL to restrict access to specific applications. Insert the path to the applications you wish to block."
-msgstr "<guibutton>Заблокировать программы</guibutton>: с помощью этого пункта можно включить использование ACL для ограничения доступа к определённым программам. Укажите путь к программе, доступ к которой вы хотите заблокировать."
+msgid ""
+"<guibutton>Block Defined Applications</guibutton>: Enables the use of ACL to "
+"restrict access to specific applications. Insert the path to the "
+"applications you wish to block."
+msgstr ""
+"<guibutton>Заблокировать программы</guibutton>: с помощью этого пункта можно "
+"включить использование ACL для ограничения доступа к определённым "
+"программам. Укажите путь к программе, доступ к которой вы хотите "
+"заблокировать."
 
 #. type: Content of: <section><section><section><para>
 #: en/drakguard.xml:96
-msgid "<guibutton>Unblock Users list</guibutton>: Users listed on the right hand side will not be subject to acl blocking."
-msgstr "<guibutton>Разблокировать пользователей</guibutton>: доступ пользователей из правого списка не подлежит блокировке на основе ACL."
+msgid ""
+"<guibutton>Unblock Users list</guibutton>: Users listed on the right hand "
+"side will not be subject to acl blocking."
+msgstr ""
+"<guibutton>Разблокировать пользователей</guibutton>: доступ пользователей из "
+"правого списка не подлежит блокировке на основе ACL."
 
 #. type: Content of: <section><info><title>
 #: en/drakgw.xml:9
@@ -2166,13 +3416,31 @@ msgstr "drakgw-net.png"
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:27
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>This is useful when you have a computer (3) which has Internet (2) access and is connected also to a local network (1). You can use computer (3) as a gateway to give that access to other workstations (5) and (6) in the local network (1). For this, the gateway must have two interfaces; the first one such as an ethernet card must be connected to the local network, and the second one (4) connected to the Internet (2)."
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Эта программа будет полезна, если ваш компьютер (3) с доступом к интернету (2) соединен также с локальной сетью (1). Вы можете воспользоваться компьютером (3) как шлюзом, чтобы предоставить доступ другим рабочим станциям (5) и (6) в локальной сети (1). Для этого у шлюза должно быть два интерфейса; первый, например, карта Ethernet, должен быть соединен с локальной сетью, а второй (4) - соединен с интернетом (2)."
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>This is useful when you have a "
+"computer (3) which has Internet (2) access and is connected also to a local "
+"network (1). You can use computer (3) as a gateway to give that access to "
+"other workstations (5) and (6) in the local network (1). For this, the "
+"gateway must have two interfaces; the first one such as an ethernet card "
+"must be connected to the local network, and the second one (4) connected to "
+"the Internet (2)."
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Эта программа будет полезна, "
+"если ваш компьютер (3) с доступом к интернету (2) соединен также с локальной "
+"сетью (1). Вы можете воспользоваться компьютером (3) как шлюзом, чтобы "
+"предоставить доступ другим рабочим станциям (5) и (6) в локальной сети (1). "
+"Для этого у шлюза должно быть два интерфейса; первый, например, карта "
+"Ethernet, должен быть соединен с локальной сетью, а второй (4) - соединен с "
+"интернетом (2)."
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:39
-msgid "The first step is to verify that the network and the access to Internet are set up, as documented in <xref linkend=\"draknetcenter\"/>."
-msgstr "На первом шаге следует проверить, настроена ли сеть и доступ к интернету, как это задокументировано в разделе <xref linkend=\"draknetcenter\"/>."
+msgid ""
+"The first step is to verify that the network and the access to Internet are "
+"set up, as documented in <xref linkend=\"draknetcenter\"/>."
+msgstr ""
+"На первом шаге следует проверить, настроена ли сеть и доступ к интернету, "
+"как это задокументировано в разделе <xref linkend=\"draknetcenter\"/>."
 
 #. type: Content of: <section><section><title>
 #: en/drakgw.xml:45
@@ -2181,58 +3449,118 @@ msgstr "Мастер настройки шлюза"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakgw.xml:48
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakgw</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakgw</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakgw</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakgw</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:47
-msgid "The wizard<placeholder type=\"footnote\" id=\"0\"/> offers successive steps which are shown below:"
-msgstr "Мастер предложит<placeholder type=\"footnote\" id=\"0\"/> последовательные шаги, описание которых приведено ниже:"
+msgid ""
+"The wizard<placeholder type=\"footnote\" id=\"0\"/> offers successive steps "
+"which are shown below:"
+msgstr ""
+"Мастер предложит<placeholder type=\"footnote\" id=\"0\"/> последовательные "
+"шаги, описание которых приведено ниже:"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:54
-msgid "If the wizard does not detect at least two interfaces, it warns about this and asks to stop the network and configure the hardware."
-msgstr "Если мастеру не удастся обнаружить по крайней мере два интерфейса, он предупредит об этом и попросит вас прекратить работу сети и настроить оборудование."
+msgid ""
+"If the wizard does not detect at least two interfaces, it warns about this "
+"and asks to stop the network and configure the hardware."
+msgstr ""
+"Если мастеру не удастся обнаружить по крайней мере два интерфейса, он "
+"предупредит об этом и попросит вас прекратить работу сети и настроить "
+"оборудование."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:60
-msgid "specify the interface used for the Internet connection. The wizard automatically suggests one of the interfaces, but you should verify that what is proposed is correct."
-msgstr "Укажите интерфейс, который будет использоваться для соединения с интернетом. Мастер настройки автоматически предложит один из следующих интерфейсов, но вам следует проверить корректность его предложения."
+msgid ""
+"specify the interface used for the Internet connection. The wizard "
+"automatically suggests one of the interfaces, but you should verify that "
+"what is proposed is correct."
+msgstr ""
+"Укажите интерфейс, который будет использоваться для соединения с интернетом. "
+"Мастер настройки автоматически предложит один из следующих интерфейсов, но "
+"вам следует проверить корректность его предложения."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:66
-msgid "specify which interface is used for the Lan access. The wizard also proposes one, check that this is correct."
-msgstr "Укажите интерфейс, который будет использоваться для соединений с локальной сетью. Мастер снова предложит свой вариант. Проверьте, является ли он корректным."
+msgid ""
+"specify which interface is used for the Lan access. The wizard also proposes "
+"one, check that this is correct."
+msgstr ""
+"Укажите интерфейс, который будет использоваться для соединений с локальной "
+"сетью. Мастер снова предложит свой вариант. Проверьте, является ли он "
+"корректным."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:71
-msgid "The wizard proposes parameters for the Lan network, such as IP address, mask and domain name. Check that these parameters are compatible with the actual configuration. It is recommended that you accept these values."
-msgstr "Мастер предложит параметры для локальной сети, в частности IP-адрес, маску сети и название домена. Проверьте, совместимы ли эти параметры с текущей конфигурацией. Рекомендуем вам воспользоваться предлагаемыми значениями."
+msgid ""
+"The wizard proposes parameters for the Lan network, such as IP address, mask "
+"and domain name. Check that these parameters are compatible with the actual "
+"configuration. It is recommended that you accept these values."
+msgstr ""
+"Мастер предложит параметры для локальной сети, в частности IP-адрес, маску "
+"сети и название домена. Проверьте, совместимы ли эти параметры с текущей "
+"конфигурацией. Рекомендуем вам воспользоваться предлагаемыми значениями."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:78
-msgid "specify if the computer has to be used as a DNS server. If yes, the wizard will check that <code>bind</code> is installed.  Otherwise, you have to specify the address of a DNS server."
-msgstr "Укажите, следует ли использовать компьютер как сервер DNS. Если вы ответите утвердительно, мастер проверит, установлен ли в системе <code>bind</code>. Если вы не намерены использовать компьютер как DNS-сервер, то укажите адрес DNS-сервера."
+msgid ""
+"specify if the computer has to be used as a DNS server. If yes, the wizard "
+"will check that <code>bind</code> is installed.  Otherwise, you have to "
+"specify the address of a DNS server."
+msgstr ""
+"Укажите, следует ли использовать компьютер как сервер DNS. Если вы ответите "
+"утвердительно, мастер проверит, установлен ли в системе <code>bind</code>. "
+"Если вы не намерены использовать компьютер как DNS-сервер, то укажите адрес "
+"DNS-сервера."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:84
-msgid "specify if the computer is to be used as a DHCP server. If yes, the wizard will check that <code>dhcp-server</code> is installed and offer to configure it, with start and end addresses in the DHCP range."
-msgstr "Укажите, следует ли использовать компьютер как сервер DHCP. Если да, то мастер проверит, установлен ли пакет <code>dhcp-server</code> и предложит вам его настроить, указав начальный и конечный адреса в диапазоне DHCP."
+msgid ""
+"specify if the computer is to be used as a DHCP server. If yes, the wizard "
+"will check that <code>dhcp-server</code> is installed and offer to configure "
+"it, with start and end addresses in the DHCP range."
+msgstr ""
+"Укажите, следует ли использовать компьютер как сервер DHCP. Если да, то "
+"мастер проверит, установлен ли пакет <code>dhcp-server</code> и предложит "
+"вам его настроить, указав начальный и конечный адреса в диапазоне DHCP."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:91
-msgid "specify if the computer is to be used as a proxy server. If yes, the wizard will check that <code>squid</code> is installed and offer to configure it, with the address of the administrator (admin@mydomain.com), name of the proxy (myfirewall@mydomaincom), the port (3128) and the cache size (100 Mb)."
-msgstr "Укажите, следует ли использовать компьютер в качестве прокси-сервера. Если да, то мастер проверит, установлен ли пакет <code>squid</code> и предложит вам настроить прокси-сервер, указав адрес администратора сервера (по умолчанию admin@mydomain.com), название прокси-сервера (по умолчанию myfirewall@mydomaincom), порт (по умолчанию 3128) и размер кэша (по умолчанию 100 МБ)."
+msgid ""
+"specify if the computer is to be used as a proxy server. If yes, the wizard "
+"will check that <code>squid</code> is installed and offer to configure it, "
+"with the address of the administrator (admin@mydomain.com), name of the "
+"proxy (myfirewall@mydomaincom), the port (3128) and the cache size (100 Mb)."
+msgstr ""
+"Укажите, следует ли использовать компьютер в качестве прокси-сервера. Если "
+"да, то мастер проверит, установлен ли пакет <code>squid</code> и предложит "
+"вам настроить прокси-сервер, указав адрес администратора сервера (по "
+"умолчанию admin@mydomain.com), название прокси-сервера (по умолчанию "
+"myfirewall@mydomaincom), порт (по умолчанию 3128) и размер кэша (по "
+"умолчанию 100 МБ)."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:99
-msgid "The last step allows you to check if the gateway machine is connected to printers and to share them."
-msgstr "На последнем шаге вы можете проверить, подключена ли машина-шлюз к принтерам и следует ли предоставлять эти принтеры в общее пользование."
+msgid ""
+"The last step allows you to check if the gateway machine is connected to "
+"printers and to share them."
+msgstr ""
+"На последнем шаге вы можете проверить, подключена ли машина-шлюз к принтерам "
+"и следует ли предоставлять эти принтеры в общее пользование."
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:104
-msgid "You will be warned about the need to check the firewall if it is active."
-msgstr "Программа предупредит вас о необходимости проверки параметров файервола, если он активен."
+msgid ""
+"You will be warned about the need to check the firewall if it is active."
+msgstr ""
+"Программа предупредит вас о необходимости проверки параметров файервола, "
+"если он активен."
 
 #. type: Content of: <section><section><title>
 #: en/drakgw.xml:109
@@ -2241,13 +3569,29 @@ msgstr "Настройка клиента"
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:111
-msgid "If you have configured the gateway machine with DHCP, you only need to specify in the network configuration tool that you get an address automatically (using DHCP). The parameters will be obtained when connecting to the network. This method is valid whatever operating system the client is using."
-msgstr "Если вами был настроен компьютер-шлюз с DHCP, достаточно будет указать с помощью средства настройки сети, что адрес будет получен автоматически (по DHCP). Параметры будут получены во время установления соединения с сетью. Этот способ будет работать независимо от операционной системы, установленной на клиентских компьютерах."
+msgid ""
+"If you have configured the gateway machine with DHCP, you only need to "
+"specify in the network configuration tool that you get an address "
+"automatically (using DHCP). The parameters will be obtained when connecting "
+"to the network. This method is valid whatever operating system the client is "
+"using."
+msgstr ""
+"Если вами был настроен компьютер-шлюз с DHCP, достаточно будет указать с "
+"помощью средства настройки сети, что адрес будет получен автоматически (по "
+"DHCP). Параметры будут получены во время установления соединения с сетью. "
+"Этот способ будет работать независимо от операционной системы, установленной "
+"на клиентских компьютерах."
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:117
-msgid "If you must manually specify the network parameters, you must in particular specify the gateway by entering the IP-address of the machine acting as the gateway."
-msgstr "Если параметры сети не будут определяться автоматически, вам следует в частности указать шлюз сети, введя IP-адрес компьютера, который будет работать как шлюз."
+msgid ""
+"If you must manually specify the network parameters, you must in particular "
+"specify the gateway by entering the IP-address of the machine acting as the "
+"gateway."
+msgstr ""
+"Если параметры сети не будут определяться автоматически, вам следует в "
+"частности указать шлюз сети, введя IP-адрес компьютера, который будет "
+"работать как шлюз."
 
 #. type: Content of: <section><section><title>
 #: en/drakgw.xml:123
@@ -2256,8 +3600,14 @@ msgstr "Прекращение совместного использования
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:125
-msgid "If you want to stop sharing the connection on the Mageia computer, launch the tool. It will offer to reconfigure the connection or to stop the sharing."
-msgstr "Если вам нужно будет прекратить совместное использование соединения на компьютере под управлением Mageia, запустите эту программу. Она предложит вам перенастроить подключение или прекратить совместное использование соединения."
+msgid ""
+"If you want to stop sharing the connection on the Mageia computer, launch "
+"the tool. It will offer to reconfigure the connection or to stop the sharing."
+msgstr ""
+"Если вам нужно будет прекратить совместное использование соединения на "
+"компьютере под управлением Mageia, запустите эту программу. Она предложит "
+"вам перенастроить подключение или прекратить совместное использование "
+"соединения."
 
 #. type: Content of: <section><info><title>
 #: en/drakhosts.xml:3
@@ -2276,13 +3626,26 @@ msgstr "drakhosts.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakhosts.xml:16
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakhosts</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakhosts</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakhosts</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakhosts</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:14
-msgid "If some systems on your network grant you services, and have fixed IP-addresses, this tool<placeholder type=\"footnote\" id=\"0\"/> allows to specify a name to access them more easily. Then you can use that name instead of the IP-address."
-msgstr "Если некоторые из компьютеров в вашей сети предоставляют доступ к собственным службам и IP-адреса этих компьютеров являются фиксированными, то с помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы сможете указать название службы, чтобы упростить доступ к ней. После определения названия вы сможете использовать её вместо IP-адреса."
+msgid ""
+"If some systems on your network grant you services, and have fixed IP-"
+"addresses, this tool<placeholder type=\"footnote\" id=\"0\"/> allows to "
+"specify a name to access them more easily. Then you can use that name "
+"instead of the IP-address."
+msgstr ""
+"Если некоторые из компьютеров в вашей сети предоставляют доступ к "
+"собственным службам и IP-адреса этих компьютеров являются фиксированными, то "
+"с помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы сможете "
+"указать название службы, чтобы упростить доступ к ней. После определения "
+"названия вы сможете использовать её вместо IP-адреса."
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:20
@@ -2291,8 +3654,15 @@ msgstr "<guibutton>Добавить</guibutton>"
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:22
-msgid "With this button, you add the name for a new system. You will get a window to specify the IP-address, the host name for the system, and optionally an alias which can be used in the same way that the name is."
-msgstr "С помощью этой кнопки можно добавлять названия новых систем. После ее нажатия откроется окно для указания IP-адреса, названия узла системы и если нужно, альтернативного названия, используемого таким же образом, что и основное название."
+msgid ""
+"With this button, you add the name for a new system. You will get a window "
+"to specify the IP-address, the host name for the system, and optionally an "
+"alias which can be used in the same way that the name is."
+msgstr ""
+"С помощью этой кнопки можно добавлять названия новых систем. После ее "
+"нажатия откроется окно для указания IP-адреса, названия узла системы и если "
+"нужно, альтернативного названия, используемого таким же образом, что и "
+"основное название."
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:27
@@ -2301,8 +3671,14 @@ msgstr "<guibutton>Изменить</guibutton>"
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:29
-msgid "You can access the parameters of an entry previously defined. You get the same window."
-msgstr "С помощью этой кнопки можно получить доступ к изменению параметров ранее определенной записи. Окно, которое будет открыто в ответ на нажатие этой кнопки, является тем же самым, что и окно, которое можно открыть с помощью предыдущей кнопки."
+msgid ""
+"You can access the parameters of an entry previously defined. You get the "
+"same window."
+msgstr ""
+"С помощью этой кнопки можно получить доступ к изменению параметров ранее "
+"определенной записи. Окно, которое будет открыто в ответ на нажатие этой "
+"кнопки, является тем же самым, что и окно, которое можно открыть с помощью "
+"предыдущей кнопки."
 
 #. type: Content of: <section><info><title>
 #: en/drakinvictus.xml:3
@@ -2320,19 +3696,27 @@ msgid "drakinvictus.png"
 msgstr "drakinvictus.png"
 
 #. type: Content of: <section><para>
-#: en/drakinvictus.xml:12
-#: en/draknetcenter.xml:187
-#: en/draknetprofile.xml:12
-#: en/drakups.xml:12
-#: en/drakwizard_bind.xml:12
-#: en/drakxservices.xml:12
-msgid "This page hasn't been written yet for lack of resources. If you think you can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
-msgstr "Эта страница еще не написана из-за нехватки ресурсов у команды. Если вы считаете, что можете написать эту справочную страницу, пожалуйста, свяжитесь с <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">командой по документированию</link>. Заранее благодарны вам за помощь."
+#: en/drakinvictus.xml:12 en/draknetcenter.xml:187 en/draknetprofile.xml:12
+#: en/drakups.xml:12 en/drakwizard_bind.xml:12 en/drakxservices.xml:12
+msgid ""
+"This page hasn't been written yet for lack of resources. If you think you "
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
+msgstr ""
+"Эта страница еще не написана из-за нехватки ресурсов у команды. Если вы "
+"считаете, что можете написать эту справочную страницу, пожалуйста, свяжитесь "
+"с <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">командой "
+"по документированию</link>. Заранее благодарны вам за помощь."
 
 #. type: Content of: <section><para>
 #: en/drakinvictus.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakinvictus</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakinvictus</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakinvictus</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakinvictus</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><info><title>
 #: en/draknetcenter.xml:10
@@ -2351,18 +3735,45 @@ msgstr "draknetcenter.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/draknetcenter.xml:22
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">draknetcenter</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">draknetcenter</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknetcenter</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">draknetcenter</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/draknetcenter.xml:21
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the Network &amp; Internet tab in the Mageia Control Center labelled \"Network Center\""
-msgstr "Доступ к этому модулю<placeholder type=\"footnote\" id=\"0\"/> можно получить с помощью пункта «Сеть и Интернет» из Центра управления Mageia. Раздел подписан «Сетевой центр»."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
+"Network &amp; Internet tab in the Mageia Control Center labelled \"Network "
+"Center\""
+msgstr ""
+"Доступ к этому модулю<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить с помощью пункта «Сеть и Интернет» из Центра управления Mageia. "
+"Раздел подписан «Сетевой центр»."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:31
-msgid "When this tool is launched, a window opens listing all the networks configured on the computer, whatever their type (wired, wireless, satellite, etc.). When clicking on one of them, three or four buttons appear, depending on the network type, to allow you to look after the network, change its settings or connect/disconnect. This tool isn't intended to create a network, for this see <guilabel>Set up a new network interface (LAN, ISDN, ADSL, ...)</guilabel> in the same MCC tab."
-msgstr "После запуска модуля будет открыто окно со списком всех сетей, настроенных на компьютере, независимо от типа (проводная, беспроводная, спутниковая и т.д.). В ответ на нажатие пункта сети будет показано три или четыре кнопки, в зависимости от типа сети. С помощью этих кнопок вы сможете наблюдать за сетью, изменять параметры работы сети, устанавливать и разрывать соединение. Этот модуль не предназначен для создания самого соединения. Создать само соединение можно с помощью пункта <guilabel>Создать новый сетевой интерфейс (LAN, ISDN, ADSL, ...)</guilabel> на той же странице Центра управления Mageia."
+msgid ""
+"When this tool is launched, a window opens listing all the networks "
+"configured on the computer, whatever their type (wired, wireless, satellite, "
+"etc.). When clicking on one of them, three or four buttons appear, depending "
+"on the network type, to allow you to look after the network, change its "
+"settings or connect/disconnect. This tool isn't intended to create a "
+"network, for this see <guilabel>Set up a new network interface (LAN, ISDN, "
+"ADSL, ...)</guilabel> in the same MCC tab."
+msgstr ""
+"После запуска модуля будет открыто окно со списком всех сетей, настроенных "
+"на компьютере, независимо от типа (проводная, беспроводная, спутниковая и т."
+"д.). В ответ на нажатие пункта сети будет показано три или четыре кнопки, в "
+"зависимости от типа сети. С помощью этих кнопок вы сможете наблюдать за "
+"сетью, изменять параметры работы сети, устанавливать и разрывать соединение. "
+"Этот модуль не предназначен для создания самого соединения. Создать само "
+"соединение можно с помощью пункта <guilabel>Создать новый сетевой интерфейс "
+"(LAN, ISDN, ADSL, ...)</guilabel> на той же странице Центра управления "
+"Mageia."
 
 #. type: Attribute 'fileref' of: <section><section><para><inlinemediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:43
@@ -2386,18 +3797,60 @@ msgstr "../draknetcenterWireless-on.png"
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:39
-msgid "In the screenshot below, given as example, we can see two networks, the first one is wired and connected, recognizable by this icon <placeholder type=\"inlinemediaobject\" id=\"0\"/> (this one is not connected<placeholder type=\"inlinemediaobject\" id=\"1\"/> ) and the second section shows wireless networks, not connected recognizable by this icon <placeholder type=\"inlinemediaobject\" id=\"2\"/> and this one <placeholder type=\"inlinemediaobject\" id=\"3\"/>if connected. For the other network types, the colour code is always the same, green if connected and red if not connected."
-msgstr "На приведенном ниже скриншоте показан пример с двумя сетями. Первая из сетей проводная, с ней установлено соединение, о чем можно узнать из соответствующей иконки <placeholder type=\"inlinemediaobject\" id=\"0\"/> (сети, с которыми установлено соединение, обозначаются так: <placeholder type=\"inlinemediaobject\" id=\"1\"/> ). Второй же пункт показывает беспроводную сеть, с которой установлено соединение, что обозначено иконкой <placeholder type=\"inlinemediaobject\" id=\"2\"/>. Если соединение было установлено, будет показана такая иконка: <placeholder type=\"inlinemediaobject\" id=\"3\"/>. Обозначения цветами состояния соединения для других сетей является такими: зеленый цвет обозначает, что соединение установлено, а красный - не установлено."
+msgid ""
+"In the screenshot below, given as example, we can see two networks, the "
+"first one is wired and connected, recognizable by this icon <placeholder "
+"type=\"inlinemediaobject\" id=\"0\"/> (this one is not connected<placeholder "
+"type=\"inlinemediaobject\" id=\"1\"/> ) and the second section shows "
+"wireless networks, not connected recognizable by this icon <placeholder type="
+"\"inlinemediaobject\" id=\"2\"/> and this one <placeholder type="
+"\"inlinemediaobject\" id=\"3\"/>if connected. For the other network types, "
+"the colour code is always the same, green if connected and red if not "
+"connected."
+msgstr ""
+"На приведенном ниже скриншоте показан пример с двумя сетями. Первая из сетей "
+"проводная, с ней установлено соединение, о чем можно узнать из "
+"соответствующей иконки <placeholder type=\"inlinemediaobject\" id=\"0\"/> "
+"(сети, с которыми установлено соединение, обозначаются так: <placeholder "
+"type=\"inlinemediaobject\" id=\"1\"/> ). Второй же пункт показывает "
+"беспроводную сеть, с которой установлено соединение, что обозначено иконкой "
+"<placeholder type=\"inlinemediaobject\" id=\"2\"/>. Если соединение было "
+"установлено, будет показана такая иконка: <placeholder type="
+"\"inlinemediaobject\" id=\"3\"/>. Обозначения цветами состояния соединения "
+"для других сетей является такими: зеленый цвет обозначает, что соединение "
+"установлено, а красный - не установлено."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:62
-msgid "In the wireless part of the screen, you can also see all the detected networks, with the <guilabel>SSID</guilabel>, the <guilabel>Signal strengh</guilabel>, if they are encrypted (in red) or not (in green), and the <guilabel>Operating mode</guilabel>. Click on the chosen one and then either on <guibutton>Monitor</guibutton>, <guibutton>Configure</guibutton> or <guibutton>Connect</guibutton>. It is possible here to go from a network to another one. If a private network is selected, the Network Settings window (see below) will open and ask you for extra settings ( an encryption key in particular)."
-msgstr "В разделе беспроводной сети отображается список обнаруженных сетей с данными по <guilabel>SSID</guilabel>, <guilabel>Мощность сигнала</guilabel>, использование шифрования в сети (красный - используется шифрование, зеленый - шифрование не используется) и <guilabel>Режим работы</guilabel>. Щелкните на желаемом пункте, а затем нажмите одну из этих кнопок: <guibutton>Наблюдать</guibutton>, <guibutton>Настроить</guibutton> или <guibutton>Соединиться</guibutton>. Так можно переключать систему с использования одной сети на использование другой. Если выбрать частную сеть, будет открыто окно параметров сети (см. ниже), с помощью которого программа попытается узнать у вас значения дополнительных параметров (в частности ключа шифрования)."
+msgid ""
+"In the wireless part of the screen, you can also see all the detected "
+"networks, with the <guilabel>SSID</guilabel>, the <guilabel>Signal strengh</"
+"guilabel>, if they are encrypted (in red) or not (in green), and the "
+"<guilabel>Operating mode</guilabel>. Click on the chosen one and then either "
+"on <guibutton>Monitor</guibutton>, <guibutton>Configure</guibutton> or "
+"<guibutton>Connect</guibutton>. It is possible here to go from a network to "
+"another one. If a private network is selected, the Network Settings window "
+"(see below) will open and ask you for extra settings ( an encryption key in "
+"particular)."
+msgstr ""
+"В разделе беспроводной сети отображается список обнаруженных сетей с данными "
+"по <guilabel>SSID</guilabel>, <guilabel>Мощность сигнала</guilabel>, "
+"использование шифрования в сети (красный - используется шифрование, зеленый "
+"- шифрование не используется) и <guilabel>Режим работы</guilabel>. Щелкните "
+"на желаемом пункте, а затем нажмите одну из этих кнопок: "
+"<guibutton>Наблюдать</guibutton>, <guibutton>Настроить</guibutton> или "
+"<guibutton>Соединиться</guibutton>. Так можно переключать систему с "
+"использования одной сети на использование другой. Если выбрать частную сеть, "
+"будет открыто окно параметров сети (см. ниже), с помощью которого программа "
+"попытается узнать у вас значения дополнительных параметров (в частности "
+"ключа шифрования)."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:72
 msgid "Click on <guibutton>Refresh</guibutton> to update the screen."
-msgstr "Нажмите кнопку <guibutton>Обновить</guibutton>, чтобы обновить данные на экране."
+msgstr ""
+"Нажмите кнопку <guibutton>Обновить</guibutton>, чтобы обновить данные на "
+"экране."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:76
@@ -2416,18 +3869,39 @@ msgstr "draknetcenter4.png"
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:92
-msgid "This button allows you to watch the network activity, downloads (toward the PC, in red) and uploads (toward the Internet, in green). The same screen is available by right clicking on the <guimenu>Internet icon in the system tray -> Monitor Network</guimenu>."
-msgstr "С помощью этой кнопки вы сможете наблюдать за обменом данными в сети, получением компьютером данных («Получение», красная линия) и выгрузкой данных («Отдача», зеленая линия). Доступ к этому инструменту можно получить наведя указатель мыши на иконку управления интернетом в трее, щелкнув правой кнопкой мыши и выбрав пункт <guimenu>Мониторинг сети</guimenu>."
+msgid ""
+"This button allows you to watch the network activity, downloads (toward the "
+"PC, in red) and uploads (toward the Internet, in green). The same screen is "
+"available by right clicking on the <guimenu>Internet icon in the system tray "
+"-> Monitor Network</guimenu>."
+msgstr ""
+"С помощью этой кнопки вы сможете наблюдать за обменом данными в сети, "
+"получением компьютером данных («Получение», красная линия) и выгрузкой "
+"данных («Отдача», зеленая линия). Доступ к этому инструменту можно получить "
+"наведя указатель мыши на иконку управления интернетом в трее, щелкнув правой "
+"кнопкой мыши и выбрав пункт <guimenu>Мониторинг сети</guimenu>."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:97
-msgid "There is a tab for each network (here eth0 is the wired network, lo the local loopback and wlan0 the wireless network) and a tab connection which gives details about connection status."
-msgstr "Для каждого из интерфейсов сети предусмотрена собственная вкладка (в нашем примере, eth0 - проводная сеть, lo - локальный петлевой интерфейс, а wlan0 - беспроводная сеть). Кроме того, будет показана вкладка «подключения», с помощью которой можно наблюдать за состоянием соединений."
+msgid ""
+"There is a tab for each network (here eth0 is the wired network, lo the "
+"local loopback and wlan0 the wireless network) and a tab connection which "
+"gives details about connection status."
+msgstr ""
+"Для каждого из интерфейсов сети предусмотрена собственная вкладка (в нашем "
+"примере, eth0 - проводная сеть, lo - локальный петлевой интерфейс, а wlan0 - "
+"беспроводная сеть). Кроме того, будет показана вкладка «подключения», с "
+"помощью которой можно наблюдать за состоянием соединений."
 
 #. type: Content of: <section><section><note><para>
 #: en/draknetcenter.xml:102
-msgid "At the bottom of the window is a title <guilabel>Traffic accounting</guilabel>, we will look at that in the next section."
-msgstr "В нижней части списка пунктов, вы увидите пункт <guilabel>Включить учет трафика</guilabel>, подробное описание которого приведено в следующем разделе."
+msgid ""
+"At the bottom of the window is a title <guilabel>Traffic accounting</"
+"guilabel>, we will look at that in the next section."
+msgstr ""
+"В нижней части списка пунктов, вы увидите пункт <guilabel>Включить учет "
+"трафика</guilabel>, подробное описание которого приведено в следующем "
+"разделе."
 
 #. type: Content of: <section><section><title>
 #: en/draknetcenter.xml:108
@@ -2446,27 +3920,56 @@ msgstr "draknetcenter2.png"
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:118
-msgid "It is possible to change all the settings given during network creation. Most of the time, checking <guibutton>Automatic IP</guibutton> <guibutton>(BOOTP/DHCP)</guibutton> will do, but in case of problems, manual configuration may give better results."
-msgstr "Можно изменить все параметры, определенные во время создания сети. В подавляющем большинстве случаев стоит отметить пункт <guibutton>Автоматический IP</guibutton> <guibutton>(BOOTP/DHCP)</guibutton>, но если возникают проблемы, то определение адреса вручную может быть лучшим вариантом."
+msgid ""
+"It is possible to change all the settings given during network creation. "
+"Most of the time, checking <guibutton>Automatic IP</guibutton> "
+"<guibutton>(BOOTP/DHCP)</guibutton> will do, but in case of problems, manual "
+"configuration may give better results."
+msgstr ""
+"Можно изменить все параметры, определенные во время создания сети. В "
+"подавляющем большинстве случаев стоит отметить пункт "
+"<guibutton>Автоматический IP</guibutton> <guibutton>(BOOTP/DHCP)</"
+"guibutton>, но если возникают проблемы, то определение адреса вручную может "
+"быть лучшим вариантом."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:123
-msgid "For a residential network, the <guilabel>IP address</guilabel> always looks like 192.168.0.x, <guilabel>Netmask</guilabel> is 255.255.255.0, and the <guilabel>Gateway</guilabel> and <guilabel>DNS servers</guilabel> are available from your providers website."
-msgstr " В домашних сетях <guilabel>IP-адреса</guilabel> всегда имеют следующий формат: <emphasis>192.168.0.x</emphasis>. <guilabel>Маска сети</guilabel> <emphasis>255.255.255.0</emphasis>. А данные по <guilabel>шлюзу</guilabel> и <guilabel>DNS-серверам</guilabel> можно получить на сайте вашего провайдера."
+msgid ""
+"For a residential network, the <guilabel>IP address</guilabel> always looks "
+"like 192.168.0.x, <guilabel>Netmask</guilabel> is 255.255.255.0, and the "
+"<guilabel>Gateway</guilabel> and <guilabel>DNS servers</guilabel> are "
+"available from your providers website."
+msgstr ""
+" В домашних сетях <guilabel>IP-адреса</guilabel> всегда имеют следующий "
+"формат: <emphasis>192.168.0.x</emphasis>. <guilabel>Маска сети</guilabel> "
+"<emphasis>255.255.255.0</emphasis>. А данные по <guilabel>шлюзу</guilabel> и "
+"<guilabel>DNS-серверам</guilabel> можно получить на сайте вашего провайдера."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:128
-msgid "<guibutton>Enable traffic accounting</guibutton> if checked this will count the traffic on a hourly, daily or monthly basis. The results are visible in the Network monitor detailed in the previous section. Once enabled, you may have to reconnect to the network."
-msgstr "<guibutton>Включить учет трафика</guibutton>: если отмечен этот пункт, то программа будет выполнять почасовой, ежедневный и ежемесячный учет обмена данными. Результаты можно будет просмотреть с помощью средства наблюдения за сетью, подробно описанного в предыдущем разделе. После включения учёта может потребоваться повторное подключение к сети, чтобы учет был начат."
+msgid ""
+"<guibutton>Enable traffic accounting</guibutton> if checked this will count "
+"the traffic on a hourly, daily or monthly basis. The results are visible in "
+"the Network monitor detailed in the previous section. Once enabled, you may "
+"have to reconnect to the network."
+msgstr ""
+"<guibutton>Включить учет трафика</guibutton>: если отмечен этот пункт, то "
+"программа будет выполнять почасовой, ежедневный и ежемесячный учет обмена "
+"данными. Результаты можно будет просмотреть с помощью средства наблюдения за "
+"сетью, подробно описанного в предыдущем разделе. После включения учёта может "
+"потребоваться повторное подключение к сети, чтобы учет был начат."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:133
-msgid "<emphasis role=\"bold\">Allow interface to be controlled by Network Manager:</emphasis>"
-msgstr "<emphasis role=\"bold\">Разрешить управление интерфейсом с помощью Network Manager:</emphasis>"
+msgid ""
+"<emphasis role=\"bold\">Allow interface to be controlled by Network Manager:"
+"</emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Разрешить управление интерфейсом с помощью Network "
+"Manager:</emphasis>"
 
 #. type: Content of: <section><section><para>
-#: en/draknetcenter.xml:140
-#: en/draknetcenter.xml:185
+#: en/draknetcenter.xml:140 en/draknetcenter.xml:185
 msgid "<guibutton>The button Advanced:</guibutton>"
 msgstr "<guibutton>Кнопка «Дополнительно»:</guibutton>"
 
@@ -2497,8 +4000,19 @@ msgstr "<emphasis role=\"bold\">Режим работы:</emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:164
-msgid "Select <guilabel>Managed</guilabel> if the connection is via an access point, there is an <emphasis role=\"bold\">ESSID</emphasis> detected.  Select <guilabel>Ad-hoc</guilabel> if it is a peer to peer network. Select <emphasis role=\"bold\">Master</emphasis> if your network card is used as the access point, your network card needs to support this mode."
-msgstr "Выберите <guilabel>Управляемый</guilabel>, если соединение осуществляется с помощью точки доступа, <emphasis role=\"bold\">ESSID</emphasis> будет обнаружен программой. Выберите <guilabel>Специальный</guilabel>, если это сеть PTP. Отметьте пункт <emphasis role=\"bold\">Основной</emphasis>, если ваша сетевая карта используется как точка доступа. В вашей сетевой карте должна быть предусмотрена поддержка такого режима."
+msgid ""
+"Select <guilabel>Managed</guilabel> if the connection is via an access "
+"point, there is an <emphasis role=\"bold\">ESSID</emphasis> detected.  "
+"Select <guilabel>Ad-hoc</guilabel> if it is a peer to peer network. Select "
+"<emphasis role=\"bold\">Master</emphasis> if your network card is used as "
+"the access point, your network card needs to support this mode."
+msgstr ""
+"Выберите <guilabel>Управляемый</guilabel>, если соединение осуществляется с "
+"помощью точки доступа, <emphasis role=\"bold\">ESSID</emphasis> будет "
+"обнаружен программой. Выберите <guilabel>Специальный</guilabel>, если это "
+"сеть PTP. Отметьте пункт <emphasis role=\"bold\">Основной</emphasis>, если "
+"ваша сетевая карта используется как точка доступа. В вашей сетевой карте "
+"должна быть предусмотрена поддержка такого режима."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:170
@@ -2512,8 +4026,17 @@ msgstr "Если это частная сеть, вы должны знать э
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:175
-msgid "<guilabel>WEP</guilabel> uses a password and is weaker than WPA which uses a passphrase. <guilabel>WPA Pre-Shared Key</guilabel> is also called WPA personal or WPA home. <guilabel>WPA Enterprise</guilabel> is not often used in private networks."
-msgstr "В <guilabel>WEP</guilabel> используется менее устойчивый вариант защиты паролем чем в WPA, где используется ключ. <guilabel>Предварительно распространённый ключ WPA</guilabel> еще называется личным ключом WPA или домашним ключом WPA. <guilabel>WPA Enterprise</guilabel> является довольно редким вариантом в частных сетях."
+msgid ""
+"<guilabel>WEP</guilabel> uses a password and is weaker than WPA which uses a "
+"passphrase. <guilabel>WPA Pre-Shared Key</guilabel> is also called WPA "
+"personal or WPA home. <guilabel>WPA Enterprise</guilabel> is not often used "
+"in private networks."
+msgstr ""
+"В <guilabel>WEP</guilabel> используется менее устойчивый вариант защиты "
+"паролем чем в WPA, где используется ключ. <guilabel>Предварительно "
+"распространённый ключ WPA</guilabel> еще называется личным ключом WPA или "
+"домашним ключом WPA. <guilabel>WPA Enterprise</guilabel> является довольно "
+"редким вариантом в частных сетях."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:180
@@ -2522,8 +4045,12 @@ msgstr "<emphasis role=\"bold\">Разрешить роуминг точки д�
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:182
-msgid "Roaming is a technology which enables allows computer to change its access point while remaining connected to the network."
-msgstr "Роуминг - это технология, с помощью которой компьютер может менять точку доступа без разрыва соединения с сетью."
+msgid ""
+"Roaming is a technology which enables allows computer to change its access "
+"point while remaining connected to the network."
+msgstr ""
+"Роуминг - это технология, с помощью которой компьютер может менять точку "
+"доступа без разрыва соединения с сетью."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:193
@@ -2557,8 +4084,13 @@ msgstr "draknetprofile.png"
 
 #. type: Content of: <section><para>
 #: en/draknetprofile.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">draknetprofile</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">draknetprofile</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknetprofile</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">draknetprofile</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><info><title>
 #: en/draknfs.xml:9
@@ -2582,13 +4114,21 @@ msgstr "Предпосылки"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/draknfs.xml:27
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">draknfs</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">draknfs</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknfs</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">draknfs</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><section><para>
 #: en/draknfs.xml:26
-msgid "When the wizard<placeholder type=\"footnote\" id=\"0\"/> is launched for the first time, it may display the following message:"
-msgstr "Во время первого запуска мастера<placeholder type=\"footnote\" id=\"0\"/> программа может показать окно с таким сообщением:"
+msgid ""
+"When the wizard<placeholder type=\"footnote\" id=\"0\"/> is launched for the "
+"first time, it may display the following message:"
+msgstr ""
+"Во время первого запуска мастера<placeholder type=\"footnote\" id=\"0\"/> "
+"программа может показать окно с таким сообщением:"
 
 #. type: Content of: <section><section><blockquote><para>
 #: en/draknfs.xml:33
@@ -2597,7 +4137,8 @@ msgstr "Нужно установить пакет nfs-utils. Вы хотите
 
 #. type: Content of: <section><section><para>
 #: en/draknfs.xml:37
-msgid "After completing the installation, a window with an empty list is displayed."
+msgid ""
+"After completing the installation, a window with an empty list is displayed."
 msgstr "После завершения установки будет показано окно с пустым списком."
 
 #. type: Content of: <section><section><title>
@@ -2607,8 +4148,15 @@ msgstr "Главное окно"
 
 #. type: Content of: <section><section><para>
 #: en/draknfs.xml:44
-msgid "A list of directories which are shared is displayed. At this step, the list is empty. The <guibutton>Add</guibutton> button gives access to a configuration tool."
-msgstr "Здесь будет показан список каталогов, которые предоставлены в общее пользование. Во время первого запуска этот список, конечно же, будет пустым. С помощью кнопки <guibutton>Добавить</guibutton> можно открыть окно утилиты конфигурирования."
+msgid ""
+"A list of directories which are shared is displayed. At this step, the list "
+"is empty. The <guibutton>Add</guibutton> button gives access to a "
+"configuration tool."
+msgstr ""
+"Здесь будет показан список каталогов, которые предоставлены в общее "
+"пользование. Во время первого запуска этот список, конечно же, будет пустым. "
+"С помощью кнопки <guibutton>Добавить</guibutton> можно открыть окно утилиты "
+"конфигурирования."
 
 #. type: Content of: <section><section><title>
 #: en/draknfs.xml:50
@@ -2617,8 +4165,14 @@ msgstr "Изменить запись"
 
 #. type: Content of: <section><section><para>
 #: en/draknfs.xml:52
-msgid "The configuration tool is labeled \"Modify entry\". It may be also launched with the <guibutton>Modify</guibutton> button. The following parameters are available."
-msgstr "Окно утилиты настройки имеет вид «Изменить запись». Его также можно открыть с помощью нажатия кнопки <guibutton>Изменить</guibutton>. Доступны следующие параметры."
+msgid ""
+"The configuration tool is labeled \"Modify entry\". It may be also launched "
+"with the <guibutton>Modify</guibutton> button. The following parameters are "
+"available."
+msgstr ""
+"Окно утилиты настройки имеет вид «Изменить запись». Его также можно открыть "
+"с помощью нажатия кнопки <guibutton>Изменить</guibutton>. Доступны следующие "
+"параметры."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknfs.xml:58
@@ -2632,8 +4186,14 @@ msgstr "Каталог NFS"
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:66
-msgid "Here you can specify which directory is to be shared. The <guibutton>Directory</guibutton> button gives access to a browser to choose it."
-msgstr "С помощью этого пункта вы можете указать каталог, который будет предоставлен в общее пользование. С помощью кнопки <guibutton>Каталог</guibutton> можно открыть окно инструмента выбора каталога с помощью графического интерфейса."
+msgid ""
+"Here you can specify which directory is to be shared. The "
+"<guibutton>Directory</guibutton> button gives access to a browser to choose "
+"it."
+msgstr ""
+"С помощью этого пункта вы можете указать каталог, который будет предоставлен "
+"в общее пользование. С помощью кнопки <guibutton>Каталог</guibutton> можно "
+"открыть окно инструмента выбора каталога с помощью графического интерфейса."
 
 #. type: Content of: <section><section><section><title>
 #: en/draknfs.xml:72
@@ -2642,8 +4202,12 @@ msgstr "Доступ к узлу"
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:74
-msgid "Here you can specify the hosts that are authorized to access the shared directory."
-msgstr "Здесь вы можете указать узлы, которым будет предоставлен доступ к папке совместного использования."
+msgid ""
+"Here you can specify the hosts that are authorized to access the shared "
+"directory."
+msgstr ""
+"Здесь вы можете указать узлы, которым будет предоставлен доступ к папке "
+"совместного использования."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:77
@@ -2652,23 +4216,42 @@ msgstr "Клиенты NFS можно указать несколькими сп
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:79
-msgid "<emphasis>single host</emphasis>: a host either by an abbreviated name recognized be the resolver, fully qualified domain name, or an IP address"
-msgstr "<emphasis>отдельный узел</emphasis>: указать узел в формате аббревиатуры названия, которое может быть распознано инструментом определения адресов или в формате полноценного доменного названия, или в формате IP-адреса"
+msgid ""
+"<emphasis>single host</emphasis>: a host either by an abbreviated name "
+"recognized be the resolver, fully qualified domain name, or an IP address"
+msgstr ""
+"<emphasis>отдельный узел</emphasis>: указать узел в формате аббревиатуры "
+"названия, которое может быть распознано инструментом определения адресов или "
+"в формате полноценного доменного названия, или в формате IP-адреса"
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:83
 msgid "<emphasis>netgroups</emphasis>: NIS netgroups may be given as @group."
-msgstr "<emphasis>сетевые группы</emphasis>: сетевые группы NIS, можно указывать как @группа."
+msgstr ""
+"<emphasis>сетевые группы</emphasis>: сетевые группы NIS, можно указывать как "
+"@группа."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:86
-msgid "<emphasis>wildcards</emphasis>: machine names may contain the wildcard characters * and ?. For instance: *.cs.foo.edu matches all hosts in the domain cs.foo.edu."
-msgstr "<emphasis>шаблоны замены</emphasis>: названия компьютеров могут содержать шаблонные символы замены * и ?. Пример: *.cs.foo.edu отвечает всем узлам домена cs.foo.edu."
+msgid ""
+"<emphasis>wildcards</emphasis>: machine names may contain the wildcard "
+"characters * and ?. For instance: *.cs.foo.edu matches all hosts in the "
+"domain cs.foo.edu."
+msgstr ""
+"<emphasis>шаблоны замены</emphasis>: названия компьютеров могут содержать "
+"шаблонные символы замены * и ?. Пример: *.cs.foo.edu отвечает всем узлам "
+"домена cs.foo.edu."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:90
-msgid "<emphasis>IP networks</emphasis>: you can also export directories to all hosts on an IP (sub-)network simultaneously. For example, either `/255.255.252.0' or `/22' appended to the network base address."
-msgstr "<emphasis>IP-сети</emphasis>: кроме того, вы можете одновременно экспортировать каталоги на все папки IP-(под-)сети. Пример: «/255.255.252.0» или «/22, добавленные к базовому адресу сети."
+msgid ""
+"<emphasis>IP networks</emphasis>: you can also export directories to all "
+"hosts on an IP (sub-)network simultaneously. For example, either "
+"`/255.255.252.0' or `/22' appended to the network base address."
+msgstr ""
+"<emphasis>IP-сети</emphasis>: кроме того, вы можете одновременно "
+"экспортировать каталоги на все папки IP-(под-)сети. Пример: «/255.255.252.0» "
+"или «/22, добавленные к базовому адресу сети."
 
 #. type: Content of: <section><section><section><title>
 #: en/draknfs.xml:96
@@ -2677,23 +4260,50 @@ msgstr "Сопоставление ID пользователей "
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:98
-msgid "<emphasis>map root user as anonymous</emphasis>: maps requests from uid/gid 0 to the anonymous uid/gid (root_squash). The root user from the client cannot read or write to the files on the server which are created by root on the server itself."
-msgstr "<emphasis>сопоставление пользователя root как анонимного</emphasis>: перенаправить запросы с uid/gid 0 на анонимный uid/gid (root_squash). Пользователь-администратор клиентской системы не сможет читать файлы или выполнять запись в файлы на сервере, которые были созданы администратором сервера или самим сервером."
+msgid ""
+"<emphasis>map root user as anonymous</emphasis>: maps requests from uid/gid "
+"0 to the anonymous uid/gid (root_squash). The root user from the client "
+"cannot read or write to the files on the server which are created by root on "
+"the server itself."
+msgstr ""
+"<emphasis>сопоставление пользователя root как анонимного</emphasis>: "
+"перенаправить запросы с uid/gid 0 на анонимный uid/gid (root_squash). "
+"Пользователь-администратор клиентской системы не сможет читать файлы или "
+"выполнять запись в файлы на сервере, которые были созданы администратором "
+"сервера или самим сервером."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:103
-msgid "<emphasis>allow real remote root access</emphasis>: turn off root squashing. This option is mainly useful for diskless clients (no_root_squash)."
-msgstr "<emphasis>действительно позволить удалённый доступ для root</emphasis>: отключить подавление root'а. Эта опция в основном используется для бездисковых клиентов (no_root_squash)."
+msgid ""
+"<emphasis>allow real remote root access</emphasis>: turn off root squashing. "
+"This option is mainly useful for diskless clients (no_root_squash)."
+msgstr ""
+"<emphasis>действительно позволить удалённый доступ для root</emphasis>: "
+"отключить подавление root'а. Эта опция в основном используется для "
+"бездисковых клиентов (no_root_squash)."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:107
-msgid "<emphasis>map all users to anonymous user</emphasis>: maps all uids and gids to the anonymous user (all_squash). Useful for NFS-exported public FTP directories, news spool directories, etc. The opposite option is no user UID mapping (no_all_squash), which is the default setting."
-msgstr "<emphasis>сопоставить всех пользователей анонимными</emphasis>: сопоставить все uids и gids анонимными (all_squash). Полезно для экспортированных с помощью NFS общих каталогов FTP, каталогов новостей и т.д. Параметр с противоположным значением, без сопоставления UID пользователей (no_all_squash), используется по умолчанию."
+msgid ""
+"<emphasis>map all users to anonymous user</emphasis>: maps all uids and gids "
+"to the anonymous user (all_squash). Useful for NFS-exported public FTP "
+"directories, news spool directories, etc. The opposite option is no user UID "
+"mapping (no_all_squash), which is the default setting."
+msgstr ""
+"<emphasis>сопоставить всех пользователей анонимными</emphasis>: сопоставить "
+"все uids и gids анонимными (all_squash). Полезно для экспортированных с "
+"помощью NFS общих каталогов FTP, каталогов новостей и т.д. Параметр с "
+"противоположным значением, без сопоставления UID пользователей "
+"(no_all_squash), используется по умолчанию."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:113
-msgid "<emphasis>anonuid and anongid</emphasis>: explicitly set the uid and gid of the anonymous account."
-msgstr "<emphasis>anonuid и anongid</emphasis>: явным образом определить uid и gid анонимного аккаунта."
+msgid ""
+"<emphasis>anonuid and anongid</emphasis>: explicitly set the uid and gid of "
+"the anonymous account."
+msgstr ""
+"<emphasis>anonuid и anongid</emphasis>: явным образом определить uid и gid "
+"анонимного аккаунта."
 
 #. type: Content of: <section><section><section><title>
 #: en/draknfs.xml:118
@@ -2702,27 +4312,54 @@ msgstr "Дополнительные параметры"
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:120
-msgid "<emphasis>Secured Connection</emphasis>: this option requires that requests originate on an internet port less than IPPORT_RESERVED (1024).  This option is on by default."
-msgstr "<emphasis>Безопасное соединение</emphasis>: этот параметр требует, чтобы запросы поступали с интернет-порта с номером, меньшим по IPPORT_RESERVED (1024). Этот параметр по умолчанию включен."
+msgid ""
+"<emphasis>Secured Connection</emphasis>: this option requires that requests "
+"originate on an internet port less than IPPORT_RESERVED (1024).  This option "
+"is on by default."
+msgstr ""
+"<emphasis>Безопасное соединение</emphasis>: этот параметр требует, чтобы "
+"запросы поступали с интернет-порта с номером, меньшим по IPPORT_RESERVED "
+"(1024). Этот параметр по умолчанию включен."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:124
-msgid "<emphasis>Read-Only share</emphasis>: allow either only read or both read and write requests on this NFS volume. The default is to disallow any request which changes the filesystem. This can also be made explicit by using this option."
-msgstr "<emphasis>Общий ресурс только для чтения</emphasis>: разрешает выполнение запросов только для чтения, либо для чтения и записи в NFS раздел. По умолчанию стоит запрет любых запросов на изменение файловой системы. Такой запрет также можно сделать явным образом с помощью этой опции."
+msgid ""
+"<emphasis>Read-Only share</emphasis>: allow either only read or both read "
+"and write requests on this NFS volume. The default is to disallow any "
+"request which changes the filesystem. This can also be made explicit by "
+"using this option."
+msgstr ""
+"<emphasis>Общий ресурс только для чтения</emphasis>: разрешает выполнение "
+"запросов только для чтения, либо для чтения и записи в NFS раздел. По "
+"умолчанию стоит запрет любых запросов на изменение файловой системы. Такой "
+"запрет также можно сделать явным образом с помощью этой опции."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:129
-msgid "<emphasis>Synchronous access</emphasis>: prevents the NFS server from violating the NFS protocol and to reply to requests before any changes made by these requests have been committed to stable storage (e.g. disc drive)."
-msgstr "<emphasis>Синхронный доступ</emphasis>: запрещает серверу NFS нарушать протокол NFS и отвечать на запросы, прежде чем любые изменения, которые являются следствием этих запросов, будут отправлены в стабильное хранилище (например, диск)."
+msgid ""
+"<emphasis>Synchronous access</emphasis>: prevents the NFS server from "
+"violating the NFS protocol and to reply to requests before any changes made "
+"by these requests have been committed to stable storage (e.g. disc drive)."
+msgstr ""
+"<emphasis>Синхронный доступ</emphasis>: запрещает серверу NFS нарушать "
+"протокол NFS и отвечать на запросы, прежде чем любые изменения, которые "
+"являются следствием этих запросов, будут отправлены в стабильное хранилище "
+"(например, диск)."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:134
-msgid "<emphasis>Subtree checking</emphasis>: enable subtree checking which can help improve security in some cases, but can decrease reliability. See exports(5) man page for more details."
-msgstr "<emphasis>Проверка поддеревьев</emphasis>: включает проверку поддеревьев, что в некоторых случаях может улучшить параметры безопасности, но снизить надежность работы. Чтобы узнать больше, прочитайте страницу справки exports(5)."
+msgid ""
+"<emphasis>Subtree checking</emphasis>: enable subtree checking which can "
+"help improve security in some cases, but can decrease reliability. See "
+"exports(5) man page for more details."
+msgstr ""
+"<emphasis>Проверка поддеревьев</emphasis>: включает проверку поддеревьев, "
+"что в некоторых случаях может улучшить параметры безопасности, но снизить "
+"надежность работы. Чтобы узнать больше, прочитайте страницу справки "
+"exports(5)."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141
-#: en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:201
 msgid "Menu entries"
 msgstr "Пункты меню"
 
@@ -2737,8 +4374,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153
-#: en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:207
 msgid "File|Write conf"
 msgstr "Файл|Записать настройки"
 
@@ -2753,10 +4389,12 @@ msgid "NFS Server|Restart"
 msgstr "Сервер NFS|Перезапустить"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161
-#: en/draksambashare.xml:222
-msgid "The server is stopped and restarted with the current configuration files."
-msgstr "Приостановить работу сервера и перезапустить его с использованием текущих файлов настройки."
+#: en/draknfs.xml:161 en/draksambashare.xml:222
+msgid ""
+"The server is stopped and restarted with the current configuration files."
+msgstr ""
+"Приостановить работу сервера и перезапустить его с использованием текущих "
+"файлов настройки."
 
 #. type: Content of: <section><section><section><title>
 #: en/draknfs.xml:166
@@ -2764,10 +4402,11 @@ msgid "NFS Server|Reload"
 msgstr "Сервер NFS|Перезагрузить"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168
-#: en/draksambashare.xml:229
-msgid "The configuration displayed is reloaded from the current configuration files."
-msgstr "Отображённая конфигурация загружается из текущих конфигурационных файлов."
+#: en/draknfs.xml:168 en/draksambashare.xml:229
+msgid ""
+"The configuration displayed is reloaded from the current configuration files."
+msgstr ""
+"Отображённая конфигурация загружается из текущих конфигурационных файлов."
 
 #. type: Content of: <section><info><title>
 #: en/drakproxy.xml:10
@@ -2786,18 +4425,46 @@ msgstr "drakproxy.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakproxy.xml:24
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakproxy</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakproxy</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakproxy</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakproxy</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakproxy.xml:22
-msgid "If you have to use a proxy server to access to the internet, you can use this tool<placeholder type=\"footnote\" id=\"0\"/> to configure it. Your net administrator will give you the information you need. You can also specify some services which can be accessed without the proxy by exception."
-msgstr "Если для доступа к интернету вам следует пользоваться прокси-сервером, вы можете воспользоваться этой утилитой<placeholder type=\"footnote\" id=\"0\"/> для настройки доступа. Необходимые для настройки данные можно узнать у администратора сети. Вы также можете определить службы, доступ к которым следует осуществлять в обход прокси-сервера."
+msgid ""
+"If you have to use a proxy server to access to the internet, you can use "
+"this tool<placeholder type=\"footnote\" id=\"0\"/> to configure it. Your net "
+"administrator will give you the information you need. You can also specify "
+"some services which can be accessed without the proxy by exception."
+msgstr ""
+"Если для доступа к интернету вам следует пользоваться прокси-сервером, вы "
+"можете воспользоваться этой утилитой<placeholder type=\"footnote\" id=\"0\"/"
+"> для настройки доступа. Необходимые для настройки данные можно узнать у "
+"администратора сети. Вы также можете определить службы, доступ к которым "
+"следует осуществлять в обход прокси-сервера."
 
 #. type: Content of: <section><para>
 #: en/drakproxy.xml:30
-msgid "From Wikipedia, on 2012-09-24, article Proxy server: In computer networks, a proxy server is a server (a computer system or an application)  that acts as an intermediary for requests from clients seeking resources from other servers. A client connects to the proxy server, requesting some service, such as a file, connection, web page, or other resource available from a different server. The proxy server evaluates the request as a way to simplify and control their complexity."
-msgstr "Из Википедии (4 сентября 2012 года), статья «Прокси-сервер»: «В компьютерных сетях прокси-сервером называется сервер (компьютерная система или программа), который работает промежуточным звеном для запросов от клиентов, которые выполняют поиски ресурсов на других серверах. Клиентская система соединяется с прокси-сервером, посылает запрос относительно определенной службы, в частности данных файла, соединения, страницы или другого ресурса на другом сервере. Прокси-сервер обрабатывает запрос с целью упрощения и управления сложностью запроса.»"
+msgid ""
+"From Wikipedia, on 2012-09-24, article Proxy server: In computer networks, a "
+"proxy server is a server (a computer system or an application)  that acts as "
+"an intermediary for requests from clients seeking resources from other "
+"servers. A client connects to the proxy server, requesting some service, "
+"such as a file, connection, web page, or other resource available from a "
+"different server. The proxy server evaluates the request as a way to "
+"simplify and control their complexity."
+msgstr ""
+"Из Википедии (4 сентября 2012 года), статья «Прокси-сервер»: «В компьютерных "
+"сетях прокси-сервером называется сервер (компьютерная система или "
+"программа), который работает промежуточным звеном для запросов от клиентов, "
+"которые выполняют поиски ресурсов на других серверах. Клиентская система "
+"соединяется с прокси-сервером, посылает запрос относительно определенной "
+"службы, в частности данных файла, соединения, страницы или другого ресурса "
+"на другом сервере. Прокси-сервер обрабатывает запрос с целью упрощения и "
+"управления сложностью запроса.»"
 
 #. type: Content of: <section><info><title>
 #: en/drakrpm-edit-media.xml:3
@@ -2816,23 +4483,55 @@ msgstr "drakrpm-edit-media.png"
 
 #. type: Content of: <section><para><important><para>
 #: en/drakrpm-edit-media.xml:21
-msgid "First thing to do after an install is to add software sources (also known as repositories, media, mirrors). That means you must select the media sources to be used to install and update packages and applications. (see Add button below)."
-msgstr "Сразу после установки системы следует добавить записи источников программного обеспечения (их также называют репозиториями, носителями данных, зеркалами). Это означает, что вам следует выбрать источники программного обеспечения, которые будут использованы для установки и обновления пакетов и программ (см. кнопку <guilabel>Добавить</guilabel>, описанную ниже)."
+msgid ""
+"First thing to do after an install is to add software sources (also known as "
+"repositories, media, mirrors). That means you must select the media sources "
+"to be used to install and update packages and applications. (see Add button "
+"below)."
+msgstr ""
+"Сразу после установки системы следует добавить записи источников "
+"программного обеспечения (их также называют репозиториями, носителями "
+"данных, зеркалами). Это означает, что вам следует выбрать источники "
+"программного обеспечения, которые будут использованы для установки и "
+"обновления пакетов и программ (см. кнопку <guilabel>Добавить</guilabel>, "
+"описанную ниже)."
 
 #. type: Content of: <section><para><note><para>
 #: en/drakrpm-edit-media.xml:26
-msgid "Your system is running under an architecture which may be 32-bit (called i586), or 64-bit (called x86_64). Some packages are independent of whether your system is 32-bit or 64-bit; these are called noarch packages. They don't have their own noarch directories on the mirrors, but are all in both the i586 and the x86_64 media."
-msgstr "Ваша система может работать на 32-битной аппаратной архитектуре, так называемый дистрибутив i586 или 64-битной архитектуре, так называемый дистрибутив x86_64. Вам следует выбрать репозитории, которые соответствуют вашей системе и репозитории для пакетов, которые не зависят от архитектуры (их еще называют noarch). Такие пакеты не имеют собственных каталогов noarch в репозиториях, они хранятся в каталогах обеих архитектур, i586 и x86_64."
+msgid ""
+"Your system is running under an architecture which may be 32-bit (called "
+"i586), or 64-bit (called x86_64). Some packages are independent of whether "
+"your system is 32-bit or 64-bit; these are called noarch packages. They "
+"don't have their own noarch directories on the mirrors, but are all in both "
+"the i586 and the x86_64 media."
+msgstr ""
+"Ваша система может работать на 32-битной аппаратной архитектуре, так "
+"называемый дистрибутив i586 или 64-битной архитектуре, так называемый "
+"дистрибутив x86_64. Вам следует выбрать репозитории, которые соответствуют "
+"вашей системе и репозитории для пакетов, которые не зависят от архитектуры "
+"(их еще называют noarch). Такие пакеты не имеют собственных каталогов noarch "
+"в репозиториях, они хранятся в каталогах обеих архитектур, i586 и x86_64."
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakrpm-edit-media.xml:35
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakrpm-edit-media</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakrpm-edit-media</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakrpm-edit-media</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakrpm-edit-media</emphasis> от имени "
+"администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakrpm-edit-media.xml:33
-msgid "This tool is present in the Mageia Control Center under the tab <emphasis role=\"bold\">Software management.</emphasis><placeholder type=\"footnote\" id=\"0\"/>"
-msgstr "Доступ к этой программе можно получить из Центра управления Mageia, пункт <emphasis role=\"bold\">Управление программами</emphasis><placeholder type=\"footnote\" id=\"0\"/>."
+msgid ""
+"This tool is present in the Mageia Control Center under the tab <emphasis "
+"role=\"bold\">Software management.</emphasis><placeholder type=\"footnote\" "
+"id=\"0\"/>"
+msgstr ""
+"Доступ к этой программе можно получить из Центра управления Mageia, пункт "
+"<emphasis role=\"bold\">Управление программами</emphasis><placeholder type="
+"\"footnote\" id=\"0\"/>."
 
 #. type: Content of: <section><section><title>
 #: en/drakrpm-edit-media.xml:39
@@ -2846,8 +4545,13 @@ msgstr "Столбец «Включён»:"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:43
-msgid "The checked media will be used to install new packages. Be cautious with some media such as Testing and Debug, they could make your system unusable."
-msgstr "Обозначенные источники будут использованы для установки новых пакетов. Специальные источники, в частности Testing и Debug, выбирать не стоит, поскольку их использование может привести к неработоспособности системы."
+msgid ""
+"The checked media will be used to install new packages. Be cautious with "
+"some media such as Testing and Debug, they could make your system unusable."
+msgstr ""
+"Обозначенные источники будут использованы для установки новых пакетов. "
+"Специальные источники, в частности Testing и Debug, выбирать не стоит, "
+"поскольку их использование может привести к неработоспособности системы."
 
 #. type: Content of: <section><section><bridgehead>
 #: en/drakrpm-edit-media.xml:47
@@ -2856,8 +4560,18 @@ msgstr "Столбец «Обновления»:"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:49
-msgid "The checked media will be used to update packages, it must be enabled. Only media with \"Update\" in its name should be selected. For security reasons, this column isn't modifiable in this tool, you must open a console as root and type <emphasis role=\"bold\">drakrpm-edit-media --expert.</emphasis>"
-msgstr "Если источник будет использован для обновления пакетов, его следует обозначить в этом столбце. Должны быть обозначены лишь источники со словом «Update» (обновление) в названии. Из соображений безопасности значение в этом столбце нельзя изменять с помощью этой программы. Вам придётся открыть консоль и от имени администратора (root) выполнить команду <emphasis role=\"bold\">drakrpm-edit-media --expert</emphasis>."
+msgid ""
+"The checked media will be used to update packages, it must be enabled. Only "
+"media with \"Update\" in its name should be selected. For security reasons, "
+"this column isn't modifiable in this tool, you must open a console as root "
+"and type <emphasis role=\"bold\">drakrpm-edit-media --expert.</emphasis>"
+msgstr ""
+"Если источник будет использован для обновления пакетов, его следует "
+"обозначить в этом столбце. Должны быть обозначены лишь источники со словом "
+"«Update» (обновление) в названии. Из соображений безопасности значение в "
+"этом столбце нельзя изменять с помощью этой программы. Вам придётся открыть "
+"консоль и от имени администратора (root) выполнить команду <emphasis role="
+"\"bold\">drakrpm-edit-media --expert</emphasis>."
 
 #. type: Content of: <section><section><bridgehead>
 #: en/drakrpm-edit-media.xml:55
@@ -2866,23 +4580,41 @@ msgstr "Столбец «Источник»:"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:57
-msgid "Display the medium name. Mageia official repositories for final release versions contain at least:"
-msgstr "Здесь будет показано название источника. Официальные репозитории Mageia для окончательных выпусков содержат по крайней мере следующие элементы:"
+msgid ""
+"Display the medium name. Mageia official repositories for final release "
+"versions contain at least:"
+msgstr ""
+"Здесь будет показано название источника. Официальные репозитории Mageia для "
+"окончательных выпусков содержат по крайней мере следующие элементы:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:62
-msgid "<emphasis role=\"bold\">Core</emphasis> which contains most programs available supported by Mageia."
-msgstr "<emphasis role=\"bold\">Core</emphasis> (основной) - репозиторий, содержащий большинство программ, которые поддерживаются сообществом Mageia."
+msgid ""
+"<emphasis role=\"bold\">Core</emphasis> which contains most programs "
+"available supported by Mageia."
+msgstr ""
+"<emphasis role=\"bold\">Core</emphasis> (основной) - репозиторий, содержащий "
+"большинство программ, которые поддерживаются сообществом Mageia."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:67
-msgid "<emphasis role=\"bold\">Nonfree</emphasis> which contains some programs which are not free"
-msgstr "<emphasis role=\"bold\">Nonfree</emphasis> (несвободное ПО) - репозиторий, содержащий некоторые из программ, доступ к коду которых ограничен правилами лицензирования."
+msgid ""
+"<emphasis role=\"bold\">Nonfree</emphasis> which contains some programs "
+"which are not free"
+msgstr ""
+"<emphasis role=\"bold\">Nonfree</emphasis> (несвободное ПО) - репозиторий, "
+"содержащий некоторые из программ, доступ к коду которых ограничен правилами "
+"лицензирования."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:72
-msgid "<emphasis role=\"bold\">Tainted</emphasis> free software for which there might be patent claims in some countries."
-msgstr "<emphasis role=\"bold\">Tainted</emphasis> (свободный) - репозиторий со свободным программным обеспечением, в отношении использования которого, в некоторых странах могут применяться патентные ограничения."
+msgid ""
+"<emphasis role=\"bold\">Tainted</emphasis> free software for which there "
+"might be patent claims in some countries."
+msgstr ""
+"<emphasis role=\"bold\">Tainted</emphasis> (свободный) - репозиторий со "
+"свободным программным обеспечением, в отношении использования которого, в "
+"некоторых странах могут применяться патентные ограничения."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:75
@@ -2891,23 +4623,47 @@ msgstr "Каждая запись источников содержит 4 под
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:79
-msgid "<emphasis role=\"bold\">Release</emphasis> the packages as of the day the this version of Mageia was released."
-msgstr "<emphasis role=\"bold\">Release</emphasis> (выпуск) - репозиторий пакетов на день выпуска вашей версии Mageia."
+msgid ""
+"<emphasis role=\"bold\">Release</emphasis> the packages as of the day the "
+"this version of Mageia was released."
+msgstr ""
+"<emphasis role=\"bold\">Release</emphasis> (выпуск) - репозиторий пакетов на "
+"день выпуска вашей версии Mageia."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:84
-msgid "<emphasis role=\"bold\">Updates</emphasis> the packages updated since release due to security or bug concerns. Everyone should have this medium enabled, even with a very slow internet connection."
-msgstr "<emphasis role=\"bold\">Updates</emphasis> (обновления) - пакеты, обновлённые со времени выпуска из соображений безопасности или устранения недостатков. Этот источник стоит включить всем, даже если соединение с интернетом является очень медленным."
+msgid ""
+"<emphasis role=\"bold\">Updates</emphasis> the packages updated since "
+"release due to security or bug concerns. Everyone should have this medium "
+"enabled, even with a very slow internet connection."
+msgstr ""
+"<emphasis role=\"bold\">Updates</emphasis> (обновления) - пакеты, "
+"обновлённые со времени выпуска из соображений безопасности или устранения "
+"недостатков. Этот источник стоит включить всем, даже если соединение с "
+"интернетом является очень медленным."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:90
-msgid "<emphasis role=\"bold\">Backports</emphasis> some packages of new versions backported from Cauldron (the next version under development)."
-msgstr "<emphasis role=\"bold\">Backports</emphasis> (обратное портирование) - для некоторых пакетов новые версии поступают из репозитория Cauldron (репозиторий следующей версии дистрибутива, разработка которой ещё не завершена)."
+msgid ""
+"<emphasis role=\"bold\">Backports</emphasis> some packages of new versions "
+"backported from Cauldron (the next version under development)."
+msgstr ""
+"<emphasis role=\"bold\">Backports</emphasis> (обратное портирование) - для "
+"некоторых пакетов новые версии поступают из репозитория Cauldron "
+"(репозиторий следующей версии дистрибутива, разработка которой ещё не "
+"завершена)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:96
-msgid "<emphasis role=\"bold\">Testing</emphasis> which is used for temporary tests of new updates, to allow the bug reporters and the QA team to validate the corrections."
-msgstr "<emphasis role=\"bold\">Testing</emphasis> (тестирование) - репозиторий, который используется для промежуточного тестирования обновлений, чтобы дать возможность тем, кто отчитывается о недостатках и участникам команды по обеспечению качества, проверить работоспособность исправленных пакетов."
+msgid ""
+"<emphasis role=\"bold\">Testing</emphasis> which is used for temporary tests "
+"of new updates, to allow the bug reporters and the QA team to validate the "
+"corrections."
+msgstr ""
+"<emphasis role=\"bold\">Testing</emphasis> (тестирование) - репозиторий, "
+"который используется для промежуточного тестирования обновлений, чтобы дать "
+"возможность тем, кто отчитывается о недостатках и участникам команды по "
+"обеспечению качества, проверить работоспособность исправленных пакетов."
 
 #. type: Content of: <section><section><title>
 #: en/drakrpm-edit-media.xml:104
@@ -2921,8 +4677,16 @@ msgstr "<guibutton>Удалить:</guibutton>"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:109
-msgid "To remove a medium, click on it and then on this button. It is wise to remove the medium used for the installation (CD or DVD for example)  since all the packages it contains are in the official Core release medium."
-msgstr "Чтобы удалить источник, наведите на его пункт указатель мыши и щелкните левой кнопкой мыши, затем нажмите эту кнопку. Иногда стоит удалить пункт носителя, который был использован для установки системы (компакт-диск или DVD), поскольку все пакеты с этого носителя можно установить из официального источника основных пакетов (Core), соответствующего выпуска."
+msgid ""
+"To remove a medium, click on it and then on this button. It is wise to "
+"remove the medium used for the installation (CD or DVD for example)  since "
+"all the packages it contains are in the official Core release medium."
+msgstr ""
+"Чтобы удалить источник, наведите на его пункт указатель мыши и щелкните "
+"левой кнопкой мыши, затем нажмите эту кнопку. Иногда стоит удалить пункт "
+"носителя, который был использован для установки системы (компакт-диск или "
+"DVD), поскольку все пакеты с этого носителя можно установить из официального "
+"источника основных пакетов (Core), соответствующего выпуска."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:114
@@ -2931,8 +4695,12 @@ msgstr "<guibutton>Редактировать:</guibutton>"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:116
-msgid "Allows you to modify the selected medium settings, (URL, downloader and proxy)."
-msgstr "Позволяет изменить параметры выбранного носителя, (URL-адрес, загрузчик и параметры прокси-сервера)."
+msgid ""
+"Allows you to modify the selected medium settings, (URL, downloader and "
+"proxy)."
+msgstr ""
+"Позволяет изменить параметры выбранного носителя, (URL-адрес, загрузчик и "
+"параметры прокси-сервера)."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:119
@@ -2941,8 +4709,20 @@ msgstr "<guibutton>Добавить:</guibutton>"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:121
-msgid "Add the official repositories available on the Internet. These repositories contain only safe and well tested software. Clicking on the \"Add\" button adds the mirrorlist to your configuration, it is designed to make sure that you install and update from a mirror close to you. If you prefer to choose a specific mirror, then add it by choosing \"Add a specific media mirror\" from the drop-down \"File\" menu."
-msgstr "Кнопка для добавления официальных репозиториев из интернета. В официальных репозиториях содержатся только надёжные и хорошо проверенные пакеты. После нажатия кнопки <guibutton>Добавить</guibutton> программа откроет контекстное окно, с помощью которого вы сможете выбрать набор источников для установки. Если вы отдаёте предпочтение определенному зеркалу, добавьте его при помощи пункта «Добавить указанное зеркало источников» из меню «Файл»."
+msgid ""
+"Add the official repositories available on the Internet. These repositories "
+"contain only safe and well tested software. Clicking on the \"Add\" button "
+"adds the mirrorlist to your configuration, it is designed to make sure that "
+"you install and update from a mirror close to you. If you prefer to choose a "
+"specific mirror, then add it by choosing \"Add a specific media mirror\" "
+"from the drop-down \"File\" menu."
+msgstr ""
+"Кнопка для добавления официальных репозиториев из интернета. В официальных "
+"репозиториях содержатся только надёжные и хорошо проверенные пакеты. После "
+"нажатия кнопки <guibutton>Добавить</guibutton> программа откроет контекстное "
+"окно, с помощью которого вы сможете выбрать набор источников для установки. "
+"Если вы отдаёте предпочтение определенному зеркалу, добавьте его при помощи "
+"пункта «Добавить указанное зеркало источников» из меню «Файл»."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:128
@@ -2951,12 +4731,22 @@ msgstr "<guibutton>Кнопки со стрелками вверх и вниз:<
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:130
-msgid "Change the list order. When Drakrpm looks for a package, it reads the list in the displayed order and will install the first package found for the same release number - in the event of a version mismatch, the latest release will be installed. So if possible, put the fastest repositories at the top."
-msgstr "Эти кнопки предназначены для упорядочивания списка. Во время поисков пакетов программой Drakrpm выполняется загрузка списка репозиториев в указанном порядке, пакет устанавливается из репозитория, который будет стоять выше в списке (если номер выпуска пакета является одинаковым во всех репозиториях; если номер будет разным, программа установит пакет с самого свежего выпуска). Итак, если можно, располагайте репозиторий с самым быстрым доступом в начале списка."
+msgid ""
+"Change the list order. When Drakrpm looks for a package, it reads the list "
+"in the displayed order and will install the first package found for the same "
+"release number - in the event of a version mismatch, the latest release will "
+"be installed. So if possible, put the fastest repositories at the top."
+msgstr ""
+"Эти кнопки предназначены для упорядочивания списка. Во время поисков пакетов "
+"программой Drakrpm выполняется загрузка списка репозиториев в указанном "
+"порядке, пакет устанавливается из репозитория, который будет стоять выше в "
+"списке (если номер выпуска пакета является одинаковым во всех репозиториях; "
+"если номер будет разным, программа установит пакет с самого свежего "
+"выпуска). Итак, если можно, располагайте репозиторий с самым быстрым "
+"доступом в начале списка."
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:138
-#: en/harddrake2.xml:64
+#: en/drakrpm-edit-media.xml:138 en/harddrake2.xml:64
 msgid "The menu"
 msgstr "Меню программы"
 
@@ -2967,8 +4757,13 @@ msgstr "<guimenu>Файл -> Обновить:</guimenu>"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:142
-msgid "A window pops up with the media list. Select the ones you want to update and click on the <guibutton>Update</guibutton> button."
-msgstr "В ответ на выбор этого пункта будет открыто окно со списком источников. Выберите те из них, данные которых требуется обновить и нажмите кнопку <guibutton>Обновить</guibutton>."
+msgid ""
+"A window pops up with the media list. Select the ones you want to update and "
+"click on the <guibutton>Update</guibutton> button."
+msgstr ""
+"В ответ на выбор этого пункта будет открыто окно со списком источников. "
+"Выберите те из них, данные которых требуется обновить и нажмите кнопку "
+"<guibutton>Обновить</guibutton>."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:145
@@ -2977,8 +4772,25 @@ msgstr "<guimenu>Файл -> Добавить указанное зеркало
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:147
-msgid "Suppose you aren't happy with the actual mirror, because for example it's too slow or often unavailable, you can choose another mirror. Select all the actual media and click on <guibutton>Remove</guibutton> to take them out. Click on <guimenu>File -> Add a specific media mirror</guimenu>, choose between update only or the full set (if you do not know, choose the <guibutton>Full set of sources</guibutton>) and accept the contact by clicking on <guibutton>Yes</guibutton>. This window opens:"
-msgstr "Предположим, что вам чем-то не нравится текущее зеркало основного репозитория. Причиной, например, может быть то, что репозиторий работает слишком медленно или часто недоступен. Тогда вы можете выбрать другое зеркало. Отметьте пункты всех текущих источников пакетов и нажмите кнопку <guibutton>Удалить</guibutton>, чтобы убрать их. Далее, выберите пункт меню <guimenu>Файл -> Добавить особое зеркало источников</guimenu>, сделайте выбор только между обновлениями и полным набором (если не уверены, выберите <guibutton>Полный набор источников</guibutton>) и подтвердите возможность соединения нажатием кнопки <guibutton>Да</guibutton>. В ответ будет показано следующее окно:"
+msgid ""
+"Suppose you aren't happy with the actual mirror, because for example it's "
+"too slow or often unavailable, you can choose another mirror. Select all the "
+"actual media and click on <guibutton>Remove</guibutton> to take them out. "
+"Click on <guimenu>File -> Add a specific media mirror</guimenu>, choose "
+"between update only or the full set (if you do not know, choose the "
+"<guibutton>Full set of sources</guibutton>) and accept the contact by "
+"clicking on <guibutton>Yes</guibutton>. This window opens:"
+msgstr ""
+"Предположим, что вам чем-то не нравится текущее зеркало основного "
+"репозитория. Причиной, например, может быть то, что репозиторий работает "
+"слишком медленно или часто недоступен. Тогда вы можете выбрать другое "
+"зеркало. Отметьте пункты всех текущих источников пакетов и нажмите кнопку "
+"<guibutton>Удалить</guibutton>, чтобы убрать их. Далее, выберите пункт меню "
+"<guimenu>Файл -> Добавить особое зеркало источников</guimenu>, сделайте "
+"выбор только между обновлениями и полным набором (если не уверены, выберите "
+"<guibutton>Полный набор источников</guibutton>) и подтвердите возможность "
+"соединения нажатием кнопки <guibutton>Да</guibutton>. В ответ будет показано "
+"следующее окно:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/drakrpm-edit-media.xml:158
@@ -2987,8 +4799,14 @@ msgstr "drakrpmEditMedia2.png"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:162
-msgid "You can see, on the left, a list of countries, choose yours or one very close by clicking on the > symbol, this will display all the available mirrors in that country. Select one and click on <guibutton>OK</guibutton>."
-msgstr "Слева будет показан список стран. Выберите вашу страну или близкую к ней нажатием кнопки >. В ответ будет развернут список зеркал, расположенных в этой стране. Отметьте одно из них и нажмите кнопку <guibutton>OK</guibutton>."
+msgid ""
+"You can see, on the left, a list of countries, choose yours or one very "
+"close by clicking on the > symbol, this will display all the available "
+"mirrors in that country. Select one and click on <guibutton>OK</guibutton>."
+msgstr ""
+"Слева будет показан список стран. Выберите вашу страну или близкую к ней "
+"нажатием кнопки >. В ответ будет развернут список зеркал, расположенных в "
+"этой стране. Отметьте одно из них и нажмите кнопку <guibutton>OK</guibutton>."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:167
@@ -2997,8 +4815,13 @@ msgstr "<guimenu>Файл -> Добавить собственный источ�
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:169
-msgid "It is possible to install a new media (from a third party for example) that isn't supported by Mageia. A new window appears:"
-msgstr "Вы можете выполнить установку нового источника (например, из стороннего репозитория сообщества), который не поддерживается официальным сообществом Mageia. В ответ на выбор этого пункта меню будет показано новое окно:"
+msgid ""
+"It is possible to install a new media (from a third party for example) that "
+"isn't supported by Mageia. A new window appears:"
+msgstr ""
+"Вы можете выполнить установку нового источника (например, из стороннего "
+"репозитория сообщества), который не поддерживается официальным сообществом "
+"Mageia. В ответ на выбор этого пункта меню будет показано новое окно:"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
 #: en/drakrpm-edit-media.xml:174
@@ -3007,8 +4830,14 @@ msgstr "rpmdrakeEditMedia1.png"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:172
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>Select the medium type, find a smart name that well define the medium and give the URL (or the path, according to the medium type)"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Выберите тип источника, укажите краткое название, которое хорошо описывает соответствующий репозиторий и добавьте URL-адрес (или путь к источнику, в зависимости от его типа)."
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Select the medium type, find a "
+"smart name that well define the medium and give the URL (or the path, "
+"according to the medium type)"
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Выберите тип источника, укажите "
+"краткое название, которое хорошо описывает соответствующий репозиторий и "
+"добавьте URL-адрес (или путь к источнику, в зависимости от его типа)."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:180
@@ -3017,8 +4846,17 @@ msgstr "<guimenu>Настройки -> Общие настройки:</guimenu>"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:182
-msgid "This item allows you to choose when to \"Verify RPMs to be installed\" (always or never), the download program (curl, wget or aria2) and to define the download policy for information about the packages (on demand -by default-, update only, always or never)."
-msgstr "С помощью этого пункта меню вы можете определить, когда следует <guilabel>Проверять пакеты, которые устанавливаются</guilabel> (всегда или никогда), определить программу для загрузки пакетов (curl, wget или aria2) и указать правила получения данных о пакетах на запрос (вариант по умолчанию, только обновления, всегда или никогда)."
+msgid ""
+"This item allows you to choose when to \"Verify RPMs to be installed"
+"\" (always or never), the download program (curl, wget or aria2) and to "
+"define the download policy for information about the packages (on demand -by "
+"default-, update only, always or never)."
+msgstr ""
+"С помощью этого пункта меню вы можете определить, когда следует "
+"<guilabel>Проверять пакеты, которые устанавливаются</guilabel> (всегда или "
+"никогда), определить программу для загрузки пакетов (curl, wget или aria2) и "
+"указать правила получения данных о пакетах на запрос (вариант по умолчанию, "
+"только обновления, всегда или никогда)."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:187
@@ -3027,13 +4865,27 @@ msgstr "<guimenu>Настройки -> Управление ключами:</gui
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:189
-msgid "To guarantee a high level of security, digital keys are used to authenticate the media. It is possible for each medium to allow or disallow a key. In the window that appear, select a medium and then click on <guibutton>Add</guibutton> to allow a new key or to select a key and click on <guibutton>Remove</guibutton> to disallow that key."
-msgstr "С целью обеспечения лучшей безопасности для распознавания источника используются цифровые ключи. Для каждого из источников можно разрешить или запретить использование ключа. В окне, которое будет открыто, выберите нужный источник и нажмите кнопку <guibutton>Добавить</guibutton>, чтобы сделать возможным использование нового ключа, или отметьте пункт ключа и нажмите кнопку <guibutton>Удалить</guibutton>, чтобы запретить его использование."
+msgid ""
+"To guarantee a high level of security, digital keys are used to authenticate "
+"the media. It is possible for each medium to allow or disallow a key. In the "
+"window that appear, select a medium and then click on <guibutton>Add</"
+"guibutton> to allow a new key or to select a key and click on "
+"<guibutton>Remove</guibutton> to disallow that key."
+msgstr ""
+"С целью обеспечения лучшей безопасности для распознавания источника "
+"используются цифровые ключи. Для каждого из источников можно разрешить или "
+"запретить использование ключа. В окне, которое будет открыто, выберите "
+"нужный источник и нажмите кнопку <guibutton>Добавить</guibutton>, чтобы "
+"сделать возможным использование нового ключа, или отметьте пункт ключа и "
+"нажмите кнопку <guibutton>Удалить</guibutton>, чтобы запретить его "
+"использование."
 
 #. type: Content of: <section><section><para><warning><para>
 #: en/drakrpm-edit-media.xml:196
 msgid "Do this with care, as with all security-related questions"
-msgstr "Будьте осторожны, как и со всеми другими вопросами, связанными с безопасностью."
+msgstr ""
+"Будьте осторожны, как и со всеми другими вопросами, связанными с "
+"безопасностью."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:197
@@ -3042,8 +4894,15 @@ msgstr "<guimenu>Настройки -> Прокси:</guimenu>"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:199
-msgid "If you need to use a proxy server for internet access, you can configure it here. You only need to give the <guibutton>Proxy hostname</guibutton> and if necessary a <guilabel>Username</guilabel> and <guilabel>Password</guilabel>."
-msgstr "Если для доступа к интернету с вашего компьютера следует пользоваться прокси-сервером, вы можете указать параметры его работы. Вам следует указать <guibutton>Название прокси</guibutton> и если нужно, указать <guilabel>Логин</guilabel> и <guilabel>Пароль</guilabel>."
+msgid ""
+"If you need to use a proxy server for internet access, you can configure it "
+"here. You only need to give the <guibutton>Proxy hostname</guibutton> and if "
+"necessary a <guilabel>Username</guilabel> and <guilabel>Password</guilabel>."
+msgstr ""
+"Если для доступа к интернету с вашего компьютера следует пользоваться прокси-"
+"сервером, вы можете указать параметры его работы. Вам следует указать "
+"<guibutton>Название прокси</guibutton> и если нужно, указать "
+"<guilabel>Логин</guilabel> и <guilabel>Пароль</guilabel>."
 
 #. type: Content of: <section><info><title>
 #: en/draksambashare.xml:10
@@ -3062,8 +4921,19 @@ msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:29
-msgid "Samba is a protocol used in different Operating Systems to share some resources like directories or printers. This tool allows you to configure the machine as a Samba server using the protocol SMB/CIFS. This protocol is also used by Windows(R) and workstations with this OS can access the resources of the Samba server."
-msgstr "Samba - протокол, используемый в различных операционных системах для совместного доступа к некоторым ресурсам, к таким как каталоги или принтеры. С помощью этого модуля вы можете настроить компьютер на работу в режиме сервера Samba с использованием протокола SMB/CIFS. Этот протокол используется Windows®, рабочие станции под управлением этой операционной системы могут получать доступ к ресурсам на сервере Samba."
+msgid ""
+"Samba is a protocol used in different Operating Systems to share some "
+"resources like directories or printers. This tool allows you to configure "
+"the machine as a Samba server using the protocol SMB/CIFS. This protocol is "
+"also used by Windows(R) and workstations with this OS can access the "
+"resources of the Samba server."
+msgstr ""
+"Samba - протокол, используемый в различных операционных системах для "
+"совместного доступа к некоторым ресурсам, к таким как каталоги или принтеры. "
+"С помощью этого модуля вы можете настроить компьютер на работу в режиме "
+"сервера Samba с использованием протокола SMB/CIFS. Этот протокол "
+"используется Windows®, рабочие станции под управлением этой операционной "
+"системы могут получать доступ к ресурсам на сервере Samba."
 
 #. type: Content of: <section><section><title>
 #: en/draksambashare.xml:37
@@ -3072,8 +4942,20 @@ msgstr "Подготовка"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:39
-msgid "To be accessed from other workstations, the server has to have a fixed IP address. This can be specified directly on the server, for example with <xref linkend=\"draknetcenter-ti1\"/>, or at the DHCP server which identifies the station with its MAC-address and give it always the same address. The firewall has also to allow the incoming requests to the Samba server."
-msgstr "Чтобы пользователи могли получать доступ к вашим ресурсам, сервер должен иметь постоянный IP-адрес. Определить этот URL-адрес можно непосредственно на вашем сервере, например с помощью <xref linkend=\"draknetcenter-ti1\"/> или на сервере DHCP, который идентифицирует рабочую станцию по MAC-адресу и всегда придаёт ей тот же адрес в сети. Также файервол вашего компьютера должен разрешать входящие соединения с сервера Samba."
+msgid ""
+"To be accessed from other workstations, the server has to have a fixed IP "
+"address. This can be specified directly on the server, for example with "
+"<xref linkend=\"draknetcenter-ti1\"/>, or at the DHCP server which "
+"identifies the station with its MAC-address and give it always the same "
+"address. The firewall has also to allow the incoming requests to the Samba "
+"server."
+msgstr ""
+"Чтобы пользователи могли получать доступ к вашим ресурсам, сервер должен "
+"иметь постоянный IP-адрес. Определить этот URL-адрес можно непосредственно "
+"на вашем сервере, например с помощью <xref linkend=\"draknetcenter-ti1\"/> "
+"или на сервере DHCP, который идентифицирует рабочую станцию по MAC-адресу и "
+"всегда придаёт ей тот же адрес в сети. Также файервол вашего компьютера "
+"должен разрешать входящие соединения с сервера Samba."
 
 #. type: Content of: <section><section><title>
 #: en/draksambashare.xml:50
@@ -3082,13 +4964,25 @@ msgstr "Мастер - Автономный сервер"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/draksambashare.xml:53
-msgid "You can start this tool from the command line, by typing<emphasis role=\"bold\"> draksambashare</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">draksambashare</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing<emphasis role=\"bold"
+"\"> draksambashare</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">draksambashare</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:52
-msgid "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks if needed packages are installed and proposes to install them if they are not yet present. Then the wizard to configure the Samba server is launched."
-msgstr "После первого запуска, программа <placeholder type=\"footnote\" id=\"0\"/> проверит, установлены ли необходимые пакеты и предложит установить их, если пакеты не будут обнаружены в системе. После этого будет запущена программа-мастер настройки сервера Samba."
+msgid ""
+"At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
+"if needed packages are installed and proposes to install them if they are "
+"not yet present. Then the wizard to configure the Samba server is launched."
+msgstr ""
+"После первого запуска, программа <placeholder type=\"footnote\" id=\"0\"/> "
+"проверит, установлены ли необходимые пакеты и предложит установить их, если "
+"пакеты не будут обнаружены в системе. После этого будет запущена программа-"
+"мастер настройки сервера Samba."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:61
@@ -3097,8 +4991,12 @@ msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:67
-msgid "In the next window the Standalone server configuration option is already selected."
-msgstr "На следующей странице вариант настройки автономного сервера уже будет обозначен."
+msgid ""
+"In the next window the Standalone server configuration option is already "
+"selected."
+msgstr ""
+"На следующей странице вариант настройки автономного сервера уже будет "
+"обозначен."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:71
@@ -3107,13 +5005,21 @@ msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:77
-msgid "Then specify the name of the workgroup. This name should be the same for the access to the shared resources."
-msgstr "Укажите название рабочей группы. Это название должно совпадать с названием группы, которая будет получать доступ к ресурсам общего пользования."
+msgid ""
+"Then specify the name of the workgroup. This name should be the same for the "
+"access to the shared resources."
+msgstr ""
+"Укажите название рабочей группы. Это название должно совпадать с названием "
+"группы, которая будет получать доступ к ресурсам общего пользования."
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:80
-msgid "The netbios name is the name which will be used to designate the server on the network."
-msgstr "Название Netbios - это название, которое будет использовано для обозначения сервера сети."
+msgid ""
+"The netbios name is the name which will be used to designate the server on "
+"the network."
+msgstr ""
+"Название Netbios - это название, которое будет использовано для обозначения "
+"сервера сети."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:85
@@ -3127,18 +5033,30 @@ msgstr "Выберите режим защиты:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/draksambashare.xml:95
-msgid "<guilabel>user</guilabel>: the client must be authorized to access the resource"
-msgstr "<guilabel>пользователь</guilabel>: клиент должен пройти аутентификацию, чтобы получить доступ к ресурсу."
+msgid ""
+"<guilabel>user</guilabel>: the client must be authorized to access the "
+"resource"
+msgstr ""
+"<guilabel>пользователь</guilabel>: клиент должен пройти аутентификацию, "
+"чтобы получить доступ к ресурсу."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/draksambashare.xml:100
-msgid "<guilabel>share</guilabel>: the client authenticates itself separately for each share"
-msgstr "<guilabel>общий ресурс</guilabel>: клиент предоставляет данные для распознавания, отдельно для каждого общего ресурса."
+msgid ""
+"<guilabel>share</guilabel>: the client authenticates itself separately for "
+"each share"
+msgstr ""
+"<guilabel>общий ресурс</guilabel>: клиент предоставляет данные для "
+"распознавания, отдельно для каждого общего ресурса."
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:105
-msgid "You can specify which hosts are allowed to access the resources, with IP address or host name."
-msgstr "Здесь вы можете указать IP-адреса или названия узлов, которым будет предоставлен доступ к ресурсам."
+msgid ""
+"You can specify which hosts are allowed to access the resources, with IP "
+"address or host name."
+msgstr ""
+"Здесь вы можете указать IP-адреса или названия узлов, которым будет "
+"предоставлен доступ к ресурсам."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:110
@@ -3147,8 +5065,12 @@ msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:115
-msgid "Specify the server banner. The banner is the way this server will be described in the Windows workstations."
-msgstr "Укажите баннер сервера. Баннер - это способ, которым сервер будет представлен на рабочих станциях Windows."
+msgid ""
+"Specify the server banner. The banner is the way this server will be "
+"described in the Windows workstations."
+msgstr ""
+"Укажите баннер сервера. Баннер - это способ, которым сервер будет "
+"представлен на рабочих станциях Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:120
@@ -3157,8 +5079,11 @@ msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:126
-msgid "The place where Samba can log information can be specified at the next step."
-msgstr "На следующем шаге можно указать место, где Samba сможет хранить журналы своей работы."
+msgid ""
+"The place where Samba can log information can be specified at the next step."
+msgstr ""
+"На следующем шаге можно указать место, где Samba сможет хранить журналы "
+"своей работы."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:131
@@ -3167,8 +5092,15 @@ msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:137
-msgid "The wizard displays a list of the chosen parameters before you accept the configuration. When accepted, the configuration will be written in <code>/etc/samba/smb.conf</code>."
-msgstr "Прежде чем вами будут подтверждены выбранные значения параметров, программа-мастер покажет список этих параметров. Если параметры будут подтверждены, соответствующие данные будут записаны в файл <code>/etc/samba/smb.conf</code>."
+msgid ""
+"The wizard displays a list of the chosen parameters before you accept the "
+"configuration. When accepted, the configuration will be written in <code>/"
+"etc/samba/smb.conf</code>."
+msgstr ""
+"Прежде чем вами будут подтверждены выбранные значения параметров, программа-"
+"мастер покажет список этих параметров. Если параметры будут подтверждены, "
+"соответствующие данные будут записаны в файл <code>/etc/samba/smb.conf</"
+"code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:143
@@ -3187,13 +5119,30 @@ msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:153
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain controller\" option is selected, the wizard asks for indication if Wins is to support or not and to provide admin users names. The following steps are then the same as for standalone server, except you can choose also the security mode:"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Если будет отмечен пункт «Основной контроллер домена», мастер попросит вас указать, следует ли поддерживать Wins, и определить имена пользователей-администраторов. Следующие шаги являются теми же самыми, что и при настройке отдельного сервера, кроме того, что вам придётся указать режим защиты:"
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
+"controller\" option is selected, the wizard asks for indication if Wins is "
+"to support or not and to provide admin users names. The following steps are "
+"then the same as for standalone server, except you can choose also the "
+"security mode:"
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Если будет отмечен пункт "
+"«Основной контроллер домена», мастер попросит вас указать, следует ли "
+"поддерживать Wins, и определить имена пользователей-администраторов. "
+"Следующие шаги являются теми же самыми, что и при настройке отдельного "
+"сервера, кроме того, что вам придётся указать режим защиты:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/draksambashare.xml:164
-msgid "<guilabel>domain</guilabel>: provides a mechanism for storing all user and group accounts in a central, shared, account repository.  The centralized account repository is shared between (security)  controllers."
-msgstr "<guilabel>домен</guilabel>: предоставляется механизм для хранения всех учётных записей пользователей и групп в централизованном общем репозитории учётных записей. Централизованный репозиторий учётных записей предоставляется в использование контролерами безопасности домена."
+msgid ""
+"<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
+"group accounts in a central, shared, account repository.  The centralized "
+"account repository is shared between (security)  controllers."
+msgstr ""
+"<guilabel>домен</guilabel>: предоставляется механизм для хранения всех "
+"учётных записей пользователей и групп в централизованном общем репозитории "
+"учётных записей. Централизованный репозиторий учётных записей "
+"предоставляется в использование контролерами безопасности домена."
 
 #. type: Content of: <section><section><title>
 #: en/draksambashare.xml:173
@@ -3203,7 +5152,9 @@ msgstr "Назначение каталога, доступ к которому
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:175
 msgid "With the <guibutton>Add</guibutton> button, we get:"
-msgstr "Если нажать кнопку <guibutton>Добавить</guibutton>, будет показано следующее окно:"
+msgstr ""
+"Если нажать кнопку <guibutton>Добавить</guibutton>, будет показано следующее "
+"окно:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:179
@@ -3212,8 +5163,16 @@ msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:184
-msgid "A new entry is thus added. It can be modified with the <guibutton>Modify</guibutton> button. Options can be edited, such as whether the directory is visible to the public, writable or browseable.  The share name can not be modified."
-msgstr "Таким образом будет добавлена новая запись. Внести изменения в существующую запись можно с помощью нажатия кнопки <guibutton>Изменить</guibutton>. Вы можете изменить, будет ли каталог видимым для всех пользователей, пригодным к записи или чтению. Менять имя общего ресурса нельзя."
+msgid ""
+"A new entry is thus added. It can be modified with the <guibutton>Modify</"
+"guibutton> button. Options can be edited, such as whether the directory is "
+"visible to the public, writable or browseable.  The share name can not be "
+"modified."
+msgstr ""
+"Таким образом будет добавлена новая запись. Внести изменения в существующую "
+"запись можно с помощью нажатия кнопки <guibutton>Изменить</guibutton>. Вы "
+"можете изменить, будет ли каталог видимым для всех пользователей, пригодным "
+"к записи или чтению. Менять имя общего ресурса нельзя."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:191
@@ -3223,7 +5182,9 @@ msgstr "draksambashare16.png"
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:203
 msgid "When the list has at least one entry, menu entries can be used."
-msgstr "Если в списке будет хоть одна запись, можно будет воспользоваться пунктами меню."
+msgstr ""
+"Если в списке будет хоть одна запись, можно будет воспользоваться пунктами "
+"меню."
 
 #. type: Content of: <section><section><formalpara><para>
 #: en/draksambashare.xml:209
@@ -3266,16 +5227,10 @@ msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239
-#: en/drakvpn.xml:46
-#: en/logdrake.xml:89
-#: en/rpmdrake.xml:42
-#: en/rpmdrake.xml:147
-#: en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167
-#: en/rpmdrake.xml:177
-#: en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
@@ -3291,8 +5246,15 @@ msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:249
-msgid "In this tab, you can add users who are allowed to access the shared resources when authentication is required. You can add users from <xref linkend=\"userdrake-ti1\"/><placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "С помощью этой вкладки вы можете добавлять пользователей, которым будет разрешен доступ к общим ресурсам, если включено распознавание пользователей. Можно добавить пользователей из раздела <xref linkend=\"userdrake-ti1\"/><placeholder type=\"mediaobject\" id=\"0\"/>"
+msgid ""
+"In this tab, you can add users who are allowed to access the shared "
+"resources when authentication is required. You can add users from <xref "
+"linkend=\"userdrake-ti1\"/><placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+"С помощью этой вкладки вы можете добавлять пользователей, которым будет "
+"разрешен доступ к общим ресурсам, если включено распознавание пользователей. "
+"Можно добавить пользователей из раздела <xref linkend=\"userdrake-ti1\"/"
+"><placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><info><title>
 #: en/draksec.xml:3
@@ -3311,23 +5273,44 @@ msgstr "draksec.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/draksec.xml:16
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">draksec</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">draksec</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksec</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">draksec</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/draksec.xml:15
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia Control Center under the tab <emphasis role=\"bold\">Security</emphasis>"
-msgstr "Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно получить из Центра управления Mageia, пункт <emphasis role=\"bold\">Безопасность</emphasis>"
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
+"Control Center under the tab <emphasis role=\"bold\">Security</emphasis>"
+msgstr ""
+"Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить из Центра управления Mageia, пункт <emphasis role=\"bold"
+"\">Безопасность</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/draksec.xml:20
-msgid "It allows to give the regular users the needed rights to accomplish tasks usually done by the administrator."
-msgstr "С помощью этой программы можно предоставлять обычным пользователям права, необходимые для выполнения задач, которые обычно выполняются под учётной записью администратора."
+msgid ""
+"It allows to give the regular users the needed rights to accomplish tasks "
+"usually done by the administrator."
+msgstr ""
+"С помощью этой программы можно предоставлять обычным пользователям права, "
+"необходимые для выполнения задач, которые обычно выполняются под учётной "
+"записью администратора."
 
 #. type: Content of: <section><para>
 #: en/draksec.xml:23
-msgid "Most of the tools available in the Mageia Control Center are displayed in the left side of the window (see the screenshot above) and for each tool, a drop down list gives the choice between:"
-msgstr "Список большинства инструментов, которыми можно воспользоваться с помощью Центра управления Mageia, будет приведён в левой части окна (см. снимок выше). Для каждого из инструментов предусмотрен выпадающий список с вариантами:"
+msgid ""
+"Most of the tools available in the Mageia Control Center are displayed in "
+"the left side of the window (see the screenshot above) and for each tool, a "
+"drop down list gives the choice between:"
+msgstr ""
+"Список большинства инструментов, которыми можно воспользоваться с помощью "
+"Центра управления Mageia, будет приведён в левой части окна (см. снимок "
+"выше). Для каждого из инструментов предусмотрен выпадающий список с "
+"вариантами:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/draksec.xml:29
@@ -3337,17 +5320,26 @@ msgstr "Без пароля: инструмент запускается без
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/draksec.xml:34
 msgid "User password: The user password is asked before the tool launching."
-msgstr "Пароль пользователя: для запуска инструмента необходимо будет ввести пароль пользователя."
+msgstr ""
+"Пароль пользователя: для запуска инструмента необходимо будет ввести пароль "
+"пользователя."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/draksec.xml:39
 msgid "Root password: the root password is asked before the tool launching"
-msgstr "Пароль администратора: для запуска инструмента необходимо будет ввести пароль администратора (root)"
+msgstr ""
+"Пароль администратора: для запуска инструмента необходимо будет ввести "
+"пароль администратора (root)"
 
 #. type: Content of: <section><para>
 #: en/draksec.xml:44
-msgid "The default values depend of the chosen security level. See in the same MCC tab, the tool \"Configure system security, permissions and audit\"."
-msgstr "Значения по умолчанию зависят от выбранного уровня безопасности. Смотрите в Центре управления Mageia, пункт \"Настройка безопасности, прав доступа и аудита системы\"."
+msgid ""
+"The default values depend of the chosen security level. See in the same MCC "
+"tab, the tool \"Configure system security, permissions and audit\"."
+msgstr ""
+"Значения по умолчанию зависят от выбранного уровня безопасности. Смотрите в "
+"Центре управления Mageia, пункт \"Настройка безопасности, прав доступа и "
+"аудита системы\"."
 
 #. type: Content of: <section><info><title>
 #: en/draksnapshot-config.xml:11
@@ -3366,38 +5358,93 @@ msgstr "draksnapshot-config.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/draksnapshot-config.xml:22
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">draksnapshot-config </emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">draksnapshot-config</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksnapshot-config </emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">draksnapshot-config</emphasis> от имени "
+"администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:22
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is available in MCC's <guilabel>System</guilabel> tab, in the <guilabel>Administration tools</guilabel> section."
-msgstr "Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно получить с помощью Центра управления Mageia, пункт «Система», раздел «Инструменты администрирования»."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is available in MCC's "
+"<guilabel>System</guilabel> tab, in the <guilabel>Administration tools</"
+"guilabel> section."
+msgstr ""
+"Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить с помощью Центра управления Mageia, пункт «Система», раздел "
+"«Инструменты администрирования»."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:26
-msgid "When you start this tool in MCC for the first time, you will see a message about installing draksnapshot. Click on <guibutton>Install</guibutton> to proceed. Draksnapshot and some other packages it needs will be installed."
-msgstr "После первого запуска этой программы из Центра управления Mageia вы увидите сообщение об установке draksnapshot. Нажмите на кнопку <guibutton>Установить</guibutton>. После этого будет установлен draksnapshot и другие нужные для работы этой программы пакеты."
+msgid ""
+"When you start this tool in MCC for the first time, you will see a message "
+"about installing draksnapshot. Click on <guibutton>Install</guibutton> to "
+"proceed. Draksnapshot and some other packages it needs will be installed."
+msgstr ""
+"После первого запуска этой программы из Центра управления Mageia вы увидите "
+"сообщение об установке draksnapshot. Нажмите на кнопку "
+"<guibutton>Установить</guibutton>. После этого будет установлен draksnapshot "
+"и другие нужные для работы этой программы пакеты."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:31
-msgid "Click again on <guilabel>Snapshots</guilabel>, you will see the <guilabel>Settings</guilabel> screen. Tick <guilabel>Enable Backups</guilabel> and, if you want to backup the whole system, <guilabel>Backup the whole system</guilabel>."
-msgstr "Еще раз выберите <guilabel>Резервные копии</guilabel>, и вы увидите окно <guilabel>Параметры</guilabel>. Выберите <guilabel>Включить резервное копирование</guilabel>, если хотите создать резервную копию всей системы, пункт <guilabel>Резервное копирование всей системы</guilabel>."
+msgid ""
+"Click again on <guilabel>Snapshots</guilabel>, you will see the "
+"<guilabel>Settings</guilabel> screen. Tick <guilabel>Enable Backups</"
+"guilabel> and, if you want to backup the whole system, <guilabel>Backup the "
+"whole system</guilabel>."
+msgstr ""
+"Еще раз выберите <guilabel>Резервные копии</guilabel>, и вы увидите окно "
+"<guilabel>Параметры</guilabel>. Выберите <guilabel>Включить резервное "
+"копирование</guilabel>, если хотите создать резервную копию всей системы, "
+"пункт <guilabel>Резервное копирование всей системы</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:34
-msgid "If you only want to backup part of your directories, then choose <guilabel>Advanced</guilabel>. You will see a little pop-up screen. Use the <guibutton>Add</guibutton> and <guibutton>Remove</guibutton> buttons next to the <guilabel>Backup list</guilabel> to include or exclude directories and files from the backup. Use the same buttons next to the <guilabel>Exclude</guilabel> list to remove subdirectories and/or files from the chosen directories, that should <emphasis role=\"bold\">not</emphasis> be included in the backup. Click on <guibutton>Close</guibutton> when you are done."
-msgstr "Если вы хотите создать резервную копию только части каталогов, нажмите кнопку <guilabel>Дополнительно</guilabel>. В ответ будет открыто небольшое всплывающее окно. Воспользуйтесь кнопками <guibutton>Добавить</guibutton> и <guibutton>Удалить</guibutton>, расположенными рядом со списком <guilabel>Перечень резервных копий</guilabel>, чтобы добавить каталоги и файлы в список резервного копирования или удалить их. Воспользуйтесь такими же кнопками рядом со <guilabel>Списком исключений</guilabel>, чтобы определить список подкаталогов и/или файлов, которые не следует добавлять к резервной копии. Файлы из этого списка <emphasis role=\"bold\">не будут</emphasis> включены в резервную копию. Нажмите кнопку <guibutton>Закрыть</guibutton>, когда списки будут готовы."
+msgid ""
+"If you only want to backup part of your directories, then choose "
+"<guilabel>Advanced</guilabel>. You will see a little pop-up screen. Use the "
+"<guibutton>Add</guibutton> and <guibutton>Remove</guibutton> buttons next to "
+"the <guilabel>Backup list</guilabel> to include or exclude directories and "
+"files from the backup. Use the same buttons next to the <guilabel>Exclude</"
+"guilabel> list to remove subdirectories and/or files from the chosen "
+"directories, that should <emphasis role=\"bold\">not</emphasis> be included "
+"in the backup. Click on <guibutton>Close</guibutton> when you are done."
+msgstr ""
+"Если вы хотите создать резервную копию только части каталогов, нажмите "
+"кнопку <guilabel>Дополнительно</guilabel>. В ответ будет открыто небольшое "
+"всплывающее окно. Воспользуйтесь кнопками <guibutton>Добавить</guibutton> и "
+"<guibutton>Удалить</guibutton>, расположенными рядом со списком "
+"<guilabel>Перечень резервных копий</guilabel>, чтобы добавить каталоги и "
+"файлы в список резервного копирования или удалить их. Воспользуйтесь такими "
+"же кнопками рядом со <guilabel>Списком исключений</guilabel>, чтобы "
+"определить список подкаталогов и/или файлов, которые не следует добавлять к "
+"резервной копии. Файлы из этого списка <emphasis role=\"bold\">не будут</"
+"emphasis> включены в резервную копию. Нажмите кнопку <guibutton>Закрыть</"
+"guibutton>, когда списки будут готовы."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:41
-msgid "Now give the path to <guilabel>Where to backup</guilabel>, or choose the <guibutton>Browse</guibutton> button to select the correct path. Any mounted USB-key or external HD can be found in <emphasis role=\"bold\">/run/media/your_user_name/</emphasis>."
-msgstr "Далее укажите каталог в поле <guilabel>Куда сохранять копии</guilabel> или нажмите кнопку <guibutton>Обзор</guibutton>, чтобы указать соответствующий каталог. Все смонтированные флеш-носители USB и внешние диски можно найти в каталоге <emphasis role=\"bold\">/run/media/имя пользователя/</emphasis>."
+msgid ""
+"Now give the path to <guilabel>Where to backup</guilabel>, or choose the "
+"<guibutton>Browse</guibutton> button to select the correct path. Any mounted "
+"USB-key or external HD can be found in <emphasis role=\"bold\">/run/media/"
+"your_user_name/</emphasis>."
+msgstr ""
+"Далее укажите каталог в поле <guilabel>Куда сохранять копии</guilabel> или "
+"нажмите кнопку <guibutton>Обзор</guibutton>, чтобы указать соответствующий "
+"каталог. Все смонтированные флеш-носители USB и внешние диски можно найти в "
+"каталоге <emphasis role=\"bold\">/run/media/имя пользователя/</emphasis>."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:45
 msgid "Click on <guibutton>Apply</guibutton> to make the snapshot."
-msgstr "Нажмите кнопку <guibutton>Применить</guibutton>, чтобы создать резервную копию."
+msgstr ""
+"Нажмите кнопку <guibutton>Применить</guibutton>, чтобы создать резервную "
+"копию."
 
 #. type: Content of: <section><info><title>
 #: en/draksound.xml:3
@@ -3416,48 +5463,100 @@ msgstr "draksound.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/draksound.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">draksound</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">draksound</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksound</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">draksound</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:14
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</emphasis>.¶"
-msgstr "Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно получить из Центра управления Mageia, пункт <emphasis role=\"bold\">Оборудование</emphasis>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
+"Control Center under the tab <emphasis role=\"bold\">Hardware</emphasis>.¶"
+msgstr ""
+"Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить из Центра управления Mageia, пункт <emphasis role=\"bold"
+"\">Оборудование</emphasis>."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:19
-msgid "Draksound deals with the sound configuration, including the driver choice, PulseAudio options and trouble shooting. It will help you if you experience sound problems or if you change the sound card."
-msgstr "Draksound предназначен для настройки звуковой подсистемы, в частности выбора драйверов, определение параметров PulseAudio и решения проблем с работой звука. Программа поможет вам устранить проблемы со звуковой подсистемой или изменить звуковую карту для вывода звуковых данных."
+msgid ""
+"Draksound deals with the sound configuration, including the driver choice, "
+"PulseAudio options and trouble shooting. It will help you if you experience "
+"sound problems or if you change the sound card."
+msgstr ""
+"Draksound предназначен для настройки звуковой подсистемы, в частности выбора "
+"драйверов, определение параметров PulseAudio и решения проблем с работой "
+"звука. Программа поможет вам устранить проблемы со звуковой подсистемой или "
+"изменить звуковую карту для вывода звуковых данных."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:23
-msgid "The drop down list called <guilabel>Driver</guilabel> allows you to select a driver from all the ones available on the computer that match the sound card."
-msgstr "С помощью выпадающего списка <guilabel>Драйвер</guilabel> вы можете выбрать нужный драйвер для работы звуковой карты вашего компьютера из списка установленных драйверов."
+msgid ""
+"The drop down list called <guilabel>Driver</guilabel> allows you to select a "
+"driver from all the ones available on the computer that match the sound card."
+msgstr ""
+"С помощью выпадающего списка <guilabel>Драйвер</guilabel> вы можете выбрать "
+"нужный драйвер для работы звуковой карты вашего компьютера из списка "
+"установленных драйверов."
 
 #. type: Content of: <section><note><para>
 #: en/draksound.xml:28
-msgid "Most of the time, it is possible to choose a driver using the OSS or ALSA API. OSS is the oldest and very basic, we recommend to choose ALSA when possible for its enhanced features."
-msgstr "В основном, для определения драйвера достаточно возможностей программного интерфейса OSS или ALSA. Интерфейс OSS является старым и простым, он предоставляет довольно базовые возможности. Мы рекомендуем использовать ALSA, поскольку этот интерфейс предоставляет значительно более широкие возможности."
+msgid ""
+"Most of the time, it is possible to choose a driver using the OSS or ALSA "
+"API. OSS is the oldest and very basic, we recommend to choose ALSA when "
+"possible for its enhanced features."
+msgstr ""
+"В основном, для определения драйвера достаточно возможностей программного "
+"интерфейса OSS или ALSA. Интерфейс OSS является старым и простым, он "
+"предоставляет довольно базовые возможности. Мы рекомендуем использовать "
+"ALSA, поскольку этот интерфейс предоставляет значительно более широкие "
+"возможности."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:33
-msgid "<guilabel>PulseAudio</guilabel> is a sound server. It receives all the sound inputs, mixes them according to the user preferences and sends the resulting sound to the output. See <guimenu>Menu ->Sound and video -> PulseAudio volume control</guimenu> to set these preferences."
-msgstr "<guilabel>PulseAudio</guilabel> - звуковой сервер. Этот сервер получает все входящие звуковые данные, выполняет микширование этих данных, согласно указанных пользователем параметров и отправляет результаты на устройства вывода звуковых данных. Настроить параметры микширования можно с помощью пункта меню <guimenu>Кнопка меню -> Звук и видео -> Управление громкостью</guimenu>."
+msgid ""
+"<guilabel>PulseAudio</guilabel> is a sound server. It receives all the sound "
+"inputs, mixes them according to the user preferences and sends the resulting "
+"sound to the output. See <guimenu>Menu ->Sound and video -> PulseAudio "
+"volume control</guimenu> to set these preferences."
+msgstr ""
+"<guilabel>PulseAudio</guilabel> - звуковой сервер. Этот сервер получает все "
+"входящие звуковые данные, выполняет микширование этих данных, согласно "
+"указанных пользователем параметров и отправляет результаты на устройства "
+"вывода звуковых данных. Настроить параметры микширования можно с помощью "
+"пункта меню <guimenu>Кнопка меню -> Звук и видео -> Управление громкостью</"
+"guimenu>."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:38
-msgid "PulseAudio is the default sound server and it is recommended to leave it enabled."
-msgstr "PulseAudio является звуковым сервером по умолчанию. Рекомендуем вам не выключать его."
+msgid ""
+"PulseAudio is the default sound server and it is recommended to leave it "
+"enabled."
+msgstr ""
+"PulseAudio является звуковым сервером по умолчанию. Рекомендуем вам не "
+"выключать его."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:41
-msgid "<guilabel>Glitch-Free</guilabel> improves PulseAudio with some programs. It is also recommended to leave it enabled."
-msgstr "<guilabel>Использовать режим Glitch-Free</guilabel> - улучшает работу PulseAudio с некоторыми программами. Мы не рекомендуем снимать отметку с этого пункта."
+msgid ""
+"<guilabel>Glitch-Free</guilabel> improves PulseAudio with some programs. It "
+"is also recommended to leave it enabled."
+msgstr ""
+"<guilabel>Использовать режим Glitch-Free</guilabel> - улучшает работу "
+"PulseAudio с некоторыми программами. Мы не рекомендуем снимать отметку с "
+"этого пункта."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:44
-msgid "The button <guibutton>Advanced</guibutton> display a new window with three buttons:"
-msgstr "С помощью кнопки <guibutton>Дополнительно</guibutton> можно открыть новое окно с тремя кнопками:"
+msgid ""
+"The button <guibutton>Advanced</guibutton> display a new window with three "
+"buttons:"
+msgstr ""
+"С помощью кнопки <guibutton>Дополнительно</guibutton> можно открыть новое "
+"окно с тремя кнопками:"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draksound.xml:49
@@ -3466,13 +5565,23 @@ msgstr "Draksound1.png"
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:53
-msgid "The first button gives total freedom of choice. You have to know what you are doing."
-msgstr "С помощью первой кнопки вы можете выбрать любой драйвер. При этом нужны определённые знания, какой драйвер следует выбрать."
+msgid ""
+"The first button gives total freedom of choice. You have to know what you "
+"are doing."
+msgstr ""
+"С помощью первой кнопки вы можете выбрать любой драйвер. При этом нужны "
+"определённые знания, какой драйвер следует выбрать."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:56
-msgid "The second one is obvious and the last one gives assistance with fixing any problems you may have. You will find it helpful to try this before asking the community for help."
-msgstr "Назначение второй кнопки понятно из надписи на ней. Последняя же кнопка может помочь с решением проблем, возникающих со звуком. Попробуйте нажать ее до того, как начнёте искать помощи у сообщества дистрибутива."
+msgid ""
+"The second one is obvious and the last one gives assistance with fixing any "
+"problems you may have. You will find it helpful to try this before asking "
+"the community for help."
+msgstr ""
+"Назначение второй кнопки понятно из надписи на ней. Последняя же кнопка "
+"может помочь с решением проблем, возникающих со звуком. Попробуйте нажать ее "
+"до того, как начнёте искать помощи у сообщества дистрибутива."
 
 #. type: Content of: <section><info><title>
 #: en/drakups.xml:3
@@ -3491,8 +5600,12 @@ msgstr "drakups.png"
 
 #. type: Content of: <section><para>
 #: en/drakups.xml:16
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakups</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakups</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakups</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakups</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><info><title>
 #: en/drakvpn.xml:3
@@ -3511,13 +5624,30 @@ msgstr "drakvpn1.png"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakvpn.xml:19
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakvpn</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakvpn</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakvpn</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakvpn</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><section><para>
 #: en/drakvpn.xml:18
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> allows to configure secure access to a remote network establishing a tunnel between the local workstation and the remote network. We discuss here only of the configuration on the workstation side. We assume that the remote network is already in operation, and that you have the connection information from the network administrator, like a .pcf configuration file ."
-msgstr "С помощью этого инструмента<placeholder type=\"footnote\" id=\"0\"/> можно настроить безопасный доступ к удаленной сети с использованием туннелирования данных между локальной рабочей станцией и удаленной сетью. В этом разделе мы обсудим только настройки на стороне рабочей станции. Предполагается, что удалённая сеть работает надежно, и что вам известны данные относительно установленного соединения, которые можно получить от администратора сети, например в формате файла настроек .pcf."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows to configure "
+"secure access to a remote network establishing a tunnel between the local "
+"workstation and the remote network. We discuss here only of the "
+"configuration on the workstation side. We assume that the remote network is "
+"already in operation, and that you have the connection information from the "
+"network administrator, like a .pcf configuration file ."
+msgstr ""
+"С помощью этого инструмента<placeholder type=\"footnote\" id=\"0\"/> можно "
+"настроить безопасный доступ к удаленной сети с использованием туннелирования "
+"данных между локальной рабочей станцией и удаленной сетью. В этом разделе мы "
+"обсудим только настройки на стороне рабочей станции. Предполагается, что "
+"удалённая сеть работает надежно, и что вам известны данные относительно "
+"установленного соединения, которые можно получить от администратора сети, "
+"например в формате файла настроек .pcf."
 
 #. type: Content of: <section><section><title>
 #: en/drakvpn.xml:30
@@ -3526,8 +5656,12 @@ msgstr "Настройки"
 
 #. type: Content of: <section><section><para>
 #: en/drakvpn.xml:32
-msgid "First, select either Cisco VPN Concentrator or OpenVPN, depending on which protocol is used for your virtual private network."
-msgstr "Сначала следует выбрать концентратор Cisco VPN или OpenVPN, в зависимости от того, какой протокол использован для вашей виртуальной частной сети."
+msgid ""
+"First, select either Cisco VPN Concentrator or OpenVPN, depending on which "
+"protocol is used for your virtual private network."
+msgstr ""
+"Сначала следует выбрать концентратор Cisco VPN или OpenVPN, в зависимости от "
+"того, какой протокол использован для вашей виртуальной частной сети."
 
 #. type: Content of: <section><section><para>
 #: en/drakvpn.xml:35
@@ -3551,8 +5685,12 @@ msgstr "drakvpn3.png"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakvpn.xml:54
-msgid "For openvpn. The openvpn package and its dependencies will be installed the first time the tool is used."
-msgstr "Openvpn. После первого запуска инструмента будет установлен пакет openvpn и его зависимости."
+msgid ""
+"For openvpn. The openvpn package and its dependencies will be installed the "
+"first time the tool is used."
+msgstr ""
+"Openvpn. После первого запуска инструмента будет установлен пакет openvpn и "
+"его зависимости."
 
 #. type: Attribute 'fileref' of: <section><section><itemizedlist><listitem><para><mediaobject><imageobject><imagedata>
 #: en/drakvpn.xml:59
@@ -3561,8 +5699,12 @@ msgstr "drakvpn7.png"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakvpn.xml:57
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>Select the files that you received from the network administrator."
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Выберите файлы, которые были получены от администратора сети."
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Select the files that you "
+"received from the network administrator."
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Выберите файлы, которые были "
+"получены от администратора сети."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakvpn.xml:64
@@ -3581,13 +5723,23 @@ msgstr "В следующем окне программа попросит ва�
 
 #. type: Content of: <section><section><para>
 #: en/drakvpn.xml:76
-msgid "When the parameters are set, you have the option of starting the VPN connection."
-msgstr "После определения параметров программа предложит вам установить VPN-соединение."
+msgid ""
+"When the parameters are set, you have the option of starting the VPN "
+"connection."
+msgstr ""
+"После определения параметров программа предложит вам установить VPN-"
+"соединение."
 
 #. type: Content of: <section><section><para>
 #: en/drakvpn.xml:79
-msgid "This VPN connection can be set to start automatically with a network connection. To do this, reconfigure the network connection to always connect to this VPN."
-msgstr "Вы можете указать системе устанавливать это VPN-соединение в автоматическом режиме во время ее запуска. Для этого необходимо изменить настройки сетевого соединения так, чтобы оно всегда устанавливалось с этим VPN."
+msgid ""
+"This VPN connection can be set to start automatically with a network "
+"connection. To do this, reconfigure the network connection to always connect "
+"to this VPN."
+msgstr ""
+"Вы можете указать системе устанавливать это VPN-соединение в автоматическом "
+"режиме во время ее запуска. Для этого необходимо изменить настройки сетевого "
+"соединения так, чтобы оно всегда устанавливалось с этим VPN."
 
 #. type: Content of: <section><info><title>
 #: en/drakwizard_apache2.xml:3
@@ -3606,13 +5758,22 @@ msgstr "drakwizard_apache2.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakwizard_apache2.xml:12
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakwizard apache2</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakwizard apache2</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard apache2</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakwizard apache2</emphasis> от имени "
+"администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakwizard_apache2.xml:12
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a web server."
-msgstr "Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам настроить веб-сервер."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
+"web server."
+msgstr ""
+"Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам "
+"настроить веб-сервер."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_apache2.xml:15
@@ -3621,8 +5782,13 @@ msgstr "Что такое веб-сервер?"
 
 #. type: Content of: <section><section><para>
 #: en/drakwizard_apache2.xml:17
-msgid "Web server is the software that helps to deliver web content that can be accessed through the Internet. (From Wikipedia)"
-msgstr "Веб-сервер представляет собой программное обеспечение, которое помогает поставить веб содержимое, которое может быть доступно через Интернет. (Материал из Википедии)"
+msgid ""
+"Web server is the software that helps to deliver web content that can be "
+"accessed through the Internet. (From Wikipedia)"
+msgstr ""
+"Веб-сервер представляет собой программное обеспечение, которое помогает "
+"поставить веб содержимое, которое может быть доступно через Интернет. "
+"(Материал из Википедии)"
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_apache2.xml:21
@@ -3640,16 +5806,16 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-web-step1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34
-#: en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34
-#: en/drakwizard_squid.xml:34
-msgid "The first page is just an introduction, click <guibutton>Next</guibutton>."
-msgstr "Первая страница - это только инструкция, нажмите <guibutton>Далее</guibutton>."
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
+msgid ""
+"The first page is just an introduction, click <guibutton>Next</guibutton>."
+msgstr ""
+"Первая страница - это только инструкция, нажмите <guibutton>Далее</"
+"guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:38
-#: en/drakwizard_proftpd.xml:38
+#: en/drakwizard_apache2.xml:38 en/drakwizard_proftpd.xml:38
 msgid "Selecting Server Exposer: Local Net and/or World"
 msgstr "Выбор вида сервера: локальная сеть и/или мир"
 
@@ -3660,8 +5826,13 @@ msgstr "drakwizard-web-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:45
-msgid "Exposing the web server to the Internet has it's risks. Be ready for bad things."
-msgstr "Предоставление доступа к данным веб-сервера из Интернета является рискованным делом. Вам следует позаботиться о защите, если вы решите предоставить такой доступ."
+msgid ""
+"Exposing the web server to the Internet has it's risks. Be ready for bad "
+"things."
+msgstr ""
+"Предоставление доступа к данным веб-сервера из Интернета является "
+"рискованным делом. Вам следует позаботиться о защите, если вы решите "
+"предоставить такой доступ."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:49
@@ -3690,8 +5861,12 @@ msgstr "drakwizard-web-step4.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:67
-msgid "The user needs to create and populate this directory, then the server will display it."
-msgstr "Пользователю необходимо создать и заполнить этот каталог, затем сервер будет отображать его."
+msgid ""
+"The user needs to create and populate this directory, then the server will "
+"display it."
+msgstr ""
+"Пользователю необходимо создать и заполнить этот каталог, затем сервер будет "
+"отображать его."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:71
@@ -3709,10 +5884,8 @@ msgid "Allows you to configure the path to the web servers default documents."
 msgstr "Позволяет настроить путь к дефолтным документам веб-сервера."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82
-#: en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71
-#: en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr "Сводка"
@@ -3723,19 +5896,18 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-web-step6.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89
-#: en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78
-#: en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
-msgid "Take a second to check these options, then click <guibutton>Next</guibutton>."
-msgstr "Ознакомьтесь с резюме по изменению параметров и нажмите кнопку <guibutton>Далее</guibutton>."
+msgid ""
+"Take a second to check these options, then click <guibutton>Next</guibutton>."
+msgstr ""
+"Ознакомьтесь с резюме по изменению параметров и нажмите кнопку "
+"<guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:93
-#: en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126
-#: en/drakwizard_sshd.xml:116
+#: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr "Финиш"
 
@@ -3745,10 +5917,8 @@ msgid "drakwizard-web-step7.png"
 msgstr "drakwizard-web-step7.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:100
-#: en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133
-#: en/drakwizard_sshd.xml:123
+#: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "Завершено! Нажмите <guibutton>Финиш</guibutton>."
 
@@ -3769,189 +5939,409 @@ msgstr "drakwizard_bind.png"
 
 #. type: Content of: <section><para>
 #: en/drakwizard_bind.xml:16
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakwizard bind</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakwizard bind</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard bind</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakwizard bind</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr "Настройка DHCP"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr "drakwizard dhcp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakwizard dhcp</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakwizard dhcp</emphasis> от имени администратора (root)."
+#: en/drakwizard_dhcp.xml:23
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard dhcp</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakwizard dhcp</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a <acronym>DHCP</acronym> server."
-msgstr "Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам настроить <acronym>DHCP</acronym> сервер."
+#: en/drakwizard_dhcp.xml:22
+#, fuzzy
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
+msgstr ""
+"Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам "
+"настроить <acronym>DHCP</acronym> сервер."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr "Что такое DHCP?"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
-msgid "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a standardized networking protocol used on IP networks that dynamically configures IP addresses and other information that is needed for Internet communication. (From Wikipedia)"
-msgstr "Протокол динамической конфигурации хоста (<acronym>DHCP</acronym>) представляет собой стандартизированный сетевой протокол, используемый на IP сетях, который динамически настраивает IP-адреса и другую информацию, необходимую для интернет-общения. (Материал из Википедии)"
+#: en/drakwizard_dhcp.xml:32
+msgid ""
+"The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
+"standardized networking protocol used on IP networks that dynamically "
+"configures IP addresses and other information that is needed for Internet "
+"communication. (From Wikipedia)"
+msgstr ""
+"Протокол динамической конфигурации хоста (<acronym>DHCP</acronym>) "
+"представляет собой стандартизированный сетевой протокол, используемый на IP "
+"сетях, который динамически настраивает IP-адреса и другую информацию, "
+"необходимую для интернет-общения. (Материал из Википедии)"
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+#, fuzzy
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr "Настройка DHCP сервера с drakwizard dhcp"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr "Добро пожаловать в мастер DHCP сервера."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-dhcp-step1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr "Выбор адаптера"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-dhcp-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
-msgid "Choose network interface connected to the subnet DHCP will assign IPs for, then click <guibutton>Next</guibutton>."
-msgstr "Выбор сетевого интерфейса, подключенного к подсети DHCP, присвоит IP-адреса, затем нажмите кнопку <guibutton>Далее</guibutton>."
+#: en/drakwizard_dhcp.xml:68
+#, fuzzy
+msgid ""
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
+msgstr ""
+"Выбор сетевого интерфейса, подключенного к подсети DHCP, присвоит IP-адреса, "
+"затем нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr "Выберите диапазон IP"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-dhcp-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
-msgid "Select the beginning and ending IP addresses of the range of IPs you want the server to offer, along with the IP of the gateway machine connecting to someplace outside the local net, hopeful close to the Internet, then click <guibutton>Next</guibutton>."
-msgstr "Выберите начальный и конечный IP-адрес из диапазона IP адресов, которые должен предоставлять сервер, а также IP-адрес шлюза компьютера, который будет соединяться с внешними компьютерами вне локальной сети, желательно непосредственно с компьютерами в интернете. Нажмите кнопку <guibutton>Далее</guibutton>."
+#: en/drakwizard_dhcp.xml:83
+#, fuzzy
+msgid ""
+"Select the beginning and ending IP addresses of the range of IPs you want "
+"the server to offer, along with the IP of the gateway machine connecting to "
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
+msgstr ""
+"Выберите начальный и конечный IP-адрес из диапазона IP адресов, которые "
+"должен предоставлять сервер, а также IP-адрес шлюза компьютера, который "
+"будет соединяться с внешними компьютерами вне локальной сети, желательно "
+"непосредственно с компьютерами в интернете. Нажмите кнопку <guibutton>Далее</"
+"guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard-dhcp-step4.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr "Подождите..."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard-dhcp-step5.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
-msgid "This can be fixed. Click <guibutton>Previous</guibutton> a few times and change things around. Don't keep track."
-msgstr "С этой проблемой можно справиться. Нажмите кнопку <guibutton>Назад</guibutton> несколько раз и внесите какие-то изменения. Далее вернитесь к этой странице."
+#: en/drakwizard_dhcp.xml:113
+#, fuzzy
+msgid ""
+"This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
+"change things around."
+msgstr ""
+"С этой проблемой можно справиться. Нажмите кнопку <guibutton>Назад</"
+"guibutton> несколько раз и внесите какие-то изменения. Далее вернитесь к "
+"этой странице."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr "Позже..."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard-dhcp-step6.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
-msgstr "Ну, вот мы и научились чему-то."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+#, fuzzy
+msgid "What is done"
+msgstr "Что такое DHCP?"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+#, fuzzy
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr "Сохранить текущие настройки в файле <code>/etc/samba/smb.conf</code>."
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
+msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr "Настройка времени"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr "drakwizard ntp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakwizard ntp</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakwizard ntp</emphasis> от имени администратора (root)."
+#: en/drakwizard_ntp.xml:25
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard ntp</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakwizard ntp</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the time of your server synchronised with an external server. It isn't installed by default and you have to also install the drakwizard and drakwizard-base packages."
-msgstr "С помощью этого инструмента<placeholder type=\"footnote\" id=\"0\"/> вы сможете настроить сервер так, чтобы время в нём синхронизировалось с внешним сервером. По умолчанию, этот инструмент не устанавливается. Чтобы получить к нему доступ, вам следует установить пакеты drakwizard и drakwizard-base."
+#: en/drakwizard_ntp.xml:24
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
+"time of your server synchronised with an external server. It isn't installed "
+"by default and you have to also install the drakwizard and drakwizard-base "
+"packages."
+msgstr ""
+"С помощью этого инструмента<placeholder type=\"footnote\" id=\"0\"/> вы "
+"сможете настроить сервер так, чтобы время в нём синхронизировалось с внешним "
+"сервером. По умолчанию, этот инструмент не устанавливается. Чтобы получить к "
+"нему доступ, вам следует установить пакеты drakwizard и drakwizard-base."
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
-msgid "After a welcome screen (see above), the second one ask you to choose three time servers in the drop down lists and suggests to use pool.ntp.org twice because this server always points to available time servers."
-msgstr "После приветственного окна (см. выше), программа попросит вас выбрать три сервера времени с помощью раскрывающихся списков и дважды предложит воспользоваться pool.ntp.org, поскольку этот сервер всегда привязывается к доступным серверам времени."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+#, fuzzy
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr "Настройка сервера FTP с помощью drakwizard proftpd"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
+msgid ""
+"After a welcome screen (see above), the second one ask you to choose three "
+"time servers in the drop down lists and suggests to use pool.ntp.org twice "
+"because this server always points to available time servers."
+msgstr ""
+"После приветственного окна (см. выше), программа попросит вас выбрать три "
+"сервера времени с помощью раскрывающихся списков и дважды предложит "
+"воспользоваться pool.ntp.org, поскольку этот сервер всегда привязывается к "
+"доступным серверам времени."
+
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr "<author> <personname/> </author> <pubdate/>"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
-msgid "The following screens allows to choose the region and the city and then, you arrive on a summary. If something is wrong, you can obviously change it using the <guibutton>Previous </guibutton>button. If everything is right, click on the <guibutton>Next</guibutton> button to proceed to the test. It may take a while and you finally get this screen below:"
-msgstr "С помощью следующих страниц мастера вы сможете выбрать регион и город, после чего вам будет показано резюме настроек. Если будут обнаружены ошибки в настройках, вы можете отменить изменения, нажав кнопку <guibutton>Назад</guibutton>. Если настройки верны, нажать кнопку <guibutton>Далее</guibutton>, чтобы программа выполнила тестирование. Если всё будет хорошо, вы увидите окно, подобное приведённому ниже:"
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
+#, fuzzy
+msgid ""
+"The following screens allows to choose the region and the city and then, you "
+"arrive on a summary. If something is wrong, you can obviously change it "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
+"click on the <guibutton>Next</guibutton> button to proceed to the test. It "
+"may take a while and you finally get this screen below:"
+msgstr ""
+"С помощью следующих страниц мастера вы сможете выбрать регион и город, после "
+"чего вам будет показано резюме настроек. Если будут обнаружены ошибки в "
+"настройках, вы можете отменить изменения, нажав кнопку <guibutton>Назад</"
+"guibutton>. Если настройки верны, нажать кнопку <guibutton>Далее</"
+"guibutton>, чтобы программа выполнила тестирование. Если всё будет хорошо, "
+"вы увидите окно, подобное приведённому ниже:"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr "Нажмите на кнопку <guibutton>Готово</guibutton>, чтобы закрыть утилиту"
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+#, fuzzy
+msgid "This tool executes the following steps:"
+msgstr "Эта команда собирает следующую информацию о вашей системе:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -3969,13 +6359,22 @@ msgstr "drakwizard_proftpd.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakwizard_proftpd.xml:12
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakwizard proftpd</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakwizard proftpd</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard proftpd</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakwizard proftpd</emphasis> от имени "
+"администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/drakwizard_proftpd.xml:12
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up an <acronym>FTP</acronym> server."
-msgstr "Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам настроить <acronym>FTP</acronym> сервер."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up an "
+"<acronym>FTP</acronym> server."
+msgstr ""
+"Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам "
+"настроить <acronym>FTP</acronym> сервер."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_proftpd.xml:15
@@ -3984,8 +6383,15 @@ msgstr "Что такое <acronym>FTP</acronym>?"
 
 #. type: Content of: <section><section><para>
 #: en/drakwizard_proftpd.xml:17
-msgid "File Transfer Protocol (<acronym>FTP</acronym>) is a standard network protocol used to transfer files from one host to another host over a <acronym>TCP</acronym>-based network, such as the Internet. (From Wikipedia)"
-msgstr "Протокол передачи файлов (File Transfer Protocol или <acronym>FTP</acronym>) - стандартный протокол работы в сети, которая используется для передачи файлов с одного компьютера на другой в сети, основанной на <acronym>TCP</acronym>, в частности, в Интернете (из Википедии)."
+msgid ""
+"File Transfer Protocol (<acronym>FTP</acronym>) is a standard network "
+"protocol used to transfer files from one host to another host over a "
+"<acronym>TCP</acronym>-based network, such as the Internet. (From Wikipedia)"
+msgstr ""
+"Протокол передачи файлов (File Transfer Protocol или <acronym>FTP</acronym>) "
+"- стандартный протокол работы в сети, которая используется для передачи "
+"файлов с одного компьютера на другой в сети, основанной на <acronym>TCP</"
+"acronym>, в частности, в Интернете (из Википедии)."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_proftpd.xml:21
@@ -4009,8 +6415,13 @@ msgstr "drakwizard-ftp-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_proftpd.xml:45
-msgid "Exposing the FTP server to the Internet has it's risks. Be ready for bad things."
-msgstr "Предоставление доступа к данным сервера FTP из Интернета является рискованным делом. Вам следует позаботиться о защите, если вы решите предоставить такой доступ."
+msgid ""
+"Exposing the FTP server to the Internet has it's risks. Be ready for bad "
+"things."
+msgstr ""
+"Предоставление доступа к данным сервера FTP из Интернета является "
+"рискованным делом. Вам следует позаботиться о защите, если вы решите "
+"предоставить такой доступ."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_proftpd.xml:49
@@ -4024,8 +6435,14 @@ msgstr "drakwizard-ftp-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_proftpd.xml:56
-msgid "Enter name the sever will use to introduce itself, someone to email complaints too and whether to allow root login access."
-msgstr "Укажите название, которое сервер будет использовать для собственной идентификации, адрес электронной почты для направления жалоб и будет ли предоставлен доступ к входу в систему от имени администратора (пользователя root)."
+msgid ""
+"Enter name the sever will use to introduce itself, someone to email "
+"complaints too and whether to allow root login access."
+msgstr ""
+"Укажите название, которое сервер будет использовать для собственной "
+"идентификации, адрес электронной почты для направления жалоб и будет ли "
+"предоставлен доступ к входу в систему от имени администратора (пользователя "
+"root)."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_proftpd.xml:60
@@ -4039,8 +6456,13 @@ msgstr "drakwizard-ftp-step4.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_proftpd.xml:67
-msgid "Set listening port, jailed user, allow resumes and/or <acronym>FXP</acronym> (File eXchange Protocol)"
-msgstr "Укажите порт для ожидания данных, параметры ограниченной записи пользователя и то, следует ли  разрешать возобновления получения данных и/или <acronym>FXP</acronym> (File eXchange Protocol)."
+msgid ""
+"Set listening port, jailed user, allow resumes and/or <acronym>FXP</acronym> "
+"(File eXchange Protocol)"
+msgstr ""
+"Укажите порт для ожидания данных, параметры ограниченной записи пользователя "
+"и то, следует ли  разрешать возобновления получения данных и/или "
+"<acronym>FXP</acronym> (File eXchange Protocol)."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:74
@@ -4053,170 +6475,279 @@ msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ftp-step6.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr "Настройка прокси-сервера"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr "drakwizard squid"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakwizard squid</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakwizard squid</emphasis> от имени администратора (root)."
+#: en/drakwizard_squid.xml:23
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard squid</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakwizard squid</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a proxy server."
-msgstr "Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам настроить прокси-сервер."
+#: en/drakwizard_squid.xml:22
+#, fuzzy
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
+msgstr ""
+"Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам "
+"настроить прокси-сервер."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr "Что такое прокси сервер?"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
-msgid "A proxy server is a server (a computer system or an application) that acts as an intermediary for requests from clients seeking resources from other servers. A client connects to the proxy server, requesting some service, such as a file, connection, web page, or other resource available from a different server and the proxy server evaluates the request as a way to simplify and control its complexity. (From Wikipedia)"
-msgstr "Из Википедии: «В компьютерных сетях прокси-сервером называется сервер (компьютерная система или программа), который работает в качестве промежуточных звеньев для запросов от клиентов, которые выполняют поиски ресурсов на других серверах. Клиентская система соединяется с прокси-сервером, посылает запрос к определенной службе, в том числе файлу, соединению, веб-странице или другому ресурсу на другом сервере. Прокси-сервер обрабатывает запрос с целью упрощения и управления сложностью запроса.»"
+#: en/drakwizard_squid.xml:31
+#, fuzzy
+msgid ""
+"A proxy server is a server (a computer system or an application)  that acts "
+"as an intermediary for requests from clients seeking resources from other "
+"servers. A client connects to the proxy server, requesting some service, "
+"such as a file, connection, web page, or other resource available from a "
+"different server and the proxy server evaluates the request as a way to "
+"simplify and control its complexity. (From Wikipedia)"
+msgstr ""
+"Из Википедии: «В компьютерных сетях прокси-сервером называется сервер "
+"(компьютерная система или программа), который работает в качестве "
+"промежуточных звеньев для запросов от клиентов, которые выполняют поиски "
+"ресурсов на других серверах. Клиентская система соединяется с прокси-"
+"сервером, посылает запрос к определенной службе, в том числе файлу, "
+"соединению, веб-странице или другому ресурсу на другом сервере. Прокси-"
+"сервер обрабатывает запрос с целью упрощения и управления сложностью "
+"запроса.»"
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr "Настройка прокси-сервера с помощью drakwizard squid"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr "Добро пожаловать в мастер настройки прокси-сервера."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-proxy-step1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr "Выбор порта прокси"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-proxy-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
-msgid "Select the proxy port browsers will connect through, then click <guibutton>Next</guibutton>."
-msgstr "Выберите порт, с которым будут устанавливать соединение клиенты прокси-сервера, и нажмите кнопку <guibutton>Далее</guibutton>."
+#: en/drakwizard_squid.xml:69
+msgid ""
+"Select the proxy port browsers will connect through, then click "
+"<guibutton>Next</guibutton>."
+msgstr ""
+"Выберите порт, с которым будут устанавливать соединение клиенты прокси-"
+"сервера, и нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr "Использование памяти и диска"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-proxy-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
-msgid "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
-msgstr "Установите пределы памяти и дискового кэша, затем нажмите кнопку <guibutton>Далее</guibutton>."
+#: en/drakwizard_squid.xml:83
+msgid ""
+"Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
+msgstr ""
+"Установите пределы памяти и дискового кэша, затем нажмите кнопку "
+"<guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr "Выбор параметров управления доступом к сети"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard-proxy-step4.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
-msgid "Set visibility to local network or world, then click <guibutton>Next</guibutton>."
-msgstr "Определите диапазон доступа: локальная сеть или интернет, затем нажмите кнопку <guibutton>Далее</guibutton>."
+#: en/drakwizard_squid.xml:97
+msgid ""
+"Set visibility to local network or world, then click <guibutton>Next</"
+"guibutton>."
+msgstr ""
+"Определите диапазон доступа: локальная сеть или интернет, затем нажмите "
+"кнопку <guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 msgid "Grant Network Access"
 msgstr "Предоставление доступа к сети"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakwizard-proxy-step5.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
-msgstr "Предоставьте доступ локальным сетям и нажмите кнопку <guibutton>Далее</guibutton>."
+msgstr ""
+"Предоставьте доступ локальным сетям и нажмите кнопку <guibutton>Далее</"
+"guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr "Следует ли использовать прокси-сервер высшего уровня?"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakwizard-proxy-step6.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
-msgstr "Есть ли каскадный доступ к интернету через другой прокси-сервер? Если нет, пропустите следующий шаг."
+msgstr ""
+"Есть ли каскадный доступ к интернету через другой прокси-сервер? Если нет, "
+"пропустите следующий шаг."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr "Адрес и порт прокси-сервера более высокого уровня"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakwizard-proxy-step7.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
-msgid "Provide upper level proxy hostname and port, then click <guibutton>Next</guibutton>."
-msgstr "Укажите имя компьютера и порт прокси высшего уровня и нажмите кнопку <guibutton>Далее</guibutton>."
+#: en/drakwizard_squid.xml:139
+msgid ""
+"Provide upper level proxy hostname and port, then click <guibutton>Next</"
+"guibutton>."
+msgstr ""
+"Укажите имя компьютера и порт прокси высшего уровня и нажмите кнопку "
+"<guibutton>Далее</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakwizard-proxy-step8.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr "Запустить при загрузке?"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakwizard-proxy-step9.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
-msgid "Choose if the proxy server should be started during the boot time, then click <guibutton>Next</guibutton>."
-msgstr "Укажите, следует ли запускать прокси при загрузке операционной системы, и нажмите кнопку <guibutton>Далее</guibutton>."
+#: en/drakwizard_squid.xml:168
+msgid ""
+"Choose if the proxy server should be started during the boot time, then "
+"click <guibutton>Next</guibutton>."
+msgstr ""
+"Укажите, следует ли запускать прокси при загрузке операционной системы, и "
+"нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakwizard-proxy-step10.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -4234,13 +6765,22 @@ msgstr "drakwizard_sshd.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakwizard_sshd.xml:13
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakwizard sshd</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakwizard sshd</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard sshd</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakwizard sshd</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/drakwizard_sshd.xml:13
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up an <acronym>SSH</acronym> daemon."
-msgstr "Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам в настройке сервера <acronym>SSH</acronym>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up an "
+"<acronym>SSH</acronym> daemon."
+msgstr ""
+"Эта утилита <placeholder type=\"footnote\" id=\"0\"/> может помочь вам в "
+"настройке сервера <acronym>SSH</acronym>."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_sshd.xml:16
@@ -4249,13 +6789,28 @@ msgstr "Что такое <acronym>SSH</acronym>?"
 
 #. type: Content of: <section><section><para>
 #: en/drakwizard_sshd.xml:18
-msgid "Secure Shell (SSH) is a cryptographic network protocol for secure data communication, remote command-line login, remote command execution, and other secure network services between two networked computers that connects, via a secure channel over an insecure network, a server and a client (running SSH server and <acronym>SSH</acronym> client programs, respectively). (From Wikipedia)"
-msgstr "Безопасная оболочка (Secure Shell или SSH) - криптографический протокол обмена данными в сети, предназначенный для защиты обмена данными от постороннего вмешательства, удалённого управления системой с помощью командной строки, удалённого выполнения команд и управления другими сетевыми службами. При использовании этого протокола два соединённых сетью компьютера используют защищённый канал обмена данными в незащищённой сети. Эти компьютеры называются сервер и клиент, на них запущены серверные и клиентские программы <acronym>SSH</acronym>, соответственно (из Википедии)."
+msgid ""
+"Secure Shell (SSH) is a cryptographic network protocol for secure data "
+"communication, remote command-line login, remote command execution, and "
+"other secure network services between two networked computers that connects, "
+"via a secure channel over an insecure network, a server and a client "
+"(running SSH server and <acronym>SSH</acronym> client programs, "
+"respectively). (From Wikipedia)"
+msgstr ""
+"Безопасная оболочка (Secure Shell или SSH) - криптографический протокол "
+"обмена данными в сети, предназначенный для защиты обмена данными от "
+"постороннего вмешательства, удалённого управления системой с помощью "
+"командной строки, удалённого выполнения команд и управления другими сетевыми "
+"службами. При использовании этого протокола два соединённых сетью компьютера "
+"используют защищённый канал обмена данными в незащищённой сети. Эти "
+"компьютеры называются сервер и клиент, на них запущены серверные и "
+"клиентские программы <acronym>SSH</acronym>, соответственно (из Википедии)."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_sshd.xml:22
 msgid "Setting up an <acronym>SSH</acronym> daemon with drakwizard sshd"
-msgstr "Настройка фоновой службы <acronym>SSH</acronym> с помощью drakwizard sshd"
+msgstr ""
+"Настройка фоновой службы <acronym>SSH</acronym> с помощью drakwizard sshd"
 
 #. type: Content of: <section><section><para>
 #: en/drakwizard_sshd.xml:24
@@ -4274,8 +6829,13 @@ msgstr "drakwizard-sshd-step1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:35
-msgid "Choose <guilabel>Expert</guilabel> for all options or <guilabel>Newbie</guilabel> to skip steps 3-7, click <guibutton>Next</guibutton>."
-msgstr "Выберите <guilabel>Эксперт</guilabel> для получения доступа ко всем настройкам или <guilabel>Начинающий</guilabel>, чтобы пропустить шаги 3-7, нажмите кнопку <guibutton>Далее</guibutton>."
+msgid ""
+"Choose <guilabel>Expert</guilabel> for all options or <guilabel>Newbie</"
+"guilabel> to skip steps 3-7, click <guibutton>Next</guibutton>."
+msgstr ""
+"Выберите <guilabel>Эксперт</guilabel> для получения доступа ко всем "
+"настройкам или <guilabel>Начинающий</guilabel>, чтобы пропустить шаги 3-7, "
+"нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:39
@@ -4289,8 +6849,12 @@ msgstr "drakwizard-sshd-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:46
-msgid "Sets visibility and root access options. Port 22 is the standard <acronym>SSH</acronym> port."
-msgstr "Настройте видимость службы и параметры административного доступа. Стандартным портом для <acronym>SSH</acronym> является порт 22."
+msgid ""
+"Sets visibility and root access options. Port 22 is the standard "
+"<acronym>SSH</acronym> port."
+msgstr ""
+"Настройте видимость службы и параметры административного доступа. "
+"Стандартным портом для <acronym>SSH</acronym> является порт 22."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:50
@@ -4304,8 +6868,12 @@ msgstr "drakwizard-sshd-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:57
-msgid "Allow a variety of authentication methods users can use while connecting, then click <guibutton>Next</guibutton>."
-msgstr "Укажите один из способов распознавания при подключении и нажмите кнопку <guibutton>Далее</guibutton>."
+msgid ""
+"Allow a variety of authentication methods users can use while connecting, "
+"then click <guibutton>Next</guibutton>."
+msgstr ""
+"Укажите один из способов распознавания при подключении и нажмите кнопку "
+"<guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:61
@@ -4319,8 +6887,12 @@ msgstr "drakwizard-sshd-step4.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:68
-msgid "Choose logging facility and level of output, then click <guibutton>Next</guibutton>."
-msgstr "Выберите нужные вам возможности по ведению журнала и уровень детализации сообщений, затем нажмите кнопку <guibutton>Далее</guibutton>."
+msgid ""
+"Choose logging facility and level of output, then click <guibutton>Next</"
+"guibutton>."
+msgstr ""
+"Выберите нужные вам возможности по ведению журнала и уровень детализации "
+"сообщений, затем нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:72
@@ -4335,7 +6907,9 @@ msgstr "drakwizard-sshd-step5.png"
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:79
 msgid "Configure per-login settings, then click <guibutton>Next</guibutton>."
-msgstr "Настройте отдельные параметры входа для учётных записей и нажмите кнопку <guibutton>Далее</guibutton>."
+msgstr ""
+"Настройте отдельные параметры входа для учётных записей и нажмите кнопку "
+"<guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:83
@@ -4349,8 +6923,11 @@ msgstr "drakwizard-sshd-step6.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:90
-msgid "Configure the user access settings, then click <guibutton>Next</guibutton>."
-msgstr "Настройте параметры доступа пользователей, затем нажмите кнопку <guibutton>Далее</guibutton>."
+msgid ""
+"Configure the user access settings, then click <guibutton>Next</guibutton>."
+msgstr ""
+"Настройте параметры доступа пользователей, затем нажмите кнопку "
+"<guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:94
@@ -4364,8 +6941,12 @@ msgstr "drakwizard-sshd-step7.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:101
-msgid "Configure X11 forwarding and compression during transfer, then click <guibutton>Next</guibutton>."
-msgstr "Выберите параметры перенаправления графического сервера и сжатия при передаче, затем нажмите кнопку <guibutton>Далее</guibutton>."
+msgid ""
+"Configure X11 forwarding and compression during transfer, then click "
+"<guibutton>Next</guibutton>."
+msgstr ""
+"Выберите параметры перенаправления графического сервера и сжатия при "
+"передаче, затем нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:108
@@ -4394,8 +6975,13 @@ msgstr "drakxservices.png"
 
 #. type: Content of: <section><para>
 #: en/drakxservices.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">drakxservices</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">drakxservices</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakxservices</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakxservices</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><info><title>
 #: en/harddrake2.xml:10
@@ -4414,13 +7000,27 @@ msgstr "harddrake2.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/harddrake2.xml:23
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">harddrake2</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">harddrake2</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">harddrake2</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">harddrake2</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/harddrake2.xml:22
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> gives a general view of the hardware of your computer. When the tool is launched, it executes a job to look for every element of the hardware. For that, it uses the command <code>ldetect </code>which refers to a list of hardware in <code>ldetect-lst</code> package."
-msgstr "С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы сможете осуществить общий обзор оборудования вашего компьютера. После запуска программа выполняет автоматический поиск всех компонентов оборудования. С этой целью она использует программу <code>ldetect</code>, которая в своей работе использует список оборудования из пакета <code>ldetect-lst</code>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> gives a general view of "
+"the hardware of your computer. When the tool is launched, it executes a job "
+"to look for every element of the hardware. For that, it uses the command "
+"<code>ldetect </code>which refers to a list of hardware in <code>ldetect-"
+"lst</code> package."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> вы сможете "
+"осуществить общий обзор оборудования вашего компьютера. После запуска "
+"программа выполняет автоматический поиск всех компонентов оборудования. С "
+"этой целью она использует программу <code>ldetect</code>, которая в своей "
+"работе использует список оборудования из пакета <code>ldetect-lst</code>."
 
 #. type: Content of: <section><section><title>
 #: en/harddrake2.xml:31
@@ -4434,33 +7034,65 @@ msgstr "Окно разделено на две колонки."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:35
-msgid "The left column contains a list of the detected hardware. The devices are grouped by categories. Click on the &gt; to expand the content of a category. Each device can be selected in this column."
-msgstr "В левом столбце отображается список обнаруженного оборудования. Устройства группируются по категориям. Нажмите кнопку >, чтобы развернуть список категории. С помощью этого столбца можно выбрать устройство из списка."
+msgid ""
+"The left column contains a list of the detected hardware. The devices are "
+"grouped by categories. Click on the &gt; to expand the content of a "
+"category. Each device can be selected in this column."
+msgstr ""
+"В левом столбце отображается список обнаруженного оборудования. Устройства "
+"группируются по категориям. Нажмите кнопку >, чтобы развернуть список "
+"категории. С помощью этого столбца можно выбрать устройство из списка."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:39
-msgid "The right column displays information about the selected device.  The <guimenu>Help -&gt; Fields description</guimenu> gives some information about the content of the fields."
-msgstr "В правом столбце будут показаны данные выбранного устройства. С помощью пункта меню <guimenu>Справка -> Описание полей</guimenu> можно получить более подробное описание отображаемых полей."
+msgid ""
+"The right column displays information about the selected device.  The "
+"<guimenu>Help -&gt; Fields description</guimenu> gives some information "
+"about the content of the fields."
+msgstr ""
+"В правом столбце будут показаны данные выбранного устройства. С помощью "
+"пункта меню <guimenu>Справка -> Описание полей</guimenu> можно получить "
+"более подробное описание отображаемых полей."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:43
-msgid "According to which type of device is selected, either one or two buttons are available at the bottom of the right column:"
-msgstr "Согласно выбранного типа устройства, в нижней части правой панели окна будет показано одна или две кнопки:"
+msgid ""
+"According to which type of device is selected, either one or two buttons are "
+"available at the bottom of the right column:"
+msgstr ""
+"Согласно выбранного типа устройства, в нижней части правой панели окна будет "
+"показано одна или две кнопки:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/harddrake2.xml:48
-msgid "<guibutton>Set current driver options</guibutton>: this can be used to parameterize the module which is used in relation to the device. This must used by experts only."
-msgstr "<guibutton>Установить параметры текущего драйвера</guibutton>: с помощью этой кнопки можно изменить параметры работы модуля системы, связанного с работой устройства. Этой кнопкой следует пользоваться только опытным пользователям."
+msgid ""
+"<guibutton>Set current driver options</guibutton>: this can be used to "
+"parameterize the module which is used in relation to the device. This must "
+"used by experts only."
+msgstr ""
+"<guibutton>Установить параметры текущего драйвера</guibutton>: с помощью "
+"этой кнопки можно изменить параметры работы модуля системы, связанного с "
+"работой устройства. Этой кнопкой следует пользоваться только опытным "
+"пользователям."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/harddrake2.xml:54
-msgid "<guibutton>Run config tool</guibutton>: access to the tool which can configure the device. The tool can often be accessed directly from the MCC."
-msgstr "<guibutton>Запустить инструмент настройки</guibutton>: получить доступ к средству настройки устройства. Обычно, доступ к этому инструменту можно получить непосредственно из Центра управления Mageia."
+msgid ""
+"<guibutton>Run config tool</guibutton>: access to the tool which can "
+"configure the device. The tool can often be accessed directly from the MCC."
+msgstr ""
+"<guibutton>Запустить инструмент настройки</guibutton>: получить доступ к "
+"средству настройки устройства. Обычно, доступ к этому инструменту можно "
+"получить непосредственно из Центра управления Mageia."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:68
-msgid "The <guimenu>options</guimenu> menu gives the opportunity to check boxes to enable automatic detection:"
-msgstr "С помощью пунктов меню <guimenu>Параметры</guimenu> вы можете включить автоматическое обнаружение некоторых типов устройств:"
+msgid ""
+"The <guimenu>options</guimenu> menu gives the opportunity to check boxes to "
+"enable automatic detection:"
+msgstr ""
+"С помощью пунктов меню <guimenu>Параметры</guimenu> вы можете включить "
+"автоматическое обнаружение некоторых типов устройств:"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/harddrake2.xml:73
@@ -4479,8 +7111,15 @@ msgstr "Zip параллельные устройства"
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:83
-msgid "By default these detections are not enabled, because they are slow. Check the appropriate box(es) if you have this hardware connected. Detection will be operational the next time this tool is started."
-msgstr "По умолчанию такое обнаружение не выполняется, поскольку оно является достаточно длительным. Отметьте соответствующие пункты, если на вашем компьютере установлено соответствующее оборудование. Обнаружение будет выполнено при следующем запуске этой утилиты."
+msgid ""
+"By default these detections are not enabled, because they are slow. Check "
+"the appropriate box(es) if you have this hardware connected. Detection will "
+"be operational the next time this tool is started."
+msgstr ""
+"По умолчанию такое обнаружение не выполняется, поскольку оно является "
+"достаточно длительным. Отметьте соответствующие пункты, если на вашем "
+"компьютере установлено соответствующее оборудование. Обнаружение будет "
+"выполнено при следующем запуске этой утилиты."
 
 #. type: Content of: <section><info><title>
 #: en/keyboarddrake.xml:3
@@ -4499,13 +7138,28 @@ msgstr "keyboarddrake.png"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/keyboarddrake.xml:20
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">keyboarddrake</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">keyboarddrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">keyboarddrake</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">keyboarddrake</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><section><para>
 #: en/keyboarddrake.xml:19
-msgid "The keyboarddrake tool<placeholder type=\"footnote\" id=\"0\"/> helps you configure the basic layout for the keyboard that you wish to use on Mageia. It affects the keyboard layout for all users on the system. It can be found in the Hardware section of the Mageia Control Center (MCC) labelled \"Configure mouse and keyboard\"."
-msgstr "Программа keyboarddrake<placeholder type=\"footnote\" id=\"0\"/> поможет вам настроить базовую раскладку вашей клавиатуры в операционной системе Mageia. Результаты настройки будут использованы для всех пользователей системы. Доступ к программе можно получить с помощью пункта «Оборудование» из Центра управления Mageia, в разделе: «Настроить мышь и клавиатуру»."
+msgid ""
+"The keyboarddrake tool<placeholder type=\"footnote\" id=\"0\"/> helps you "
+"configure the basic layout for the keyboard that you wish to use on Mageia. "
+"It affects the keyboard layout for all users on the system. It can be found "
+"in the Hardware section of the Mageia Control Center (MCC) labelled "
+"\"Configure mouse and keyboard\"."
+msgstr ""
+"Программа keyboarddrake<placeholder type=\"footnote\" id=\"0\"/> поможет вам "
+"настроить базовую раскладку вашей клавиатуры в операционной системе Mageia. "
+"Результаты настройки будут использованы для всех пользователей системы. "
+"Доступ к программе можно получить с помощью пункта «Оборудование» из Центра "
+"управления Mageia, в разделе: «Настроить мышь и клавиатуру»."
 
 #. type: Content of: <section><section><title>
 #: en/keyboarddrake.xml:29
@@ -4514,8 +7168,14 @@ msgstr "Раскладка клавиатуры"
 
 #. type: Content of: <section><section><para>
 #: en/keyboarddrake.xml:31
-msgid "Here you can select which keyboard layout you wish to use. The names (listed in alphabetical order) describe the language, country, and/or ethnicity each layout should be used for."
-msgstr "С помощью этого окна вы можете выбрать раскладку клавиатуры, которую следует использовать. В названиях раскладок указаны по алфавиту язык, страна и этническая принадлежность раскладки."
+msgid ""
+"Here you can select which keyboard layout you wish to use. The names (listed "
+"in alphabetical order) describe the language, country, and/or ethnicity each "
+"layout should be used for."
+msgstr ""
+"С помощью этого окна вы можете выбрать раскладку клавиатуры, которую следует "
+"использовать. В названиях раскладок указаны по алфавиту язык, страна и "
+"этническая принадлежность раскладки."
 
 #. type: Content of: <section><section><title>
 #: en/keyboarddrake.xml:37
@@ -4524,8 +7184,13 @@ msgstr "Тип клавиатуры"
 
 #. type: Content of: <section><section><para>
 #: en/keyboarddrake.xml:39
-msgid "This menu lets you select the type of keyboard you are using. If you are unsure of which to choose, it is best to leave it as the default type."
-msgstr "С помощью этого меню вы можете указать тип клавиатуры, которой пользуетесь. Если вы не уверены относительно своего выбора, лучше не менять вариант по умолчанию."
+msgid ""
+"This menu lets you select the type of keyboard you are using. If you are "
+"unsure of which to choose, it is best to leave it as the default type."
+msgstr ""
+"С помощью этого меню вы можете указать тип клавиатуры, которой пользуетесь. "
+"Если вы не уверены относительно своего выбора, лучше не менять вариант по "
+"умолчанию."
 
 #. type: Content of: <section><info><title>
 #: en/localedrake.xml:10
@@ -4544,28 +7209,55 @@ msgstr "localedrake.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/localedrake.xml:24
-msgid "You can also start this tool from the command line, by typing <emphasis role=\"bold\">localedrake</emphasis> as root."
-msgstr "Запустить эту программу можно также с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">localedrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can also start this tool from the command line, by typing <emphasis role="
+"\"bold\">localedrake</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно также с помощью терминала: достаточно ввести "
+"команду <emphasis role=\"bold\">localedrake</emphasis> от имени "
+"администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/localedrake.xml:24
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> can be found in the System section of the Mageia Control Center (MCC) labelled \"Manage localization for your system\". It opens with a window in which you can choose your language. The choice is adapted to languages selected during installation."
-msgstr "Этим модулем<placeholder type=\"footnote\" id=\"0\"/> можно воспользоваться с помощью пункта «Система» из Центра управления Mageia, в разделе «Настройка локализации системы». В случае его выбора будет открыто окно, с помощью которого вы можете выбрать язык. По умолчанию будет подобран список языков, которые были выбраны во время установки системы."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can be found in the "
+"System section of the Mageia Control Center (MCC) labelled \"Manage "
+"localization for your system\". It opens with a window in which you can "
+"choose your language. The choice is adapted to languages selected during "
+"installation."
+msgstr ""
+"Этим модулем<placeholder type=\"footnote\" id=\"0\"/> можно воспользоваться "
+"с помощью пункта «Система» из Центра управления Mageia, в разделе «Настройка "
+"локализации системы». В случае его выбора будет открыто окно, с помощью "
+"которого вы можете выбрать язык. По умолчанию будет подобран список языков, "
+"которые были выбраны во время установки системы."
 
 #. type: Content of: <section><para>
 #: en/localedrake.xml:31
-msgid "The <guibutton>Advanced</guibutton> button give access to activate compatibility with old encoding (non UTF8)."
-msgstr "С помощью кнопки <guibutton>Дополнительно</guibutton> можно задействовать режим совместимости с устаревшими кодировками (не UTF-8)."
+msgid ""
+"The <guibutton>Advanced</guibutton> button give access to activate "
+"compatibility with old encoding (non UTF8)."
+msgstr ""
+"С помощью кнопки <guibutton>Дополнительно</guibutton> можно задействовать "
+"режим совместимости с устаревшими кодировками (не UTF-8)."
 
 #. type: Content of: <section><para>
 #: en/localedrake.xml:34
-msgid "The second window shows a list of countries according to the selected language. The button <guibutton>Other Countries</guibutton> gives access to countries not listed."
-msgstr "Во втором окне будет показан список стран, в которых может использоваться указанный язык. Доступ к спискам стран, которых нет в списке, можно получить с помощью кнопки <guibutton>Другие страны</guibutton>."
+msgid ""
+"The second window shows a list of countries according to the selected "
+"language. The button <guibutton>Other Countries</guibutton> gives access to "
+"countries not listed."
+msgstr ""
+"Во втором окне будет показан список стран, в которых может использоваться "
+"указанный язык. Доступ к спискам стран, которых нет в списке, можно получить "
+"с помощью кнопки <guibutton>Другие страны</guibutton>."
 
 #. type: Content of: <section><para>
 #: en/localedrake.xml:38
 msgid "You have to restart your session after any modifications."
-msgstr "Чтобы внесённые вами изменения вступили в силу, вам следует выйти из вашей учётной записи в системе и снова войти в неё."
+msgstr ""
+"Чтобы внесённые вами изменения вступили в силу, вам следует выйти из вашей "
+"учётной записи в системе и снова войти в неё."
 
 #. type: Content of: <section><section><info><title>
 #: en/localedrake.xml:42
@@ -4574,18 +7266,37 @@ msgstr "Метод ввода"
 
 #. type: Content of: <section><section><para>
 #: en/localedrake.xml:44
-msgid "In the <guilabel>Other Countries</guilabel> screen you can also select an input method (from the drop-down menu at the bottom of the list). Input methods allow users to input multilingual characters (Chinese, Japanese, Korean, etc)."
-msgstr "С помощью пункта <guilabel>Другие страны</guilabel> вы также можете выбрать метод ввода (в раскрывающемся меню под списком). С помощью способов ввода можно вводить символы языков, в которых запись осуществляется не с помощью букв (китайской, японской, корейской и т.д.)."
+msgid ""
+"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"input method (from the drop-down menu at the bottom of the list). Input "
+"methods allow users to input multilingual characters (Chinese, Japanese, "
+"Korean, etc)."
+msgstr ""
+"С помощью пункта <guilabel>Другие страны</guilabel> вы также можете выбрать "
+"метод ввода (в раскрывающемся меню под списком). С помощью способов ввода "
+"можно вводить символы языков, в которых запись осуществляется не с помощью "
+"букв (китайской, японской, корейской и т.д.)."
 
 #. type: Content of: <section><section><para>
 #: en/localedrake.xml:48
-msgid "For Asian and African locales, IBus will be set as default input method so users should not need to configure it manually."
-msgstr "Для азиатских и африканских языков способом ввода по умолчанию будет выбран IBus, следовательно, потребности в настройке этого способа ввода вручную нет."
+msgid ""
+"For Asian and African locales, IBus will be set as default input method so "
+"users should not need to configure it manually."
+msgstr ""
+"Для азиатских и африканских языков способом ввода по умолчанию будет выбран "
+"IBus, следовательно, потребности в настройке этого способа ввода вручную нет."
 
 #. type: Content of: <section><section><para>
 #: en/localedrake.xml:50
-msgid "Other input methods (SCIM, GCIN, HIME, etc.) also provide similar functions and can, if not available from the drop-down menu, be installed in another part of the Mageia Control Center. See <xref linkend=\"rpmdrake\"></xref>."
-msgstr "Другие способы ввода (SCIM, GCIN, HIME и т.п.) также предоставляют подобные функциональные возможности. Установить пакеты этих способов, если их нет в контекстном меню, можно с помощью другого модуля из Центра управления Mageia. См. <xref linkend=\"rpmdrake\"></xref>."
+msgid ""
+"Other input methods (SCIM, GCIN, HIME, etc.) also provide similar functions "
+"and can, if not available from the drop-down menu, be installed in another "
+"part of the Mageia Control Center. See <xref linkend=\"rpmdrake\"></xref>."
+msgstr ""
+"Другие способы ввода (SCIM, GCIN, HIME и т.п.) также предоставляют подобные "
+"функциональные возможности. Установить пакеты этих способов, если их нет в "
+"контекстном меню, можно с помощью другого модуля из Центра управления "
+"Mageia. См. <xref linkend=\"rpmdrake\"></xref>."
 
 #. type: Content of: <section><info><title>
 #: en/logdrake.xml:3
@@ -4604,13 +7315,23 @@ msgstr "logdrake.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/logdrake.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">logdrake</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">logdrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">logdrake</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">logdrake</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/logdrake.xml:14
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia Control Center System tab, labelled \"<guilabel>View and search system logs</guilabel>\"."
-msgstr "Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно получить с помощью пункта «Система» из Центра управления Mageia, раздел <guilabel>Просмотр системных журналов</guilabel>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
+"Control Center System tab, labelled \"<guilabel>View and search system logs</"
+"guilabel>\"."
+msgstr ""
+"Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить с помощью пункта «Система» из Центра управления Mageia, раздел "
+"<guilabel>Просмотр системных журналов</guilabel>."
 
 #. type: Content of: <section><section><title>
 #: en/logdrake.xml:22
@@ -4619,13 +7340,45 @@ msgstr "Поиск в журналах"
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:24
-msgid "First, enter the key string you want to look for in the <emphasis role=\"bold\">Matching</emphasis> field and/or the key string you want to <emphasis>do not</emphasis> wish to see amongst the answers in the field <emphasis role=\"bold\">but not matching</emphasis>. Then select the file(s)  to search in the <guilabel>Choose file</guilabel> field. Optionally, it is possible to limit the search to only one day. Select it in the <emphasis role=\"bold\">Calendar</emphasis>, using the little arrows on each side of the month and year, and check \"<guibutton>Show only for the selected day</guibutton>\". At last, click on the <guibutton>search</guibutton> button to see the results in the window called <guilabel>Content of the file</guilabel>. It is possible to save the results in the .txt format by clicking on the <emphasis role=\"bold\">Save</emphasis> button."
-msgstr "Сначала вам следует указать строку поиска в поле <emphasis role=\"bold\">Совпадает с</emphasis> и/или строку, <emphasis>которой не должно быть в результатах</emphasis> в поле <emphasis role=\"bold\">Не совпадает</emphasis>. После этого выберите файл(ы), в которых будет выполняться поиск, в поле <guilabel>Выбор файла</guilabel>. Вы также можете ограничить поиск определённым днём. Выберите его на панели <emphasis role=\"bold\">Календарь</emphasis> с помощью нажатия маленьких стрелочек с каждой стороны от полей месяца и года, после чего отметьте пункт <guibutton>Показывать только для выбранного дня</guibutton>. Наконец, нажмите кнопку <guibutton>поиск</guibutton>, чтобы просмотреть результаты в окне с названием <guilabel>Содержимое файла</guilabel>. Предусмотрена возможность сохранить результаты в файле формата txt, - для этого следует нажать кнопку <emphasis role=\"bold\">Сохранить</emphasis>."
+msgid ""
+"First, enter the key string you want to look for in the <emphasis role=\"bold"
+"\">Matching</emphasis> field and/or the key string you want to <emphasis>do "
+"not</emphasis> wish to see amongst the answers in the field <emphasis role="
+"\"bold\">but not matching</emphasis>. Then select the file(s)  to search in "
+"the <guilabel>Choose file</guilabel> field. Optionally, it is possible to "
+"limit the search to only one day. Select it in the <emphasis role=\"bold"
+"\">Calendar</emphasis>, using the little arrows on each side of the month "
+"and year, and check \"<guibutton>Show only for the selected day</guibutton>"
+"\". At last, click on the <guibutton>search</guibutton> button to see the "
+"results in the window called <guilabel>Content of the file</guilabel>. It is "
+"possible to save the results in the .txt format by clicking on the <emphasis "
+"role=\"bold\">Save</emphasis> button."
+msgstr ""
+"Сначала вам следует указать строку поиска в поле <emphasis role=\"bold"
+"\">Совпадает с</emphasis> и/или строку, <emphasis>которой не должно быть в "
+"результатах</emphasis> в поле <emphasis role=\"bold\">Не совпадает</"
+"emphasis>. После этого выберите файл(ы), в которых будет выполняться поиск, "
+"в поле <guilabel>Выбор файла</guilabel>. Вы также можете ограничить поиск "
+"определённым днём. Выберите его на панели <emphasis role=\"bold\">Календарь</"
+"emphasis> с помощью нажатия маленьких стрелочек с каждой стороны от полей "
+"месяца и года, после чего отметьте пункт <guibutton>Показывать только для "
+"выбранного дня</guibutton>. Наконец, нажмите кнопку <guibutton>поиск</"
+"guibutton>, чтобы просмотреть результаты в окне с названием "
+"<guilabel>Содержимое файла</guilabel>. Предусмотрена возможность сохранить "
+"результаты в файле формата txt, - для этого следует нажать кнопку <emphasis "
+"role=\"bold\">Сохранить</emphasis>."
 
 #. type: Content of: <section><section><note><para>
 #: en/logdrake.xml:36
-msgid "The <guibutton>Mageia Tools Logs</guibutton> houses the logs from the Mageia configuration tools such as the Mageia Control Center tools.  These logs are updated each time a configuration is modified."
-msgstr "В <guibutton>Журнале инструментов Mageia</guibutton> содержатся данные, записанные в журнал средствами настройки Mageia, в частности инструментами из Центра управления Mageia. Эти журналы обновляются каждый раз, когда вы меняете какие-либо настройки."
+msgid ""
+"The <guibutton>Mageia Tools Logs</guibutton> houses the logs from the Mageia "
+"configuration tools such as the Mageia Control Center tools.  These logs are "
+"updated each time a configuration is modified."
+msgstr ""
+"В <guibutton>Журнале инструментов Mageia</guibutton> содержатся данные, "
+"записанные в журнал средствами настройки Mageia, в частности инструментами "
+"из Центра управления Mageia. Эти журналы обновляются каждый раз, когда вы "
+"меняете какие-либо настройки."
 
 #. type: Content of: <section><section><title>
 #: en/logdrake.xml:43
@@ -4634,13 +7387,30 @@ msgstr "Настройка оповещения по электронной по
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:45
-msgid "<guibutton>Mail alert</guibutton> automatically checks the system load and the services every hour and if necessary sends an e-mail to the configured address."
-msgstr "С помощью кнопки <guibutton>Почтовое напоминание</guibutton> можно приказать системе выполнять проверку нагрузки на систему и службы каждый час, и если это нужно, отправлять сообщения по электронной почте на указанный адрес."
+msgid ""
+"<guibutton>Mail alert</guibutton> automatically checks the system load and "
+"the services every hour and if necessary sends an e-mail to the configured "
+"address."
+msgstr ""
+"С помощью кнопки <guibutton>Почтовое напоминание</guibutton> можно приказать "
+"системе выполнять проверку нагрузки на систему и службы каждый час, и если "
+"это нужно, отправлять сообщения по электронной почте на указанный адрес."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:49
-msgid "To configure this tool, click on the <emphasis role=\"bold\">Mail Alert</emphasis> button and then, in the next screen, on the<guibutton> Configure the mail alert system</guibutton> drop down button. Here, all the running services are displayed and you can choose which ones you want to look watch. (See screenshot above)."
-msgstr "Чтобы выполнить настройки этой утилиты, нажмите кнопку <emphasis role=\"bold\">Почтовое напоминание</emphasis> и выберите в следующем окне, которое будет показано, вариант <guibutton>Настроить систему почтового напоминания</guibutton>. В окне, которое будет показано после нажатия кнопки <guibutton>Далее</guibutton>, вы сможете указать службы, за которыми следует вести наблюдение (см. приведенный выше снимок экрана)."
+msgid ""
+"To configure this tool, click on the <emphasis role=\"bold\">Mail Alert</"
+"emphasis> button and then, in the next screen, on the<guibutton> Configure "
+"the mail alert system</guibutton> drop down button. Here, all the running "
+"services are displayed and you can choose which ones you want to look watch. "
+"(See screenshot above)."
+msgstr ""
+"Чтобы выполнить настройки этой утилиты, нажмите кнопку <emphasis role=\"bold"
+"\">Почтовое напоминание</emphasis> и выберите в следующем окне, которое "
+"будет показано, вариант <guibutton>Настроить систему почтового напоминания</"
+"guibutton>. В окне, которое будет показано после нажатия кнопки "
+"<guibutton>Далее</guibutton>, вы сможете указать службы, за которыми следует "
+"вести наблюдение (см. приведенный выше снимок экрана)."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:55
@@ -4694,13 +7464,32 @@ msgstr "logdrake1.png"
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:97
-msgid "In the next screen, select the <guilabel>Load</guilabel> value you consider unacceptable. The load represents the demand to a process, a high load slows the system down and a very high load may indicate that a process has gone out of control. The default value is 3. We recommend setting the load value to 3 times the number of processors."
-msgstr "На следующей странице выберите значение <guilabel>Нагрузка</guilabel>, превышение которой вы считаете неприемлемым. Нагрузка определяется как уровень требовательности процесса к ресурсам компьютера, большая нагрузка замедляет работу остальной системы, а очень высокая нагрузка может свидетельствовать о том, что процесс вышел из-под контроля. По умолчанию используется значение 3. Мы рекомендуем определить значение предельной нагрузки как количество процессов, умноженное на 3."
+msgid ""
+"In the next screen, select the <guilabel>Load</guilabel> value you consider "
+"unacceptable. The load represents the demand to a process, a high load slows "
+"the system down and a very high load may indicate that a process has gone "
+"out of control. The default value is 3. We recommend setting the load value "
+"to 3 times the number of processors."
+msgstr ""
+"На следующей странице выберите значение <guilabel>Нагрузка</guilabel>, "
+"превышение которой вы считаете неприемлемым. Нагрузка определяется как "
+"уровень требовательности процесса к ресурсам компьютера, большая нагрузка "
+"замедляет работу остальной системы, а очень высокая нагрузка может "
+"свидетельствовать о том, что процесс вышел из-под контроля. По умолчанию "
+"используется значение 3. Мы рекомендуем определить значение предельной "
+"нагрузки как количество процессов, умноженное на 3."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:103
-msgid "In the last screen, enter the <guilabel>Email address</guilabel> of the person to be warned and the <guilabel>Email server</guilabel> to use (local or on the Internet)."
-msgstr "С помощью последней страницы введите <guilabel>Адрес электронной почты</guilabel> лица, которое следует предупредить и <guilabel>Сервер электронной почты</guilabel>, которым следует воспользоваться (локальный или интернет-сервер)."
+msgid ""
+"In the last screen, enter the <guilabel>Email address</guilabel> of the "
+"person to be warned and the <guilabel>Email server</guilabel> to use (local "
+"or on the Internet)."
+msgstr ""
+"С помощью последней страницы введите <guilabel>Адрес электронной почты</"
+"guilabel> лица, которое следует предупредить и <guilabel>Сервер электронной "
+"почты</guilabel>, которым следует воспользоваться (локальный или интернет-"
+"сервер)."
 
 #. type: Content of: <section><info><title>
 #: en/lsnetdrake.xml:10
@@ -4714,18 +7503,34 @@ msgstr "lsnetdrake"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/lsnetdrake.xml:16
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">lsnetdrake</emphasis>."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">lsnetdrake</emphasis>."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">lsnetdrake</emphasis>."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">lsnetdrake</emphasis>."
 
 #. type: Content of: <section><para>
 #: en/lsnetdrake.xml:14
-msgid "This tool <placeholder type=\"footnote\" id=\"0\"/> can only be started and used on the command line."
-msgstr "Эту программу <placeholder type=\"footnote\" id=\"0\"/> можно запустить только из командной строки."
+msgid ""
+"This tool <placeholder type=\"footnote\" id=\"0\"/> can only be started and "
+"used on the command line."
+msgstr ""
+"Эту программу <placeholder type=\"footnote\" id=\"0\"/> можно запустить "
+"только из командной строки."
 
 #. type: Content of: <section><para>
 #: en/lsnetdrake.xml:21
-msgid "This page hasn't been written yet for lack of resources. If you think you can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the Documentation team.</link> Thanking you in advance."
-msgstr "Эта страница еще не написана из-за нехватки ресурсов у команды. Если вы считаете, что можете написать эту справочную страницу, пожалуйста, свяжитесь с <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">командой по документированию</link>. Заранее благодарны вам за помощь."
+msgid ""
+"This page hasn't been written yet for lack of resources. If you think you "
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Documentation team.</link> Thanking you in "
+"advance."
+msgstr ""
+"Эта страница еще не написана из-за нехватки ресурсов у команды. Если вы "
+"считаете, что можете написать эту справочную страницу, пожалуйста, свяжитесь "
+"с <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">командой "
+"по документированию</link>. Заранее благодарны вам за помощь."
 
 #. type: Content of: <section><info><title>
 #: en/lspcidrake.xml:3
@@ -4739,18 +7544,34 @@ msgstr "lspcidrake"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/lspcidrake.xml:10
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">lspcidrake</emphasis>."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">lspcidrake</emphasis>."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">lspcidrake</emphasis>."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">lspcidrake</emphasis>."
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:9
-msgid "This tool <placeholder type=\"footnote\" id=\"0\"/> can only be started and used on the command line. It will give some more information if used under root."
-msgstr "Эту программу <placeholder type=\"footnote\" id=\"0\"/> можно запустить только из командной строки. Она выводит определённое описание оборудования в системе, если ее запускать от имени администратора (root)."
+msgid ""
+"This tool <placeholder type=\"footnote\" id=\"0\"/> can only be started and "
+"used on the command line. It will give some more information if used under "
+"root."
+msgstr ""
+"Эту программу <placeholder type=\"footnote\" id=\"0\"/> можно запустить "
+"только из командной строки. Она выводит определённое описание оборудования в "
+"системе, если ее запускать от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:14
-msgid "lspcidrake gives the list of all the connected devices to the computer (USB, PCI and PCMCIA) and the used drivers. It needs the ldetect and ldetect-lst packages to work."
-msgstr "lspcidrake выводит список всех соединённых с компьютером устройств (USB, PCI и PCMCIA) и задействованных драйверов. Для работы программы требуются пакеты ldetect и ldetect-lst."
+msgid ""
+"lspcidrake gives the list of all the connected devices to the computer (USB, "
+"PCI and PCMCIA) and the used drivers. It needs the ldetect and ldetect-lst "
+"packages to work."
+msgstr ""
+"lspcidrake выводит список всех соединённых с компьютером устройств (USB, PCI "
+"и PCMCIA) и задействованных драйверов. Для работы программы требуются пакеты "
+"ldetect и ldetect-lst."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/lspcidrake.xml:20
@@ -4759,13 +7580,20 @@ msgstr "lspcidrake1.png"
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:24
-msgid "With the -v option, lspcidrake adds the vendor and device identifications."
-msgstr "Если добавить параметр «-v», lspcidrake покажет данные относительно производителя и идентификации устройства."
+msgid ""
+"With the -v option, lspcidrake adds the vendor and device identifications."
+msgstr ""
+"Если добавить параметр «-v», lspcidrake покажет данные относительно "
+"производителя и идентификации устройства."
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:27
-msgid "lspcidrake often generates very long lists, so, to find an information, it is often used in a pipeline with the grep command, like in these examples:"
-msgstr "Часто список, выведенный lspcidrake, довольно длинный, поэтому для его фильтрации приходится использовать программу grep. Примеры:"
+msgid ""
+"lspcidrake often generates very long lists, so, to find an information, it "
+"is often used in a pipeline with the grep command, like in these examples:"
+msgstr ""
+"Часто список, выведенный lspcidrake, довольно длинный, поэтому для его "
+"фильтрации приходится использовать программу grep. Примеры:"
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:31
@@ -4794,8 +7622,12 @@ msgstr "Параметр -i предназначен для игнорирова
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:41
-msgid "In this screenshot below, you can see the action of the -v option for lspcidrake and the -i option for grep."
-msgstr "На приведённом ниже скриншоте показана работа параметра «-v» для lspcidrake и «-i» для grep."
+msgid ""
+"In this screenshot below, you can see the action of the -v option for "
+"lspcidrake and the -i option for grep."
+msgstr ""
+"На приведённом ниже скриншоте показана работа параметра «-v» для lspcidrake "
+"и «-i» для grep."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/lspcidrake.xml:46
@@ -4804,8 +7636,13 @@ msgstr "lspcidrake2.png"
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:50
-msgid "There is another tool that gives information about the hardware, it is called <emphasis role=\"bold\">dmidecode</emphasis> (under root)"
-msgstr "Предусмотрено и другое средство получения данных по оборудованию. Эта программа называется <emphasis role=\"bold\">dmidecode</emphasis>, запускать от имени администратора (root)."
+msgid ""
+"There is another tool that gives information about the hardware, it is "
+"called <emphasis role=\"bold\">dmidecode</emphasis> (under root)"
+msgstr ""
+"Предусмотрено и другое средство получения данных по оборудованию. Эта "
+"программа называется <emphasis role=\"bold\">dmidecode</emphasis>, запускать "
+"от имени администратора (root)."
 
 #. type: Content of: <section><info><title>
 #: en/MageiaUpdate.xml:3
@@ -4824,39 +7661,81 @@ msgstr "MageiaUpdate.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/MageiaUpdate.xml:14
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">MageiaUpdate</emphasis> or <emphasis role=\"bold\">drakrpm-update</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">MageiaUpdate</emphasis> или <emphasis role=\"bold\">drakrpm-update</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">MageiaUpdate</emphasis> or <emphasis role=\"bold\">drakrpm-update</"
+"emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">MageiaUpdate</emphasis> или <emphasis role=\"bold"
+"\">drakrpm-update</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:14
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia Control Center under the tab <emphasis role=\"bold\">Software management.</emphasis>"
-msgstr "Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно получить из Центра управления Mageia, пункт <emphasis role=\"bold\">Управление программами</emphasis>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
+"Control Center under the tab <emphasis role=\"bold\">Software management.</"
+"emphasis>"
+msgstr ""
+"Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить из Центра управления Mageia, пункт <emphasis role=\"bold"
+"\">Управление программами</emphasis>."
 
 #. type: Content of: <section><para><note><para>
 #: en/MageiaUpdate.xml:18
-msgid "To work, MageiaUpdate needs the repositories to be configured with rpmdrake-edit-media with some media checked as updates. If they are not, you are prompted to do so."
-msgstr "Для обеспечения работоспособности MageiaUpdate следует должным образом настроить репозитории, воспользовавшись rpmdrake-edit-media и указав определённые источники пакетов для обновления. Если вы еще этого не сделали, программа попросит вас выполнить соответствующую настройку."
+msgid ""
+"To work, MageiaUpdate needs the repositories to be configured with rpmdrake-"
+"edit-media with some media checked as updates. If they are not, you are "
+"prompted to do so."
+msgstr ""
+"Для обеспечения работоспособности MageiaUpdate следует должным образом "
+"настроить репозитории, воспользовавшись rpmdrake-edit-media и указав "
+"определённые источники пакетов для обновления. Если вы еще этого не сделали, "
+"программа попросит вас выполнить соответствующую настройку."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:23
-msgid "As soon as this tool is launched, it scans the installed packages and lists those with an update available in the repositories. They are all selected by default to be automatically downloaded and installed. Click on the <guibutton>Update</guibutton> button to start the process."
-msgstr "После запуска этого инструмента программа выполняет сканирование установленных пакетов и показывает список пакетов, обновления которых появились в репозитории дистрибутива. По умолчанию все пункты пакетов будут помечены для автоматической загруки и установки. Нажмите кнопку <guibutton>Обновить</guibutton>, чтобы начать эту процедуру."
+msgid ""
+"As soon as this tool is launched, it scans the installed packages and lists "
+"those with an update available in the repositories. They are all selected by "
+"default to be automatically downloaded and installed. Click on the "
+"<guibutton>Update</guibutton> button to start the process."
+msgstr ""
+"После запуска этого инструмента программа выполняет сканирование "
+"установленных пакетов и показывает список пакетов, обновления которых "
+"появились в репозитории дистрибутива. По умолчанию все пункты пакетов будут "
+"помечены для автоматической загруки и установки. Нажмите кнопку "
+"<guibutton>Обновить</guibutton>, чтобы начать эту процедуру."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:28
-msgid "By clicking on a package, more information is displayed in the lower half of the window. The print<emphasis role=\"bold\"> ></emphasis> before a title means you can click to drop down a text."
-msgstr "Если вы нажмёте на пакете, в нижней части окна будут показаны дополнительные данные относительно пакета. Символ<emphasis role=\"bold\"> ></emphasis> перед заголовком в списке данных означает, что после нажатия этой стрелочки можно просмотреть дополнительный информационный блок."
+msgid ""
+"By clicking on a package, more information is displayed in the lower half of "
+"the window. The print<emphasis role=\"bold\"> ></emphasis> before a title "
+"means you can click to drop down a text."
+msgstr ""
+"Если вы нажмёте на пакете, в нижней части окна будут показаны дополнительные "
+"данные относительно пакета. Символ<emphasis role=\"bold\"> ></emphasis> "
+"перед заголовком в списке данных означает, что после нажатия этой стрелочки "
+"можно просмотреть дополнительный информационный блок."
 
 #. type: Attribute 'fileref' of: <section><para><inlinemediaobject><imageobject><imagedata>
-#: en/MageiaUpdate.xml:36
-#: en/mgaapplet-config.xml:21
+#: en/MageiaUpdate.xml:36 en/mgaapplet-config.xml:21
 msgid "MageiaUpdate1.png"
 msgstr "../MageiaUpdate1.png"
 
 #. type: Content of: <section><para><note><para>
 #: en/MageiaUpdate.xml:33
-msgid "When updates are available, an applet in the system tray warns you by displaying this red icon <placeholder type=\"inlinemediaobject\" id=\"0\"/> . Just click and enter the user password to update the system alike."
-msgstr "Когда в репозитории дистрибутива будут появляться обновления, апплет системного лотка будет предупреждать вас, показывая значок <placeholder type=\"inlinemediaobject\" id=\"0\"/> . Наведите указатель мыши на этот значок и щелкните левой кнопкой мыши, введите свой пароль пользователя, чтобы обновить пакеты системы."
+msgid ""
+"When updates are available, an applet in the system tray warns you by "
+"displaying this red icon <placeholder type=\"inlinemediaobject\" id=\"0\"/"
+"> . Just click and enter the user password to update the system alike."
+msgstr ""
+"Когда в репозитории дистрибутива будут появляться обновления, апплет "
+"системного лотка будет предупреждать вас, показывая значок <placeholder type="
+"\"inlinemediaobject\" id=\"0\"/> . Наведите указатель мыши на этот значок и "
+"щелкните левой кнопкой мыши, введите свой пароль пользователя, чтобы "
+"обновить пакеты системы."
 
 #. type: Content of: <section><info><title>
 #: en/mcc-boot.xml:5
@@ -4870,8 +7749,13 @@ msgstr "mcc-boot.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-boot.xml:16
-msgid "In this screen you can choose between several tools to configure your boot steps. Click on a link below to learn more."
-msgstr "С помощью этой страницы можно получить доступ к нескольким инструментам настройки загрузки системы. Нажмите на ссылку, расположенную ниже, чтобы узнать больше."
+msgid ""
+"In this screen you can choose between several tools to configure your boot "
+"steps. Click on a link below to learn more."
+msgstr ""
+"С помощью этой страницы можно получить доступ к нескольким инструментам "
+"настройки загрузки системы. Нажмите на ссылку, расположенную ниже, чтобы "
+"узнать больше."
 
 #. type: Content of: <section><orderedlist><title>
 #: en/mcc-boot.xml:19
@@ -4905,8 +7789,13 @@ msgstr "mcc-hardware.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-hardware.xml:15
-msgid "In this screen you can choose between several tools to configure your hardware. Click on a link below to learn more."
-msgstr "С помощью этой страницы можно получить доступ к нескольким инструментам настройкаи оборудования. Нажмите на ссылке, расположенной ниже, чтобы узнать больше."
+msgid ""
+"In this screen you can choose between several tools to configure your "
+"hardware. Click on a link below to learn more."
+msgstr ""
+"С помощью этой страницы можно получить доступ к нескольким инструментам "
+"настройкаи оборудования. Нажмите на ссылке, расположенной ниже, чтобы узнать "
+"больше."
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-hardware.xml:20
@@ -4915,8 +7804,12 @@ msgstr "Настройка оборудования"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:22
-msgid "<xref linkend=\"harddrake2\"/><emphasis> = Browse and configure hardware</emphasis>"
-msgstr "<xref linkend=\"harddrake2\"/><emphasis> = Поиск и настройка оборудования</emphasis>"
+msgid ""
+"<xref linkend=\"harddrake2\"/><emphasis> = Browse and configure hardware</"
+"emphasis>"
+msgstr ""
+"<xref linkend=\"harddrake2\"/><emphasis> = Поиск и настройка оборудования</"
+"emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:27
@@ -4930,8 +7823,12 @@ msgstr "Настройка графики"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:36
-msgid "<xref linkend=\"drak3d\"/><emphasis> = Configure 3D Desktop effects</emphasis>"
-msgstr "<xref linkend=\"drak3d\"/><emphasis> = Настройка эффектов трёхмерного рабочего стола</emphasis>"
+msgid ""
+"<xref linkend=\"drak3d\"/><emphasis> = Configure 3D Desktop effects</"
+"emphasis>"
+msgstr ""
+"<xref linkend=\"drak3d\"/><emphasis> = Настройка эффектов трёхмерного "
+"рабочего стола</emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:41
@@ -4960,8 +7857,12 @@ msgstr "Настройка печати и сканирования"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:63
-msgid "<xref linkend=\"system-config-printer\"/><emphasis> = Set up the printer(s), the print job queues, ...</emphasis>"
-msgstr "<xref linkend=\"system-config-printer\"/><emphasis> = Настройка принтеров, очередей печати, ...</emphasis>"
+msgid ""
+"<xref linkend=\"system-config-printer\"/><emphasis> = Set up the printer(s), "
+"the print job queues, ...</emphasis>"
+msgstr ""
+"<xref linkend=\"system-config-printer\"/><emphasis> = Настройка принтеров, "
+"очередей печати, ...</emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:68
@@ -4969,8 +7870,7 @@ msgid "<xref linkend=\"scannerdrake\"/>"
 msgstr "<xref linkend=\"scannerdrake\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
-#: en/mcc-hardware.xml:75
-#: en/mcc-network.xml:58
+#: en/mcc-hardware.xml:75 en/mcc-network.xml:58
 msgid "Others"
 msgstr "Другие"
 
@@ -4986,32 +7886,54 @@ msgstr "Руководство по Центру управления Mageia"
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:6
-msgid "The Mageia Control Center (MCC) has eight different options or tabs to choose from in the left column, and even ten if the drakwizard package was installed. Each of these tabs gives a different set of tools that can be selected in the big right panel."
-msgstr "В Центре управления Mageia (MCC) предусмотрено восемь пунктов, выбрать которые можно в левой колонке окна программы. Если установлен пакет drakwizard, таких пунктов будет десять. Каждый из этих пунктов предлагает набор инструментов, которые можно выбрать в правой стороне окна программы."
+msgid ""
+"The Mageia Control Center (MCC) has eight different options or tabs to "
+"choose from in the left column, and even ten if the drakwizard package was "
+"installed. Each of these tabs gives a different set of tools that can be "
+"selected in the big right panel."
+msgstr ""
+"В Центре управления Mageia (MCC) предусмотрено восемь пунктов, выбрать "
+"которые можно в левой колонке окна программы. Если установлен пакет "
+"drakwizard, таких пунктов будет десять. Каждый из этих пунктов предлагает "
+"набор инструментов, которые можно выбрать в правой стороне окна программы."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:8
-msgid "The ten following chapters are about those ten options and the related tools."
-msgstr "Следующие десять глав посвящены этим десяти пунктам и связанными с ними инструментами."
+msgid ""
+"The ten following chapters are about those ten options and the related tools."
+msgstr ""
+"Следующие десять глав посвящены этим десяти пунктам и связанными с ними "
+"инструментами."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:10
-msgid "The last chapter is about some other Mageia tools, that cannot be chosen in any of the MCC tabs."
-msgstr "Последняя глава посвящена другим инструментам Mageia, которые не могут быть выбраны с помощью страниц Центра управления Mageia (MCC)."
+msgid ""
+"The last chapter is about some other Mageia tools, that cannot be chosen in "
+"any of the MCC tabs."
+msgstr ""
+"Последняя глава посвящена другим инструментам Mageia, которые не могут быть "
+"выбраны с помощью страниц Центра управления Mageia (MCC)."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:12
-msgid "The titles of the pages will often be the same as the titles of the tool screens."
-msgstr "Названия пунктов на этих страницах иногда совпадают с заголовками окон соответствующих инструментов."
+msgid ""
+"The titles of the pages will often be the same as the titles of the tool "
+"screens."
+msgstr ""
+"Названия пунктов на этих страницах иногда совпадают с заголовками окон "
+"соответствующих инструментов."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:14
-msgid "There is also a search bar available, which you can access by clicking on the \"Search\" tab in the left column."
-msgstr "Кроме того, можно воспользоваться кнопкой «Поиск» этого руководства, которая находится справа от кнопки «Содержание»."
+msgid ""
+"There is also a search bar available, which you can access by clicking on "
+"the \"Search\" tab in the left column."
+msgstr ""
+"Кроме того, можно воспользоваться кнопкой «Поиск» этого руководства, которая "
+"находится справа от кнопки «Содержание»."
 
 #. type: Content of: <section><orderedlist><title>
-#: en/mcc-localdisks.xml:6
-#: en/mcc-localdisks.xml:17
+#: en/mcc-localdisks.xml:6 en/mcc-localdisks.xml:17
 msgid "Local disks"
 msgstr "Локальные диски"
 
@@ -5022,8 +7944,13 @@ msgstr "mcc-localdisks.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-localdisks.xml:15
-msgid "In this screen you can choose between several tools to manage or share your local disks. Click on a link below to learn more."
-msgstr "С помощью этой страницы можно получить доступ к нескольким инструментам управления дисками системы и предоставления общего доступа к локальным дискам. Нажмите на ссылку, расположенную ниже, чтобы узнать больше."
+msgid ""
+"In this screen you can choose between several tools to manage or share your "
+"local disks. Click on a link below to learn more."
+msgstr ""
+"С помощью этой страницы можно получить доступ к нескольким инструментам "
+"управления дисками системы и предоставления общего доступа к локальным "
+"дискам. Нажмите на ссылку, расположенную ниже, чтобы узнать больше."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-localdisks.xml:18
@@ -5041,8 +7968,7 @@ msgid "<xref linkend=\"diskdrake--fileshare\"></xref>"
 msgstr "<xref linkend=\"diskdrake--fileshare\"></xref>"
 
 #. type: Content of: <section><orderedlist><title>
-#: en/mcc-networkservices.xml:4
-#: en/mcc-networkservices.xml:17
+#: en/mcc-networkservices.xml:4 en/mcc-networkservices.xml:17
 msgid "Network Services"
 msgstr "Сетевые службы"
 
@@ -5053,8 +7979,17 @@ msgstr "mcc-networkservices.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-networkservices.xml:15
-msgid "This screen and the one for <emphasis>Sharing</emphasis> are only visible if the <emphasis>drakwizard</emphasis> package is installed. You can choose between several tools to set up different servers. Click on a link below or on <xref linkend=\"mcc-sharing\"/>to learn more."
-msgstr "Это окно и окно <emphasis>Общий доступ</emphasis> можно будет увидеть, только если установлен пакет <emphasis>drakwizard</emphasis>. С помощью этих окон можно выбрать инструмент настройки различных серверов. Нажмите на ссылку, приведенную ниже или на ссылку <xref linkend=\"mcc-sharing\"/>,чтобы узнать больше."
+msgid ""
+"This screen and the one for <emphasis>Sharing</emphasis> are only visible if "
+"the <emphasis>drakwizard</emphasis> package is installed. You can choose "
+"between several tools to set up different servers. Click on a link below or "
+"on <xref linkend=\"mcc-sharing\"/>to learn more."
+msgstr ""
+"Это окно и окно <emphasis>Общий доступ</emphasis> можно будет увидеть, "
+"только если установлен пакет <emphasis>drakwizard</emphasis>. С помощью этих "
+"окон можно выбрать инструмент настройки различных серверов. Нажмите на "
+"ссылку, приведенную ниже или на ссылку <xref linkend=\"mcc-sharing\"/>,чтобы "
+"узнать больше."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-networkservices.xml:19
@@ -5093,8 +8028,13 @@ msgstr "mcc-networksharing.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-networksharing.xml:13
-msgid "In this screen you can choose between several tools for sharing drives and directories. Click on a link below to learn more."
-msgstr "С помощью этой страницы можно выбрать инструменты управления общего доступа к дискам и каталогам системы. Нажмите на ссылку, расположенную ниже, чтобы узнать больше."
+msgid ""
+"In this screen you can choose between several tools for sharing drives and "
+"directories. Click on a link below to learn more."
+msgstr ""
+"С помощью этой страницы можно выбрать инструменты управления общего доступа "
+"к дискам и каталогам системы. Нажмите на ссылку, расположенную ниже, чтобы "
+"узнать больше."
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-networksharing.xml:17
@@ -5108,8 +8048,12 @@ msgstr "<xref linkend=\"diskdrake--smb\"></xref>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-networksharing.xml:19
-msgid "<xref linkend=\"draksambashare\"></xref><emphasis> = Share drives and directories with Windows (SMB) systems</emphasis>"
-msgstr "<xref linkend=\"draksambashare\"></xref><emphasis> = Доступ к общим файлам и каталогам на системах Windows (SMB)</emphasis>"
+msgid ""
+"<xref linkend=\"draksambashare\"></xref><emphasis> = Share drives and "
+"directories with Windows (SMB) systems</emphasis>"
+msgstr ""
+"<xref linkend=\"draksambashare\"></xref><emphasis> = Доступ к общим файлам и "
+"каталогам на системах Windows (SMB)</emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-networksharing.xml:22
@@ -5148,8 +8092,13 @@ msgstr "mcc-network.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-network.xml:12
-msgid "In this screen you can choose between several network tools. Click on a link below to learn more."
-msgstr "С помощью этого пункта можно получить доступ к нескольким инструментам управления доступа к сети. Нажмите на ссылку, расположенную ниже, чтобы узнать больше."
+msgid ""
+"In this screen you can choose between several network tools. Click on a link "
+"below to learn more."
+msgstr ""
+"С помощью этого пункта можно получить доступ к нескольким инструментам "
+"управления доступа к сети. Нажмите на ссылку, расположенную ниже, чтобы "
+"узнать больше."
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-network.xml:18
@@ -5202,8 +8151,7 @@ msgid "<xref linkend=\"drakhosts\"/>"
 msgstr "<xref linkend=\"drakhosts\"/>"
 
 #. type: Content of: <section><orderedlist><title>
-#: en/mcc-security.xml:5
-#: en/mcc-security.xml:18
+#: en/mcc-security.xml:5 en/mcc-security.xml:18
 msgid "Security"
 msgstr "Безопасность"
 
@@ -5214,13 +8162,22 @@ msgstr "mcc-security.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-security.xml:16
-msgid "In this screen you can choose between several security tools. Click on a link below to learn more."
-msgstr "С помощью этого пункта можно получить доступ к нескольким инструментам управления защитой системы от внешнего вмешательства. Нажмите на ссылку, расположенную ниже, чтобы узнать больше."
+msgid ""
+"In this screen you can choose between several security tools. Click on a "
+"link below to learn more."
+msgstr ""
+"С помощью этого пункта можно получить доступ к нескольким инструментам "
+"управления защитой системы от внешнего вмешательства. Нажмите на ссылку, "
+"расположенную ниже, чтобы узнать больше."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-security.xml:20
-msgid "<xref linkend=\"msecgui\"/><emphasis> = Configure system security, permissions and audit</emphasis>"
-msgstr "<xref linkend=\"msecgui\"/><emphasis> = Настройка безопасности, прав доступа и аудита системы</emphasis>"
+msgid ""
+"<xref linkend=\"msecgui\"/><emphasis> = Configure system security, "
+"permissions and audit</emphasis>"
+msgstr ""
+"<xref linkend=\"msecgui\"/><emphasis> = Настройка безопасности, прав доступа "
+"и аудита системы</emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-security.xml:25
@@ -5243,8 +8200,7 @@ msgid "<xref linkend=\"drakguard\"/>"
 msgstr "<xref linkend=\"drakguard\"/>"
 
 #. type: Content of: <section><orderedlist><title>
-#: en/mcc-sharing.xml:4
-#: en/mcc-sharing.xml:17
+#: en/mcc-sharing.xml:4 en/mcc-sharing.xml:17
 msgid "Sharing"
 msgstr "Совместное пользование"
 
@@ -5255,8 +8211,17 @@ msgstr "mcc-sharing.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-sharing.xml:15
-msgid "This screen and the one for <emphasis>Network Services</emphasis> are only visible if the <emphasis>drakwizard</emphasis> package is installed. You can choose between several tools to set up different servers. Click on a link below or on <xref linkend=\"mcc-networkservices\"/>to learn more."
-msgstr "Это окно и окно <emphasis>Сетевые службы</emphasis> можно будет увидеть, только если установлен пакет <emphasis>drakwizard</emphasis>. С помощью этих окон можно выбрать инструмент настройки различных серверов. Нажмите на ссылку, приведенную ниже или на ссылку <xref linkend=\"mcc-networkservices\"/>,чтобы узнать больше."
+msgid ""
+"This screen and the one for <emphasis>Network Services</emphasis> are only "
+"visible if the <emphasis>drakwizard</emphasis> package is installed. You can "
+"choose between several tools to set up different servers. Click on a link "
+"below or on <xref linkend=\"mcc-networkservices\"/>to learn more."
+msgstr ""
+"Это окно и окно <emphasis>Сетевые службы</emphasis> можно будет увидеть, "
+"только если установлен пакет <emphasis>drakwizard</emphasis>. С помощью этих "
+"окон можно выбрать инструмент настройки различных серверов. Нажмите на "
+"ссылку, приведенную ниже или на ссылку <xref linkend=\"mcc-networkservices\"/"
+">,чтобы узнать больше."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-sharing.xml:19
@@ -5280,8 +8245,13 @@ msgstr "mcc-system.png"
 
 #. type: Content of: <section><para>
 #: en/mcc-system.xml:13
-msgid "In this screen you can choose between several system and administration tools. Click on a link below to learn more."
-msgstr "С помощью этой страницы можно получить доступ к нескольким инструментам управления и администрирования системой. Нажмите на ссылку, расположенную ниже, чтобы узнать больше."
+msgid ""
+"In this screen you can choose between several system and administration "
+"tools. Click on a link below to learn more."
+msgstr ""
+"С помощью этой страницы можно получить доступ к нескольким инструментам "
+"управления и администрирования системой. Нажмите на ссылку, расположенную "
+"ниже, чтобы узнать больше."
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-system.xml:18
@@ -5335,8 +8305,12 @@ msgstr "<xref linkend=\"drakconsole\"></xref>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:58
-msgid "<xref linkend=\"userdrake\"></xref><emphasis> = Manage users on system</emphasis>"
-msgstr "<xref linkend=\"userdrake\"></xref><emphasis> = Управление пользователями</emphasis>"
+msgid ""
+"<xref linkend=\"userdrake\"></xref><emphasis> = Manage users on system</"
+"emphasis>"
+msgstr ""
+"<xref linkend=\"userdrake\"></xref><emphasis> = Управление пользователями</"
+"emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:62
@@ -5355,18 +8329,38 @@ msgstr "Центр управления Mageia"
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:6
-msgid "The texts and screenshots in this manual are available under the CC BY-SA 3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
-msgstr "Тексты и скриншоты в данном руководстве, предоставляются вам в соответствии с условиями лицензирования CC BY-SA 3.0, <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
+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>."
+msgstr ""
+"Тексты и скриншоты в данном руководстве, предоставляются вам в соответствии "
+"с условиями лицензирования CC BY-SA 3.0, <link ns6:href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/\">http://creativecommons.org/"
+"licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:9
-msgid "This manual was produced with the help of the <link ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>."
-msgstr "Это руководство было создано с помощью <link ns6:href=\"http://www.calenco.com\">Calenco CMS</link>, разработанное компанией <link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>."
+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>."
+msgstr ""
+"Это руководство было создано с помощью <link ns6:href=\"http://www.calenco."
+"com\">Calenco CMS</link>, разработанное компанией <link ns6:href=\"http://"
+"www.neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:11
-msgid "It was written by volunteers in their free time. Please contact <link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</link>, if you would like to help improve this manual."
-msgstr "Это руководство было написано добровольцами в свободное от основной работы время. Пожалуйста, обратитесь к <link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">команде документирования</link>, если хотите помочь в улучшении этого руководства."
+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."
+msgstr ""
+"Это руководство было написано добровольцами в свободное от основной работы "
+"время. Пожалуйста, обратитесь к <link ns6:href=\"https://wiki.mageia.org/en/"
+"Documentation_team\">команде документирования</link>, если хотите помочь в "
+"улучшении этого руководства."
 
 #. type: Content of: <section><info><title>
 #: en/mgaapplet-config.xml:3
@@ -5385,18 +8379,42 @@ msgstr "mgaapplet-config.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/mgaapplet-config.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">mgaapplet-config</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">mgaapplet-config</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">mgaapplet-config</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">mgaapplet-config</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:14
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia Control Center under the tab <emphasis role=\"bold\">Software management</emphasis>. It is also available by a <guimenu>right click / Updates configuration</guimenu> on the red icon <placeholder type=\"inlinemediaobject\" id=\"1\"/> in the system tray."
-msgstr "Доступ к этому модулю<placeholder type=\"footnote\" id=\"0\"/> можно получить с помощью Центра управления Mageia, пункт <emphasis role=\"bold\">Управление программами</emphasis>. Также окно этой программы открывается с помощью щелчка правой кнопки мыши на красном значке в системном трее <placeholder type=\"inlinemediaobject\" id=\"1\"/> с последующим выбором пункта <guimenu>Настройка обновлений</guimenu>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
+"Control Center under the tab <emphasis role=\"bold\">Software management</"
+"emphasis>. It is also available by a <guimenu>right click / Updates "
+"configuration</guimenu> on the red icon <placeholder type=\"inlinemediaobject"
+"\" id=\"1\"/> in the system tray."
+msgstr ""
+"Доступ к этому модулю<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить с помощью Центра управления Mageia, пункт <emphasis role=\"bold"
+"\">Управление программами</emphasis>. Также окно этой программы открывается "
+"с помощью щелчка правой кнопки мыши на красном значке в системном трее "
+"<placeholder type=\"inlinemediaobject\" id=\"1\"/> с последующим выбором "
+"пункта <guimenu>Настройка обновлений</guimenu>."
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:27
-msgid "The first slider allows you to change how frequently Mageia will check for updates and the second the delay after booting before the first check.  The check box gives you the option to be warned when a new Mageia release is out."
-msgstr "С помощью первого ползунка вы можете изменить частоту, с которой Mageia будет проверять наличие обновлений, а с помощью второго - промежуток между завершением загрузки и первой проверкой наличия обновлений. С помощью обозначения или снятия отметки с соответствующего пункта вы можете приказать системе предупреждать вас о новых выпусках Mageia."
+msgid ""
+"The first slider allows you to change how frequently Mageia will check for "
+"updates and the second the delay after booting before the first check.  The "
+"check box gives you the option to be warned when a new Mageia release is out."
+msgstr ""
+"С помощью первого ползунка вы можете изменить частоту, с которой Mageia "
+"будет проверять наличие обновлений, а с помощью второго - промежуток между "
+"завершением загрузки и первой проверкой наличия обновлений. С помощью "
+"обозначения или снятия отметки с соответствующего пункта вы можете приказать "
+"системе предупреждать вас о новых выпусках Mageia."
 
 #. type: Content of: <section><info><title>
 #: en/mousedrake.xml:3
@@ -5415,23 +8433,46 @@ msgstr "mousedrake.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/mousedrake.xml:15
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">mousedrake</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">mousedrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">mousedrake</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">mousedrake</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/mousedrake.xml:15
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</emphasis>."
-msgstr "Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно получить из Центра управления Mageia, пункт <emphasis role=\"bold\">Оборудование</emphasis>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
+"Control Center under the tab <emphasis role=\"bold\">Hardware</emphasis>."
+msgstr ""
+"Доступ к этой программе<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить из Центра управления Mageia, пункт <emphasis role=\"bold"
+"\">Оборудование</emphasis>."
 
 #. type: Content of: <section><para>
 #: en/mousedrake.xml:20
-msgid "As you must have a mouse to install Mageia, that one is already installed by Drakinstall. This tool allows installation of another mouse."
-msgstr "Для установки Mageia, к компьютеру должен быть подключен манипулятор-мышь. Настройка этого оборудования выполняется во время установки системы. С помощью этого модуля вы сможете изменить параметры работы мыши или настроить работу с другой мышью."
+msgid ""
+"As you must have a mouse to install Mageia, that one is already installed by "
+"Drakinstall. This tool allows installation of another mouse."
+msgstr ""
+"Для установки Mageia, к компьютеру должен быть подключен манипулятор-мышь. "
+"Настройка этого оборудования выполняется во время установки системы. С "
+"помощью этого модуля вы сможете изменить параметры работы мыши или настроить "
+"работу с другой мышью."
 
 #. type: Content of: <section><para>
 #: en/mousedrake.xml:23
-msgid "The mice are sorted by connection type and then by model. Select your mouse and click on <guibutton>OK</guibutton>. Most of the time \"Universal / Any PS/2 &amp; USB mice\" is suitable for a recent mouse. The new mouse is immediately taken into account."
-msgstr "Список упорядочен по модели мыши и по её типу соединения. Отметьте пункт с вашей мышью и нажмите кнопку <guibutton>OK</guibutton>. В основном новейшие мыши хорошо работают, если выбран пункт «Любая мышь PS/2 или USB». Выбранный вариант мыши будет задействован немедленно."
+msgid ""
+"The mice are sorted by connection type and then by model. Select your mouse "
+"and click on <guibutton>OK</guibutton>. Most of the time \"Universal / Any "
+"PS/2 &amp; USB mice\" is suitable for a recent mouse. The new mouse is "
+"immediately taken into account."
+msgstr ""
+"Список упорядочен по модели мыши и по её типу соединения. Отметьте пункт с "
+"вашей мышью и нажмите кнопку <guibutton>OK</guibutton>. В основном новейшие "
+"мыши хорошо работают, если выбран пункт «Любая мышь PS/2 или USB». Выбранный "
+"вариант мыши будет задействован немедленно."
 
 #. type: Content of: <section><info><title>
 #: en/msecgui.xml:3
@@ -5450,28 +8491,54 @@ msgstr "msecgui.png"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/msecgui.xml:21
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">msecgui</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">msecgui</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">msecgui</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">msecgui</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><section><para>
 #: en/msecgui.xml:21
-msgid "msecgui<placeholder type=\"footnote\" id=\"0\"/> is a graphic user interface for msec that allows to configure your system security according to two approaches:"
-msgstr "msecgui<placeholder type=\"footnote\" id=\"0\"/> - графический интерфейс к msec, с помощью которого можно настроить защиту системы следующим образом:"
+msgid ""
+"msecgui<placeholder type=\"footnote\" id=\"0\"/> is a graphic user interface "
+"for msec that allows to configure your system security according to two "
+"approaches:"
+msgstr ""
+"msecgui<placeholder type=\"footnote\" id=\"0\"/> - графический интерфейс к "
+"msec, с помощью которого можно настроить защиту системы следующим образом:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:28
-msgid "It sets the system behaviour, msec imposes modifications to the system to make it more secure."
-msgstr "Установить системное поведение; msec вносит в систему изменения с целью ее страхования."
+msgid ""
+"It sets the system behaviour, msec imposes modifications to the system to "
+"make it more secure."
+msgstr ""
+"Установить системное поведение; msec вносит в систему изменения с целью ее "
+"страхования."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:33
-msgid "It carries on periodic checks automatically on the system in order to warn you if something seems dangerous."
-msgstr "Выполнять периодические автоматические проверки системы с целью предупредить вас о потенциально опасных изменениях."
+msgid ""
+"It carries on periodic checks automatically on the system in order to warn "
+"you if something seems dangerous."
+msgstr ""
+"Выполнять периодические автоматические проверки системы с целью предупредить "
+"вас о потенциально опасных изменениях."
 
 #. type: Content of: <section><section><para>
 #: en/msecgui.xml:38
-msgid "msec uses the concept of \"security levels\" which are intended to configure a set of system permissions, which can be audited for changes or enforcement. Several of them are proposed by Mageia, but you can define your own customised security levels."
-msgstr "В msec использована концепция «уровней безопасности». Уровни предназначены для настройки целого набора прав доступа в системе, за которыми будет наблюдать и принудительно изменять программа. В Mageia вам будет предложено несколько типовых уровней, но вы можете определить собственные нетипичные уровни безопасности."
+msgid ""
+"msec uses the concept of \"security levels\" which are intended to configure "
+"a set of system permissions, which can be audited for changes or "
+"enforcement. Several of them are proposed by Mageia, but you can define your "
+"own customised security levels."
+msgstr ""
+"В msec использована концепция «уровней безопасности». Уровни предназначены "
+"для настройки целого набора прав доступа в системе, за которыми будет "
+"наблюдать и принудительно изменять программа. В Mageia вам будет предложено "
+"несколько типовых уровней, но вы можете определить собственные нетипичные "
+"уровни безопасности."
 
 #. type: Content of: <section><section><title>
 #: en/msecgui.xml:45
@@ -5485,18 +8552,27 @@ msgstr "Смотрите приведённый выше скриншот"
 
 #. type: Content of: <section><section><para>
 #: en/msecgui.xml:49
-msgid "The first tab takes up the list of the different security tools with a button on the right side to configure them:"
-msgstr "На первой вкладке будет показан список различных инструментов защиты с расположенной справа кнопкой для настройки этих инструментов:"
+msgid ""
+"The first tab takes up the list of the different security tools with a "
+"button on the right side to configure them:"
+msgstr ""
+"На первой вкладке будет показан список различных инструментов защиты с "
+"расположенной справа кнопкой для настройки этих инструментов:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:54
-msgid "Firewall, also found in the MCC / Security / Set up your personal firewall"
-msgstr "К файерволу можно получить доступ с помощью Центра управления Mageia - страница «Безопасность», пункт «Настройка персонального файервола»."
+msgid ""
+"Firewall, also found in the MCC / Security / Set up your personal firewall"
+msgstr ""
+"К файерволу можно получить доступ с помощью Центра управления Mageia - "
+"страница «Безопасность», пункт «Настройка персонального файервола»."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:59
 msgid "Updates, also found in MCC / Software Management / Update your system"
-msgstr "Доступ к обновлениям можно получить в Центре управления Mageia - страница «Управление программами», пункт «Обновление системы»."
+msgstr ""
+"Доступ к обновлениям можно получить в Центре управления Mageia - страница "
+"«Управление программами», пункт «Обновление системы»."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:64
@@ -5515,8 +8591,12 @@ msgstr "настроен базовый уровень безопасности"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/msecgui.xml:76
-msgid "the date of the last Periodic checks and a button to see a detailed report and another button to execute the checks just now."
-msgstr "даты последних периодических проверок, кнопки просмотра подробного отчёта и кнопки для немедленного выполнения проверки."
+msgid ""
+"the date of the last Periodic checks and a button to see a detailed report "
+"and another button to execute the checks just now."
+msgstr ""
+"даты последних периодических проверок, кнопки просмотра подробного отчёта и "
+"кнопки для немедленного выполнения проверки."
 
 #. type: Content of: <section><section><title>
 #: en/msecgui.xml:86
@@ -5525,8 +8605,12 @@ msgstr "Вкладка «Параметры безопасности»"
 
 #. type: Content of: <section><section><para>
 #: en/msecgui.xml:88
-msgid "A click on the second tab or on the Security <guibutton>Configure</guibutton> button leads to the same screen shown below."
-msgstr "Нажав левой кнопкой мыши на второй вкладке или кнопку <guibutton>Настроить</guibutton>, будет показана страница, подобная приведённой на снимке ниже."
+msgid ""
+"A click on the second tab or on the Security <guibutton>Configure</"
+"guibutton> button leads to the same screen shown below."
+msgstr ""
+"Нажав левой кнопкой мыши на второй вкладке или кнопку <guibutton>Настроить</"
+"guibutton>, будет показана страница, подобная приведённой на снимке ниже."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:94
@@ -5545,43 +8629,123 @@ msgstr "<emphasis role=\"underline\">Уровни безопасности:</emp
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:106
-msgid "After having checked the box <guilabel>Enable MSEC tool</guilabel>, this tab allows you by a double click to choose the security level that appears then in bold. If the box is not checked, the level « none » is applied. The following levels are available:"
-msgstr "После выбора пункта <guilabel>Включить инструмент MSEC</guilabel>, с помощью этой вкладки вы можете двойным щелчком кнопки мыши выбрать уровень безопасности. Если этот пункт не будет отмечен, правила обеспечения безопасности не будут применяться. По умолчанию можно воспользоваться такими уровнями безопасности:"
+msgid ""
+"After having checked the box <guilabel>Enable MSEC tool</guilabel>, this tab "
+"allows you by a double click to choose the security level that appears then "
+"in bold. If the box is not checked, the level « none » is applied. The "
+"following levels are available:"
+msgstr ""
+"После выбора пункта <guilabel>Включить инструмент MSEC</guilabel>, с помощью "
+"этой вкладки вы можете двойным щелчком кнопки мыши выбрать уровень "
+"безопасности. Если этот пункт не будет отмечен, правила обеспечения "
+"безопасности не будут применяться. По умолчанию можно воспользоваться такими "
+"уровнями безопасности:"
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:113
-msgid "Level <emphasis role=\"bold\">none</emphasis>. This level is intended if you do not want to use msec to control system security, and prefer tuning it on your own. It disables all security checks and puts no restrictions or constraints on system configuration and settings. Please use this level only if you are knowing what you are doing, as it would leave your system vulnerable to attack."
-msgstr "Уровень <emphasis role=\"bold\">none</emphasis>. Этот уровень предназначен для ситуаций, когда вы не хотите, чтобы msec руководил безопасностью системы, и хотите настроить средства защиты самостоятельно. Если будет выбран этот уровень, все проверки безопасности будут отключены, программа не будет применять никаких ограничений на настройки и параметры системы. Пожалуйста, пользуйтесь этим уровнем только если полностью осознаёте последствия, поскольку его использование оставит вашу систему уязвимой к нападениям злоумышленников."
+msgid ""
+"Level <emphasis role=\"bold\">none</emphasis>. This level is intended if you "
+"do not want to use msec to control system security, and prefer tuning it on "
+"your own. It disables all security checks and puts no restrictions or "
+"constraints on system configuration and settings. Please use this level only "
+"if you are knowing what you are doing, as it would leave your system "
+"vulnerable to attack."
+msgstr ""
+"Уровень <emphasis role=\"bold\">none</emphasis>. Этот уровень предназначен "
+"для ситуаций, когда вы не хотите, чтобы msec руководил безопасностью "
+"системы, и хотите настроить средства защиты самостоятельно. Если будет "
+"выбран этот уровень, все проверки безопасности будут отключены, программа не "
+"будет применять никаких ограничений на настройки и параметры системы. "
+"Пожалуйста, пользуйтесь этим уровнем только если полностью осознаёте "
+"последствия, поскольку его использование оставит вашу систему уязвимой к "
+"нападениям злоумышленников."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:122
-msgid "Level <emphasis role=\"bold\">standard</emphasis>. This is the default configuration when installed and is intended for casual users.  It constrains several system settings and executes daily security checks which detect changes in system files, system accounts, and vulnerable directory permissions. (This level is similar to levels 2 and 3 from past msec versions)."
-msgstr "Уровень <emphasis role=\"bold\">стандартный</emphasis>. Этот уровень является дефолтным после установки, он предназначен для обычных пользователей. Права доступа в системе будут несколько ограничены, будут выполняться ежедневные проверки защиты для выявления изменений в системных файлах, учётных записях и уязвимостей в правах доступа к каталогам (этот уровень подобен уровням 2 и 3 в старых версиях msec)."
+msgid ""
+"Level <emphasis role=\"bold\">standard</emphasis>. This is the default "
+"configuration when installed and is intended for casual users.  It "
+"constrains several system settings and executes daily security checks which "
+"detect changes in system files, system accounts, and vulnerable directory "
+"permissions. (This level is similar to levels 2 and 3 from past msec "
+"versions)."
+msgstr ""
+"Уровень <emphasis role=\"bold\">стандартный</emphasis>. Этот уровень "
+"является дефолтным после установки, он предназначен для обычных "
+"пользователей. Права доступа в системе будут несколько ограничены, будут "
+"выполняться ежедневные проверки защиты для выявления изменений в системных "
+"файлах, учётных записях и уязвимостей в правах доступа к каталогам (этот "
+"уровень подобен уровням 2 и 3 в старых версиях msec)."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:131
-msgid "Level <emphasis role=\"bold\">secure</emphasis>. This level is intended when you want to ensure your system is secure, yet usable.  It further restricts system permissions and executes more periodic checks. Moreover, access to the system is more restricted. (This level is similar to levels 4 (High) and 5 (Paranoid) from old msec versions)."
-msgstr "Уровень <emphasis role=\"bold\">безопасный</emphasis>. Этот уровень будет полезным, если вам нужна защищённая система с определённой свободой в действиях. Права доступа в системе ограничены, выполняются периодические проверки. Кроме того, будет ограничен доступ к системе (этот уровень подобен уровням 4 (высокий) и 5 (параноидальный) в старых версиях msec)."
+msgid ""
+"Level <emphasis role=\"bold\">secure</emphasis>. This level is intended when "
+"you want to ensure your system is secure, yet usable.  It further restricts "
+"system permissions and executes more periodic checks. Moreover, access to "
+"the system is more restricted. (This level is similar to levels 4 (High) and "
+"5 (Paranoid) from old msec versions)."
+msgstr ""
+"Уровень <emphasis role=\"bold\">безопасный</emphasis>. Этот уровень будет "
+"полезным, если вам нужна защищённая система с определённой свободой в "
+"действиях. Права доступа в системе ограничены, выполняются периодические "
+"проверки. Кроме того, будет ограничен доступ к системе (этот уровень подобен "
+"уровням 4 (высокий) и 5 (параноидальный) в старых версиях msec)."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:140
-msgid "Besides those levels, different task-oriented security are also provided, such as the <emphasis role=\"bold\">fileserver </emphasis>, <emphasis role=\"bold\">webserver</emphasis> and <emphasis role=\"bold\">netbook</emphasis> levels. Such levels attempt to pre-configure system security according to the most common use cases."
-msgstr "Кроме этих уровней, предусмотрены различные ориентированные на задачи наборы настроек защиты, в частности уровень <emphasis role=\"bold\">файловый сервер </emphasis>, <emphasis role=\"bold\">веб-сервер</emphasis> и <emphasis role=\"bold\">нетбук</emphasis>. Если вы воспользуетесь этими уровнями, то защита системы будет предварительно настроена на выполнение большинства типовых задач."
+msgid ""
+"Besides those levels, different task-oriented security are also provided, "
+"such as the <emphasis role=\"bold\">fileserver </emphasis>, <emphasis role="
+"\"bold\">webserver</emphasis> and <emphasis role=\"bold\">netbook</emphasis> "
+"levels. Such levels attempt to pre-configure system security according to "
+"the most common use cases."
+msgstr ""
+"Кроме этих уровней, предусмотрены различные ориентированные на задачи наборы "
+"настроек защиты, в частности уровень <emphasis role=\"bold\">файловый сервер "
+"</emphasis>, <emphasis role=\"bold\">веб-сервер</emphasis> и <emphasis role="
+"\"bold\">нетбук</emphasis>. Если вы воспользуетесь этими уровнями, то защита "
+"системы будет предварительно настроена на выполнение большинства типовых "
+"задач."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:149
-msgid "The last two levels called <emphasis role=\"bold\">audit_daily </emphasis> and <emphasis role=\"bold\">audit_weekly</emphasis> are not really security levels but rather tools for periodic checks only."
-msgstr "Последние два уровня называются <emphasis role=\"bold\">ежедневные проверки </emphasis> и <emphasis role=\"bold\">еженедельные проверки</emphasis>. На самом деле, это не совсем уровни безопасности, скорее инструменты, предназначенные только для выполнения периодических проверок."
+msgid ""
+"The last two levels called <emphasis role=\"bold\">audit_daily </emphasis> "
+"and <emphasis role=\"bold\">audit_weekly</emphasis> are not really security "
+"levels but rather tools for periodic checks only."
+msgstr ""
+"Последние два уровня называются <emphasis role=\"bold\">ежедневные проверки "
+"</emphasis> и <emphasis role=\"bold\">еженедельные проверки</emphasis>. На "
+"самом деле, это не совсем уровни безопасности, скорее инструменты, "
+"предназначенные только для выполнения периодических проверок."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:156
-msgid "These levels are saved in <filename>etc/security/msec/level.&lt;levelname></filename>. You can define your own customised security levels, saving them into specific files called <filename>level.&lt;levelname></filename>, placed into the folder <filename>etc/security/msec/.</filename> This function is intended for power users which require a customised or more secure system configuration."
-msgstr "Записи этих уровней хранятся в файлах <filename>etc/security/msec/level.&lt;Название уровня&gt;</filename>. Вы можете определить собственные нетипичные уровни безопасности и сохранить их в специфических файлах с названиями <filename>level.&lt;Название уровня&gt;</filename>, которые будут храниться в папке <filename>etc/security/msec/</filename>. Создание уровней является прерогативой опытных пользователей, которым требуется гибкая система настроек и защищённая система."
+msgid ""
+"These levels are saved in <filename>etc/security/msec/level.&lt;levelname></"
+"filename>. You can define your own customised security levels, saving them "
+"into specific files called <filename>level.&lt;levelname></filename>, placed "
+"into the folder <filename>etc/security/msec/.</filename> This function is "
+"intended for power users which require a customised or more secure system "
+"configuration."
+msgstr ""
+"Записи этих уровней хранятся в файлах <filename>etc/security/msec/level.&lt;"
+"Название уровня&gt;</filename>. Вы можете определить собственные нетипичные "
+"уровни безопасности и сохранить их в специфических файлах с названиями "
+"<filename>level.&lt;Название уровня&gt;</filename>, которые будут храниться "
+"в папке <filename>etc/security/msec/</filename>. Создание уровней является "
+"прерогативой опытных пользователей, которым требуется гибкая система "
+"настроек и защищённая система."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:165
-msgid "Keep in mind that user-modified parameters take precedence over default level settings."
-msgstr "Помните, что изменённые пользователем параметры превосходят дефолтные параметры уровня."
+msgid ""
+"Keep in mind that user-modified parameters take precedence over default "
+"level settings."
+msgstr ""
+"Помните, что изменённые пользователем параметры превосходят дефолтные "
+"параметры уровня."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:170
@@ -5590,13 +8754,39 @@ msgstr "<emphasis role=\"underline\">Уведомления безопаснос
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:173
-msgid "If you check the box <guibutton>Send security alerts by email to:</guibutton>, the security alerts generated by msec are going to be sent by local e-mail to the security administrator named in the nearby field. You can fill either a local user or a complete e-mail address (the local e-mail and the e-mail manager must be set accordingly). At last, you can receive the security alerts directly on your desktop.  Check the relevant box to enable it."
-msgstr "Если вы выбрали пункт <guibutton>Присылать уведомления безопасности по электронной почте по адресу:</guibutton>, то отчёты по безопасности , созданные msec, будут отправляться по локальной электронной почте администратору безопасности , указанному в соседнем поле. Вы можете либо указать имя учётной записи локального пользователя , либо указать адрес электронной почты полностью (чтобы это сработало, необходимо настроить локальные средства работы с электронной почтой и средства управления ею соответствующим образом). Наконец, вы можете получать уведомления по безопасности непосредственно с помощью рабочего стола . Просто отметьте соответствующий пункт, чтобы включить эти уведомления."
+msgid ""
+"If you check the box <guibutton>Send security alerts by email to:</"
+"guibutton>, the security alerts generated by msec are going to be sent by "
+"local e-mail to the security administrator named in the nearby field. You "
+"can fill either a local user or a complete e-mail address (the local e-mail "
+"and the e-mail manager must be set accordingly). At last, you can receive "
+"the security alerts directly on your desktop.  Check the relevant box to "
+"enable it."
+msgstr ""
+"Если вы выбрали пункт <guibutton>Присылать уведомления безопасности по "
+"электронной почте по адресу:</guibutton>, то отчёты по безопасности , "
+"созданные msec, будут отправляться по локальной электронной почте "
+"администратору безопасности , указанному в соседнем поле. Вы можете либо "
+"указать имя учётной записи локального пользователя , либо указать адрес "
+"электронной почты полностью (чтобы это сработало, необходимо настроить "
+"локальные средства работы с электронной почтой и средства управления ею "
+"соответствующим образом). Наконец, вы можете получать уведомления по "
+"безопасности непосредственно с помощью рабочего стола . Просто отметьте "
+"соответствующий пункт, чтобы включить эти уведомления."
 
 #. type: Content of: <section><section><section><important><para>
 #: en/msecgui.xml:182
-msgid "It is strongly advisable to enable the security alerts option in order to immediately inform the security administrator of possible security problems. If not, the administrator will have to regularly check the logs files available in <filename>/var/log/security.</filename>"
-msgstr "Настоятельно рекомендуем вам включить оповещения о безопасности для администратора безопасности, чтобы немедленно получать информацию о возможных проблемах с безопасностью. Если вы этого не сделаете, администратору придётся регулярно знакомиться с файлами журнала, хранящимися в каталоге <filename>/var/log/security</filename>."
+msgid ""
+"It is strongly advisable to enable the security alerts option in order to "
+"immediately inform the security administrator of possible security problems. "
+"If not, the administrator will have to regularly check the logs files "
+"available in <filename>/var/log/security.</filename>"
+msgstr ""
+"Настоятельно рекомендуем вам включить оповещения о безопасности для "
+"администратора безопасности, чтобы немедленно получать информацию о "
+"возможных проблемах с безопасностью. Если вы этого не сделаете, "
+"администратору придётся регулярно знакомиться с файлами журнала, хранящимися "
+"в каталоге <filename>/var/log/security</filename>."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:188
@@ -5605,8 +8795,20 @@ msgstr "<emphasis role=\"underline\">Опции безопасности:</empha
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:190
-msgid "Creating a customised level is not the only way to customise the computer security, it is also possible to use the tabs presented here after to change any option you want. Current configuration for msec is stored in <filename>/etc/security/msec/security.conf</filename>. This file contains the current security level name and the list of all the modifications done to the options."
-msgstr "Создание нетипичного уровня безопасности не является единственным способом настройки защиты компьютера. Вы также можете воспользоваться вкладками для изменения любого из нужных вам параметров. Текущие настройки msec хранятся в файле <filename>/etc/security/msec/security.conf</filename>. В этом файле содержатся данные о названии текущего уровня безопасности и список изменений, которые были внесены в его параметры."
+msgid ""
+"Creating a customised level is not the only way to customise the computer "
+"security, it is also possible to use the tabs presented here after to change "
+"any option you want. Current configuration for msec is stored in <filename>/"
+"etc/security/msec/security.conf</filename>. This file contains the current "
+"security level name and the list of all the modifications done to the "
+"options."
+msgstr ""
+"Создание нетипичного уровня безопасности не является единственным способом "
+"настройки защиты компьютера. Вы также можете воспользоваться вкладками для "
+"изменения любого из нужных вам параметров. Текущие настройки msec хранятся в "
+"файле <filename>/etc/security/msec/security.conf</filename>. В этом файле "
+"содержатся данные о названии текущего уровня безопасности и список "
+"изменений, которые были внесены в его параметры."
 
 #. type: Content of: <section><section><section><title>
 #: en/msecgui.xml:199
@@ -5615,8 +8817,13 @@ msgstr "Вкладка «Безопасность системы»"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:201
-msgid "This tab displays all the security options on the left side column, a description in the centre column, and their current values on the right side column."
-msgstr "На этой вкладке отображаются все параметры защиты в левом столбце, их описания в центральном столбце и текущие значения в правом столбце."
+msgid ""
+"This tab displays all the security options on the left side column, a "
+"description in the centre column, and their current values on the right side "
+"column."
+msgstr ""
+"На этой вкладке отображаются все параметры защиты в левом столбце, их "
+"описания в центральном столбце и текущие значения в правом столбце."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:207
@@ -5625,8 +8832,18 @@ msgstr "msecgui3.png"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:211
-msgid "To modify an option, double click on it and a new window appears (see screenshot below). It displays the option name, a short description, the actual and default values, and a drop down list where the new value can be selected. Click on the <guibutton>OK</guibutton> button to validate the choice."
-msgstr "Чтобы изменить параметр, дважды щёлкните на соответствующем пункте. В ответ будет открыто новое окно (см. приведённый ниже снимок). В окне будет показано название параметра, краткое описание, текущее и дефолтное значение, а также выпадающий список, с помощью которого можно выбрать это значение. Нажмите кнопку <guibutton>ОК</guibutton>, чтобы сделать ваш выбор."
+msgid ""
+"To modify an option, double click on it and a new window appears (see "
+"screenshot below). It displays the option name, a short description, the "
+"actual and default values, and a drop down list where the new value can be "
+"selected. Click on the <guibutton>OK</guibutton> button to validate the "
+"choice."
+msgstr ""
+"Чтобы изменить параметр, дважды щёлкните на соответствующем пункте. В ответ "
+"будет открыто новое окно (см. приведённый ниже снимок). В окне будет "
+"показано название параметра, краткое описание, текущее и дефолтное значение, "
+"а также выпадающий список, с помощью которого можно выбрать это значение. "
+"Нажмите кнопку <guibutton>ОК</guibutton>, чтобы сделать ваш выбор."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:219
@@ -5635,8 +8852,17 @@ msgstr "msecgui11.png"
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:224
-msgid "Do not forget when leaving msecgui to save definitively your configuration using the menu <guimenu>File -> Save the configuration</guimenu>. If you have changed the settings, msecgui allows you to preview the changes before saving them."
-msgstr "Не забудьте перед завершением работы msecgui сохранить ваши настройки с помощью пункта меню <guimenu>Файл -> Сохранить настройки</guimenu>. Если вами были внесены изменения в параметры, то msecgui предоставит вам возможность просмотреть список изменений, прежде чем эти изменения будут сохранены."
+msgid ""
+"Do not forget when leaving msecgui to save definitively your configuration "
+"using the menu <guimenu>File -> Save the configuration</guimenu>. If you "
+"have changed the settings, msecgui allows you to preview the changes before "
+"saving them."
+msgstr ""
+"Не забудьте перед завершением работы msecgui сохранить ваши настройки с "
+"помощью пункта меню <guimenu>Файл -> Сохранить настройки</guimenu>. Если "
+"вами были внесены изменения в параметры, то msecgui предоставит вам "
+"возможность просмотреть список изменений, прежде чем эти изменения будут "
+"сохранены."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:232
@@ -5650,8 +8876,11 @@ msgstr "Безопасность сети"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:240
-msgid "This tab displays all the network options and works like the previous tab"
-msgstr "На этой вкладке отображаются все параметры защиты работы в сети. Она работает подобно работе предыдущей вкладки."
+msgid ""
+"This tab displays all the network options and works like the previous tab"
+msgstr ""
+"На этой вкладке отображаются все параметры защиты работы в сети. Она "
+"работает подобно работе предыдущей вкладки."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:245
@@ -5665,13 +8894,25 @@ msgstr "Вкладка «Периодические проверки»"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:253
-msgid "Periodic checks aim to inform the security administrator by means of security alerts of all situations msec thinks potentially dangerous."
-msgstr "Периодические проверки предназначены для информирования администратора безопасности с помощью уведомлений по всем проблемам, которые msec считает потенциально опасными."
+msgid ""
+"Periodic checks aim to inform the security administrator by means of "
+"security alerts of all situations msec thinks potentially dangerous."
+msgstr ""
+"Периодические проверки предназначены для информирования администратора "
+"безопасности с помощью уведомлений по всем проблемам, которые msec считает "
+"потенциально опасными."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:257
-msgid "This tab displays all the periodic checks done by msec and their frequency if the box <guibutton>Enable periodic security checks</guibutton> is checked. Changes are done like in the previous tabs."
-msgstr "На этой вкладке отображаются все выполненные msec периодические проверки и их частота, если установлен флажок <guibutton>Включить периодические проверки безопасности</guibutton>. Изменения можно вносить аналогично внесению изменений на предыдущих вкладках."
+msgid ""
+"This tab displays all the periodic checks done by msec and their frequency "
+"if the box <guibutton>Enable periodic security checks</guibutton> is "
+"checked. Changes are done like in the previous tabs."
+msgstr ""
+"На этой вкладке отображаются все выполненные msec периодические проверки и "
+"их частота, если установлен флажок <guibutton>Включить периодические "
+"проверки безопасности</guibutton>. Изменения можно вносить аналогично "
+"внесению изменений на предыдущих вкладках."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:264
@@ -5685,8 +8926,19 @@ msgstr "Вкладка «Исключения»"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:272
-msgid "Sometimes alert messages are due to well known and wanted situations. In these cases they are useless and wasted time for the administrator. This tab allows you to create as many exceptions as you want to avoid unwanted alert messages. It is obviously empty at the first msec start. The screenshot below shows four exceptions."
-msgstr "Иногда оповещения создаются по хорошо известным и безопасным «проблемам». В таких случаях оповещения являются лишними и только тратят время администратора. С помощью этой вкладки вы можете создать любое количество исключений для устранения лишних уведомлений. При первом запуске msec список на этой вкладке, конечно же, будет пустым. На следующем снимке показаны исключения."
+msgid ""
+"Sometimes alert messages are due to well known and wanted situations. In "
+"these cases they are useless and wasted time for the administrator. This tab "
+"allows you to create as many exceptions as you want to avoid unwanted alert "
+"messages. It is obviously empty at the first msec start. The screenshot "
+"below shows four exceptions."
+msgstr ""
+"Иногда оповещения создаются по хорошо известным и безопасным «проблемам». В "
+"таких случаях оповещения являются лишними и только тратят время "
+"администратора. С помощью этой вкладки вы можете создать любое количество "
+"исключений для устранения лишних уведомлений. При первом запуске msec список "
+"на этой вкладке, конечно же, будет пустым. На следующем снимке показаны "
+"исключения."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:280
@@ -5695,8 +8947,11 @@ msgstr "msecgui6.png"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:284
-msgid "To create an exception, click on the <guibutton>Add a rule</guibutton> button"
-msgstr "Чтобы создать запись исключения, нажмите кнопку <guibutton>Добавить правило</guibutton>."
+msgid ""
+"To create an exception, click on the <guibutton>Add a rule</guibutton> button"
+msgstr ""
+"Чтобы создать запись исключения, нажмите кнопку <guibutton>Добавить правило</"
+"guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:289
@@ -5705,8 +8960,20 @@ msgstr "msecgui7.png"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:293
-msgid "Select the wanted periodic check in the drop down list called <guilabel>Check</guilabel> and then, enter the <guilabel>Exception</guilabel> in the text area. Adding an exception is obviously not definitive, you can either delete it using the <guibutton>Delete</guibutton> button of the <guilabel>Exceptions</guilabel> tab or modify it with a double clicK."
-msgstr "Выберите желаемые периодические проверки с помощью выпадающего списка <guilabel>Проверка</guilabel>, введите <guilabel>Исключение</guilabel> в соответствующее поле. Конечно же, добавление исключения не является окончательным. Вы можете либо удалить его с помощью нажатия кнопки <guibutton>Удалить</guibutton> на вкладке <guilabel>Исключения</guilabel>, или изменить созданную запись исключения двойным щелчком левой кнопкой мыши на соответствующем пункте."
+msgid ""
+"Select the wanted periodic check in the drop down list called "
+"<guilabel>Check</guilabel> and then, enter the <guilabel>Exception</"
+"guilabel> in the text area. Adding an exception is obviously not definitive, "
+"you can either delete it using the <guibutton>Delete</guibutton> button of "
+"the <guilabel>Exceptions</guilabel> tab or modify it with a double clicK."
+msgstr ""
+"Выберите желаемые периодические проверки с помощью выпадающего списка "
+"<guilabel>Проверка</guilabel>, введите <guilabel>Исключение</guilabel> в "
+"соответствующее поле. Конечно же, добавление исключения не является "
+"окончательным. Вы можете либо удалить его с помощью нажатия кнопки "
+"<guibutton>Удалить</guibutton> на вкладке <guilabel>Исключения</guilabel>, "
+"или изменить созданную запись исключения двойным щелчком левой кнопкой мыши "
+"на соответствующем пункте."
 
 #. type: Content of: <section><section><section><title>
 #: en/msecgui.xml:303
@@ -5715,13 +8982,38 @@ msgstr "Права доступа"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:304
-msgid "This tab is intended for file and directory permissions checking and enforcement."
-msgstr "Эту вкладка предназначена для настройки проверок прав доступа к файлам и каталогам и принудительного установления соответствующих прав."
+msgid ""
+"This tab is intended for file and directory permissions checking and "
+"enforcement."
+msgstr ""
+"Эту вкладка предназначена для настройки проверок прав доступа к файлам и "
+"каталогам и принудительного установления соответствующих прав."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:306
-msgid "Like for the security, msec owns different permissions levels (standard, secure, ..), they are enabled accordingly with the chosen security level. You can create your own customised permissions levels, saving them into specific files called <filename>perm.&lt;levelname> </filename> placed into the folder <filename>etc/security/msec/</filename> . This function is intended for power users which require a customised configuration. It is also possible to use the tab presented here after to change any permission you want. Current configuration is stored in <filename>/etc/security/msec/perms.conf.</filename> This file contains the list of all the modifications done to the permissions."
-msgstr "Подобно уровням защиты, в msec предусмотрены различные уровни прав доступа (стандартный, безопасный, ..), которые включаются в соответствии с заданным уровнем безопасности . Вы можете создавать собственные нетипичные уровни прав доступа, сохранять их в соответствующих файлах с названиями <filename>perm.&lt;Название уровня></filename>в каталог <filename>etc/security/msec/</filename>. Конечно же , этим стоит пользоваться имея определенный опыт и причину для создания нетипичного уровня. Кроме того, можно воспользоваться вкладкой окна настроек для внесения изменений в уже созданные права доступа. Текущие настройки сохраняются в файле <filename>/etc/security/msec/perms.conf</filename>. Этот файл содержит список изменений, которые были внесены для прав доступа."
+msgid ""
+"Like for the security, msec owns different permissions levels (standard, "
+"secure, ..), they are enabled accordingly with the chosen security level. "
+"You can create your own customised permissions levels, saving them into "
+"specific files called <filename>perm.&lt;levelname> </filename> placed into "
+"the folder <filename>etc/security/msec/</filename> . This function is "
+"intended for power users which require a customised configuration. It is "
+"also possible to use the tab presented here after to change any permission "
+"you want. Current configuration is stored in <filename>/etc/security/msec/"
+"perms.conf.</filename> This file contains the list of all the modifications "
+"done to the permissions."
+msgstr ""
+"Подобно уровням защиты, в msec предусмотрены различные уровни прав доступа "
+"(стандартный, безопасный, ..), которые включаются в соответствии с заданным "
+"уровнем безопасности . Вы можете создавать собственные нетипичные уровни "
+"прав доступа, сохранять их в соответствующих файлах с названиями "
+"<filename>perm.&lt;Название уровня></filename>в каталог <filename>etc/"
+"security/msec/</filename>. Конечно же , этим стоит пользоваться имея "
+"определенный опыт и причину для создания нетипичного уровня. Кроме того, "
+"можно воспользоваться вкладкой окна настроек для внесения изменений в уже "
+"созданные права доступа. Текущие настройки сохраняются в файле <filename>/"
+"etc/security/msec/perms.conf</filename>. Этот файл содержит список "
+"изменений, которые были внесены для прав доступа."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:318
@@ -5730,28 +9022,61 @@ msgstr "msecgui8.png"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:321
-msgid "Default permissions are visible as a list of rules (a rule per line). You can see on the left side, the file or folder concerned by the rule, then the owner, then the group and then the permissions given by the rule. If, for a given rule:"
-msgstr "Типичные права доступа отображаются в виде списка правил (одно правило на строку). В левом столбце показаны файл или папка, которых касаются правила, в следующем столбце показан владелец, дальше группа, а затем столбик прав доступа, предоставляемый этим. Если для предоставленного правила:"
+msgid ""
+"Default permissions are visible as a list of rules (a rule per line). You "
+"can see on the left side, the file or folder concerned by the rule, then the "
+"owner, then the group and then the permissions given by the rule. If, for a "
+"given rule:"
+msgstr ""
+"Типичные права доступа отображаются в виде списка правил (одно правило на "
+"строку). В левом столбце показаны файл или папка, которых касаются правила, "
+"в следующем столбце показан владелец, дальше группа, а затем столбик прав "
+"доступа, предоставляемый этим. Если для предоставленного правила:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:327
-msgid "the box <guilabel>Enforce</guilabel> is not checked, msec only checks if the defined permissions for this rule are respected and sends an alert message if not, but does not change anything."
-msgstr "пункт <guilabel>Принудительно</guilabel> не обозначен, msec выполняет только проверку: выполняются ли ограничения прав доступа, определённые правилом, и посылает текстовые оповещения, если они не выполнятся, но никакие изменения не вносятся."
+msgid ""
+"the box <guilabel>Enforce</guilabel> is not checked, msec only checks if the "
+"defined permissions for this rule are respected and sends an alert message "
+"if not, but does not change anything."
+msgstr ""
+"пункт <guilabel>Принудительно</guilabel> не обозначен, msec выполняет только "
+"проверку: выполняются ли ограничения прав доступа, определённые правилом, и "
+"посылает текстовые оповещения, если они не выполнятся, но никакие изменения "
+"не вносятся."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:333
-msgid "the box <guilabel>Enforce</guilabel> is checked, then msec will rule the permissions respect at the first periodic check and overwrite the permissions."
-msgstr "пункт <guilabel>Принудительно</guilabel> обозначен, msec выполняет проверку: выполняются ли ограничения прав доступа, определённые правилом, и исправляет права доступа."
+msgid ""
+"the box <guilabel>Enforce</guilabel> is checked, then msec will rule the "
+"permissions respect at the first periodic check and overwrite the "
+"permissions."
+msgstr ""
+"пункт <guilabel>Принудительно</guilabel> обозначен, msec выполняет проверку: "
+"выполняются ли ограничения прав доступа, определённые правилом, и исправляет "
+"права доступа."
 
 #. type: Content of: <section><section><section><important><para>
 #: en/msecgui.xml:337
-msgid "For this to work, the option CHECK_PERMS in the <emphasis role=\"bold\">Periodic check tab</emphasis> must be configured accordingly."
-msgstr "Для того, чтобы это сработало, следует соответствующим образом настроить параметр CHECK_PERMS на <emphasis role=\"bold\">вкладке «Периодические проверки»</emphasis>."
+msgid ""
+"For this to work, the option CHECK_PERMS in the <emphasis role=\"bold"
+"\">Periodic check tab</emphasis> must be configured accordingly."
+msgstr ""
+"Для того, чтобы это сработало, следует соответствующим образом настроить "
+"параметр CHECK_PERMS на <emphasis role=\"bold\">вкладке «Периодические "
+"проверки»</emphasis>."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:339
-msgid "To create a new rule, click on the <guibutton> Add a rule</guibutton> button and fill the fields as shown in the example below. The joker * is allowed in the <guilabel>File</guilabel> field. “current” means no modification."
-msgstr "Чтобы создать новое правило, нажмите кнопку <guibutton>Добавить правило</guibutton> и заполните поля так, как это показано в следующем примере. В поле <guilabel>Файл</guilabel> можно использовать заменитель *. \"Текущий\" означает \"не вносить изменения\"."
+msgid ""
+"To create a new rule, click on the <guibutton> Add a rule</guibutton> button "
+"and fill the fields as shown in the example below. The joker * is allowed in "
+"the <guilabel>File</guilabel> field. “current” means no modification."
+msgstr ""
+"Чтобы создать новое правило, нажмите кнопку <guibutton>Добавить правило</"
+"guibutton> и заполните поля так, как это показано в следующем примере. В "
+"поле <guilabel>Файл</guilabel> можно использовать заменитель *. \"Текущий\" "
+"означает \"не вносить изменения\"."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:345
@@ -5760,23 +9085,65 @@ msgstr "msecgui9.png"
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:348
-msgid "Click on the <guibutton>OK</guibutton> button to validate the choice and do not forget when leaving to save definitively your configuration using the menu <guimenu>File -> Save the configuration</guimenu>. If you have changed the settings, msecgui allows you to preview the changes before saving them."
-msgstr "Нажмите кнопку <guibutton>ОК</guibutton> для подтверждения, и не забудьте перед закрытием окна сохранить ваши настройки с помощью пункта меню <guimenu>Файл -> Сохранить настройки</guimenu>. Если вами были внесены изменения в параметры, то msecgui предоставит вам возможность просмотреть список изменений, прежде чем эти изменения будут сохранены."
+msgid ""
+"Click on the <guibutton>OK</guibutton> button to validate the choice and do "
+"not forget when leaving to save definitively your configuration using the "
+"menu <guimenu>File -> Save the configuration</guimenu>. If you have changed "
+"the settings, msecgui allows you to preview the changes before saving them."
+msgstr ""
+"Нажмите кнопку <guibutton>ОК</guibutton> для подтверждения, и не забудьте "
+"перед закрытием окна сохранить ваши настройки с помощью пункта меню "
+"<guimenu>Файл -> Сохранить настройки</guimenu>. Если вами были внесены "
+"изменения в параметры, то msecgui предоставит вам возможность просмотреть "
+"список изменений, прежде чем эти изменения будут сохранены."
 
 #. type: Content of: <section><section><section><note><para>
 #: en/msecgui.xml:353
-msgid "It is also possible to create or modify the rules by editing the configuration file <filename>/etc/security/msec/perms.conf</filename>."
-msgstr "Кроме того, можно создавать или вносить изменения в правила с помощью редактирования файла настроек <filename>/etc/security/msec/perms.conf</filename>."
+msgid ""
+"It is also possible to create or modify the rules by editing the "
+"configuration file <filename>/etc/security/msec/perms.conf</filename>."
+msgstr ""
+"Кроме того, можно создавать или вносить изменения в правила с помощью "
+"редактирования файла настроек <filename>/etc/security/msec/perms.conf</"
+"filename>."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:356
-msgid "Changes in the <emphasis role=\"bold\">Permission tab</emphasis> (or directly in the configuration file) are taken into account at the first periodic check (see the option CHECK_PERMS in the <emphasis role=\"bold\">Periodic checks tab</emphasis>). If you want them to be taken immediately into account, use the msecperms command in a console with root rights. You can use before, the msecperms -p command to know the permissions that will be changed by msecperms."
-msgstr "Изменения на <emphasis role=\"bold\">вкладке «Права доступа»</emphasis> (или непосредственно с помощью файла настроек) учитываются при выполнении первой же периодической проверки (см. пункт CHECK_PERMS на <emphasis role=\"bold\">вкладке «Периодические проверки»</emphasis>). Если вы хотите, чтобы изменения были применены немедленно, то воспользуйтесь командой msecperms в консоли. Команду следует вводить от имени пользователя root. Чтобы ознакомиться со списком прав доступа, которые будут изменены программой msecperms, воспользуйтесь командой msecperms -p."
+msgid ""
+"Changes in the <emphasis role=\"bold\">Permission tab</emphasis> (or "
+"directly in the configuration file) are taken into account at the first "
+"periodic check (see the option CHECK_PERMS in the <emphasis role=\"bold"
+"\">Periodic checks tab</emphasis>). If you want them to be taken immediately "
+"into account, use the msecperms command in a console with root rights. You "
+"can use before, the msecperms -p command to know the permissions that will "
+"be changed by msecperms."
+msgstr ""
+"Изменения на <emphasis role=\"bold\">вкладке «Права доступа»</emphasis> (или "
+"непосредственно с помощью файла настроек) учитываются при выполнении первой "
+"же периодической проверки (см. пункт CHECK_PERMS на <emphasis role=\"bold"
+"\">вкладке «Периодические проверки»</emphasis>). Если вы хотите, чтобы "
+"изменения были применены немедленно, то воспользуйтесь командой msecperms в "
+"консоли. Команду следует вводить от имени пользователя root. Чтобы "
+"ознакомиться со списком прав доступа, которые будут изменены программой "
+"msecperms, воспользуйтесь командой msecperms -p."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:363
-msgid "Do not forget that if you modify the permissions in a console or in a file manager, for a file where the box <guilabel>Enforce </guilabel> is checked in the <emphasis role=\"bold\">Permissions tab </emphasis>, msecgui will write the old permissions back after a while, accordingly to the configuration of the options CHECK_PERMS and CHECK_PERMS_ENFORCE in the <emphasis role=\"bold\">Periodic Checks tab </emphasis>."
-msgstr "Не забывайте, что если вы внесёте изменения в условиях доступа к определенному файлу с помощью консольной команды или программы для управления файлами, и пункт <guilabel>Принудительно</guilabel> на <emphasis role=\"bold\">вкладке «Права доступа»</emphasis> для этого файла будет обозначен, то msecgui через некоторое время вернёт предыдущие права доступа, в соответствии с настройками параметров CHECK_PERMS и CHECK_PERMS_ENFORCE на <emphasis role=\"bold\">вкладке «Периодические проверки» </emphasis>."
+msgid ""
+"Do not forget that if you modify the permissions in a console or in a file "
+"manager, for a file where the box <guilabel>Enforce </guilabel> is checked "
+"in the <emphasis role=\"bold\">Permissions tab </emphasis>, msecgui will "
+"write the old permissions back after a while, accordingly to the "
+"configuration of the options CHECK_PERMS and CHECK_PERMS_ENFORCE in the "
+"<emphasis role=\"bold\">Periodic Checks tab </emphasis>."
+msgstr ""
+"Не забывайте, что если вы внесёте изменения в условиях доступа к "
+"определенному файлу с помощью консольной команды или программы для "
+"управления файлами, и пункт <guilabel>Принудительно</guilabel> на <emphasis "
+"role=\"bold\">вкладке «Права доступа»</emphasis> для этого файла будет "
+"обозначен, то msecgui через некоторое время вернёт предыдущие права доступа, "
+"в соответствии с настройками параметров CHECK_PERMS и CHECK_PERMS_ENFORCE на "
+"<emphasis role=\"bold\">вкладке «Периодические проверки» </emphasis>."
 
 #. type: Content of: <section><info><title>
 #: en/otherMageiaTools.xml:4
@@ -5785,8 +9152,14 @@ msgstr "Другие инструменты Mageia"
 
 #. type: Content of: <section><para>
 #: en/otherMageiaTools.xml:7
-msgid "There are more Mageia tools than those that can be started in the Mageia Control Center. Click on a link below to learn more, or continue reading the next pages."
-msgstr "В Mageia предусмотрено больше инструментов, чем перечень инструментов из Центра управления Mageia. Нажмите ссылку внизу, чтобы узнать больше или продолжите чтение последующих страниц руководства."
+msgid ""
+"There are more Mageia tools than those that can be started in the Mageia "
+"Control Center. Click on a link below to learn more, or continue reading the "
+"next pages."
+msgstr ""
+"В Mageia предусмотрено больше инструментов, чем перечень инструментов из "
+"Центра управления Mageia. Нажмите ссылку внизу, чтобы узнать больше или "
+"продолжите чтение последующих страниц руководства."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/otherMageiaTools.xml:11
@@ -5835,208 +9208,368 @@ msgstr "Введение в rpmdrake"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/rpmdrake.xml:21
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">rpmdrake</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">rpmdrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">rpmdrake</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">rpmdrake</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><section><para>
 #: en/rpmdrake.xml:20
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/>, also known as drakrpm, is a program for installing, uninstalling and updating packages. It is the graphical user interface of URPMI. At each start up, it will check online package lists (called 'media') downloaded straight from Mageia's official servers, and will show you each time the latest applications and packages available for your computer. A filter system allows you to display only certain types of packages: you may display only installed applications (by default), or only available updates. You can also view only not installed packages. You can also search by the name of a package, or in the summaries of descriptions or in the full descriptions of packages or in the file names included in the packages."
-msgstr "С помощью этого инструмента<placeholder type=\"footnote\" id=\"0\"/>, также известного под названием drakrpm, можно устанавливать, удалять и обновлять пакеты с программным обеспечением. Программа является графическим интерфейсом к URPMI. Во время каждого запуска она будет проверять списки пакетов в интернете (которые называются «источниками» пакетов), полученные непосредственно с официальных серверов Mageia и будет показывать список самых свежих пакетов с программным обеспечением для вашей системы. Система фильтрации предоставляет вам возможность просматривать списки пакетов только определенного типа: вы можете просмотреть список установленных пакетов (фильтрация по умолчанию) или только доступные обновления. Также можно ознакомиться со списком неустановленных пакетов. Вы можете найти пакет по названию или слову в резюме описания пакета, а также по названиям файлов, которые являются частью пакета."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/>, also known as drakrpm, "
+"is a program for installing, uninstalling and updating packages. It is the "
+"graphical user interface of URPMI. At each start up, it will check online "
+"package lists (called 'media') downloaded straight from Mageia's official "
+"servers, and will show you each time the latest applications and packages "
+"available for your computer. A filter system allows you to display only "
+"certain types of packages: you may display only installed applications (by "
+"default), or only available updates. You can also view only not installed "
+"packages. You can also search by the name of a package, or in the summaries "
+"of descriptions or in the full descriptions of packages or in the file names "
+"included in the packages."
+msgstr ""
+"С помощью этого инструмента<placeholder type=\"footnote\" id=\"0\"/>, также "
+"известного под названием drakrpm, можно устанавливать, удалять и обновлять "
+"пакеты с программным обеспечением. Программа является графическим "
+"интерфейсом к URPMI. Во время каждого запуска она будет проверять списки "
+"пакетов в интернете (которые называются «источниками» пакетов), полученные "
+"непосредственно с официальных серверов Mageia и будет показывать список "
+"самых свежих пакетов с программным обеспечением для вашей системы. Система "
+"фильтрации предоставляет вам возможность просматривать списки пакетов только "
+"определенного типа: вы можете просмотреть список установленных пакетов "
+"(фильтрация по умолчанию) или только доступные обновления. Также можно "
+"ознакомиться со списком неустановленных пакетов. Вы можете найти пакет по "
+"названию или слову в резюме описания пакета, а также по названиям файлов, "
+"которые являются частью пакета."
 
 #. type: Content of: <section><section><para>
 #: en/rpmdrake.xml:35
-msgid "To work, rpmdrake needs the repositories to be configured with <xref linkend=\"drakrpm-edit-media\"/> ."
-msgstr "Для надлежащей работы rpmdrake следует настроить параметры репозиториев с помощью <xref linkend=\"drakrpm-edit-media\"/>."
+msgid ""
+"To work, rpmdrake needs the repositories to be configured with <xref linkend="
+"\"drakrpm-edit-media\"/> ."
+msgstr ""
+"Для надлежащей работы rpmdrake следует настроить параметры репозиториев с "
+"помощью <xref linkend=\"drakrpm-edit-media\"/>."
+
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "Основные части окна"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Фильтрация по типу пакета:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
-msgid "This filter allows you to display only certain types of packages. The first time you start the manager, it only displays applications with a graphical interface. You can display either all the packages and all their dependencies and libraries or only package groups such as applications only, updates only or backported packages from newer versions of Mageia."
-msgstr "Этот фильтр позволяет сузить список пакетов до определенного типа. Во время первого запуска программы для управления пакетами в списке будут только программы с графическим интерфейсом. Вы можете предписать программе отображать все пакеты и все зависимости этих пакетов вместе с библиотеками или предписать показывать только группы пакетов (цельные программные комплексы), только обновления или только пакеты из более новых версий Mageia."
+#: en/rpmdrake.xml:69
+msgid ""
+"This filter allows you to display only certain types of packages. The first "
+"time you start the manager, it only displays applications with a graphical "
+"interface. You can display either all the packages and all their "
+"dependencies and libraries or only package groups such as applications only, "
+"updates only or backported packages from newer versions of Mageia."
+msgstr ""
+"Этот фильтр позволяет сузить список пакетов до определенного типа. Во время "
+"первого запуска программы для управления пакетами в списке будут только "
+"программы с графическим интерфейсом. Вы можете предписать программе "
+"отображать все пакеты и все зависимости этих пакетов вместе с библиотеками "
+"или предписать показывать только группы пакетов (цельные программные "
+"комплексы), только обновления или только пакеты из более новых версий Mageia."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
-msgid "The default filter setting is for new entrants to Linux or Mageia, who probably do not want command line or specialist tools.  Since you're reading this documentation, you're obviously interested in improving your knowledge of Mageia, so it is best to set this filter to \"All\"."
-msgstr "Режим фильтрации по умолчанию предназначен для пользователей, не имеющих значительного опыта использования Linux или Mageia, то есть для тех, кому не нужны программы, которые руководствуются командной строкой, программы для специалистов. Поскольку вы читаете это руководство, вы очевидно заинтересованы в расширении ваших знаний по Mageia, следовательно, лучше выбрать вариант «Все»."
+#: en/rpmdrake.xml:77
+msgid ""
+"The default filter setting is for new entrants to Linux or Mageia, who "
+"probably do not want command line or specialist tools.  Since you're reading "
+"this documentation, you're obviously interested in improving your knowledge "
+"of Mageia, so it is best to set this filter to \"All\"."
+msgstr ""
+"Режим фильтрации по умолчанию предназначен для пользователей, не имеющих "
+"значительного опыта использования Linux или Mageia, то есть для тех, кому не "
+"нужны программы, которые руководствуются командной строкой, программы для "
+"специалистов. Поскольку вы читаете это руководство, вы очевидно "
+"заинтересованы в расширении ваших знаний по Mageia, следовательно, лучше "
+"выбрать вариант «Все»."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
-msgid "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </firstterm>"
-msgstr "<firstterm> <emphasis role=\"bold\">Фильтрация по состоянию пакета:</emphasis> </firstterm>"
+#: en/rpmdrake.xml:86
+msgid ""
+"<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
+"firstterm>"
+msgstr ""
+"<firstterm> <emphasis role=\"bold\">Фильтрация по состоянию пакета:</"
+"emphasis> </firstterm>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
-msgid "This filter allows you to view only the installed packages, only the packages that are not installed or all of the packages, both installed and not installed."
-msgstr "При помощи этого фильтра вы можете приказать программе показывать только установленные пакеты, пакеты которые еще не установлены или все пакеты, установленные и неустановленные."
+#: en/rpmdrake.xml:89
+msgid ""
+"This filter allows you to view only the installed packages, only the "
+"packages that are not installed or all of the packages, both installed and "
+"not installed."
+msgstr ""
+"При помощи этого фильтра вы можете приказать программе показывать только "
+"установленные пакеты, пакеты которые еще не установлены или все пакеты, "
+"установленные и неустановленные."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr "<emphasis role=\"bold\">Режим поиска:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
-msgid "Click on this icon to search through the package names, through their summaries, through their complete description or through the files included in the packages."
-msgstr "Нажмите этот значок, чтобы выбрать данные, в которых будет выполняться поиск: названия пакетов, резюме, полные описания или списки файлов, содержащихся в пакетах."
+#: en/rpmdrake.xml:97
+msgid ""
+"Click on this icon to search through the package names, through their "
+"summaries, through their complete description or through the files included "
+"in the packages."
+msgstr ""
+"Нажмите этот значок, чтобы выбрать данные, в которых будет выполняться "
+"поиск: названия пакетов, резюме, полные описания или списки файлов, "
+"содержащихся в пакетах."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr "<emphasis role=\"bold\">Поле «Найти»:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
-msgid "Enter here one or more key words. If you want to use more than one keyword for searching use '|' between keywords, e.g. To search for \"mplayer\" and \"xine\" at the same time type 'mplayer | xine'."
-msgstr "В этом поле можно указать одно или несколько ключевых слов. Если для поиска вы хотите использовать несколько ключевых слов, отделите их символом «|». Например, если вы хотите найти пакеты для mplayer или xine, укажите: «mplayer | xine» (без кавычек)."
+#: en/rpmdrake.xml:105
+msgid ""
+"Enter here one or more key words. If you want to use more than one keyword "
+"for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
+"\"xine\" at the same time type 'mplayer | xine'."
+msgstr ""
+"В этом поле можно указать одно или несколько ключевых слов. Если для поиска "
+"вы хотите использовать несколько ключевых слов, отделите их символом «|». "
+"Например, если вы хотите найти пакеты для mplayer или xine, укажите: "
+"«mplayer | xine» (без кавычек)."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr "<emphasis role=\"bold\">Стереть все:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
-msgid "This icon can erase in one click all the key words entered in the \"Find\" box ."
+#: en/rpmdrake.xml:113
+msgid ""
+"This icon can erase in one click all the key words entered in the \"Find\" "
+"box ."
 msgstr "Нажав на этот значок, можно удалить все ключевые слова в поле «Найти»."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr "<emphasis role=\"bold\">Список категорий:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
-msgid "This side bar groups all applications and packages into clear categories and sub categories."
-msgstr "На этой панели приведён список всех программ и пакетов, распределённых по категориям и подкатегориям."
+#: en/rpmdrake.xml:120
+msgid ""
+"This side bar groups all applications and packages into clear categories and "
+"sub categories."
+msgstr ""
+"На этой панели приведён список всех программ и пакетов, распределённых по "
+"категориям и подкатегориям."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr "<emphasis role=\"bold\">Панель описания:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
-msgid "This panel displays the package's name, its summary and complete description. It displays many useful elements about the selected package. It can also show precise details about the package, the files included in the package as well as a list of the last changes made by the maintainer."
-msgstr "Эта панель отображает имя пакета, его краткое и полное описание. Здесь много полезных данных о выбранном пакете, а также точные данные относительно пакета, включенных в него файлов и список изменений, созданный сопровождающим пакета."
+#: en/rpmdrake.xml:127
+msgid ""
+"This panel displays the package's name, its summary and complete "
+"description. It displays many useful elements about the selected package. It "
+"can also show precise details about the package, the files included in the "
+"package as well as a list of the last changes made by the maintainer."
+msgstr ""
+"Эта панель отображает имя пакета, его краткое и полное описание. Здесь много "
+"полезных данных о выбранном пакете, а также точные данные относительно "
+"пакета, включенных в него файлов и список изменений, созданный "
+"сопровождающим пакета."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "Столбец состояния"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
-msgid "Once you correctly set the filters, you can find your software either by category (in area 6 above) or by name/summary/description using area 4. A list of packages fulfilling your query and, don't forget, the chosen medium is shown with different status markers according to whether each package is installed/not installed/an update... To change this status, just check or uncheck the box before the package name and click on <guibutton>Apply</guibutton>."
-msgstr "После определения параметров фильтрации вы сможете искать программное обеспечение либо по категориям (в области 6 на рисунке), либо по названию/резюме/описанию в области 4. Список пакетов, которые соответствуют вашему запросу на указанных вами носителях пакетов, будет показан с пометками состояния установлено/не установлено/обновление. Чтобы изменить это положение, просто отметьте или снимите отметку с пункта перед названием пакета в списке и нажмите кнопку <guibutton>Применить</guibutton>."
+#: en/rpmdrake.xml:139
+msgid ""
+"Once you correctly set the filters, you can find your software either by "
+"category (in area 6 above) or by name/summary/description using area 4. A "
+"list of packages fulfilling your query and, don't forget, the chosen medium "
+"is shown with different status markers according to whether each package is "
+"installed/not installed/an update... To change this status, just check or "
+"uncheck the box before the package name and click on <guibutton>Apply</"
+"guibutton>."
+msgstr ""
+"После определения параметров фильтрации вы сможете искать программное "
+"обеспечение либо по категориям (в области 6 на рисунке), либо по названию/"
+"резюме/описанию в области 4. Список пакетов, которые соответствуют вашему "
+"запросу на указанных вами носителях пакетов, будет показан с пометками "
+"состояния установлено/не установлено/обновление. Чтобы изменить это "
+"положение, просто отметьте или снимите отметку с пункта перед названием "
+"пакета в списке и нажмите кнопку <guibutton>Применить</guibutton>."
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Иконка"
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr "Условные обозначения"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "../rpmdrake2.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr "Этот пакет уже установлен"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "../rpmdrake3.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr "Этот пакет будет установлен"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "../rpmdrake4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr "Состояние этого пакета изменять нельзя"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "../rpmdrake5.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr "Этот пакет является обновлением"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "../rpmdrake6.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr "Этот пакет будет удалён"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr "Примеры на приведенном скриншоте:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
-msgid "If I uncheck digikam (the green arrow tell us it is installed), the status icon will go red with an up arrow and it will be uninstalled when clicking on <guibutton>Apply</guibutton>."
-msgstr "Если снять отметку с пункта digikam (зелёная стрелка вниз означает, что пакет установлен), значок состояния станет красным с изображением стрелки вверх. Пакет будет удален сразу после нажатия кнопки <guibutton>Применить</guibutton>."
+#: en/rpmdrake.xml:219
+msgid ""
+"If I uncheck digikam (the green arrow tell us it is installed), the status "
+"icon will go red with an up arrow and it will be uninstalled when clicking "
+"on <guibutton>Apply</guibutton>."
+msgstr ""
+"Если снять отметку с пункта digikam (зелёная стрелка вниз означает, что "
+"пакет установлен), значок состояния станет красным с изображением стрелки "
+"вверх. Пакет будет удален сразу после нажатия кнопки <guibutton>Применить</"
+"guibutton>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
-msgid "If I check qdigidoc (which is not installed, see the status), the orange with a down arrow status icon will appear and and it will be installed when clicking on <guibutton>Apply</guibutton>."
-msgstr "Если отметить пункт qdigidoc (пакет не установлен, как видно из колонки статуса), в колонке статуса появится оранжевая пиктограмма состояния со стрелкой вниз. Пакет будет установлен сразу после нажатия кнопки <guibutton>Применить</guibutton>."
+#: en/rpmdrake.xml:227
+msgid ""
+"If I check qdigidoc (which is not installed, see the status), the orange "
+"with a down arrow status icon will appear and and it will be installed when "
+"clicking on <guibutton>Apply</guibutton>."
+msgstr ""
+"Если отметить пункт qdigidoc (пакет не установлен, как видно из колонки "
+"статуса), в колонке статуса появится оранжевая пиктограмма состояния со "
+"стрелкой вниз. Пакет будет установлен сразу после нажатия кнопки "
+"<guibutton>Применить</guibutton>."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr "Зависимости"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
-msgid "Some packages need other packages called dependencies in order to work. They are for example libraries or tools. In this case, Rpmdrake displays an information window allowing you to choose whether to accept the selected dependencies, cancel the operation or get more information (see above). It may also happen that various packages are able to provide the needed library, in which case rpmdrake displays the list of alternatives with a button to get more information and another button to choose which package to install."
-msgstr "Для правильной работы некоторых пакетов придётся установить другие пакеты, которые называют зависимостями. Эти пакеты содержат библиотеки или дополнительные инструменты. Если вам попадётся такой пакет, rpmdrake покажет информационное окно, с помощью которого вы сможете согласиться с установкой зависимостей, отменить установку или получить дополнительные данные (см. выше). Также вы сможете выбрать нужный вам пакет, если зависимости можно удовлетворить в несколько способов, то rpmdrake просто покажет вам окно со списком вариантов удовлетворения зависимостей и кнопками получения дополнительных данных и выбора пакета, который следует установить."
+#: en/rpmdrake.xml:245
+msgid ""
+"Some packages need other packages called dependencies in order to work. They "
+"are for example libraries or tools. In this case, Rpmdrake displays an "
+"information window allowing you to choose whether to accept the selected "
+"dependencies, cancel the operation or get more information (see above). It "
+"may also happen that various packages are able to provide the needed "
+"library, in which case rpmdrake displays the list of alternatives with a "
+"button to get more information and another button to choose which package to "
+"install."
+msgstr ""
+"Для правильной работы некоторых пакетов придётся установить другие пакеты, "
+"которые называют зависимостями. Эти пакеты содержат библиотеки или "
+"дополнительные инструменты. Если вам попадётся такой пакет, rpmdrake покажет "
+"информационное окно, с помощью которого вы сможете согласиться с установкой "
+"зависимостей, отменить установку или получить дополнительные данные (см. "
+"выше). Также вы сможете выбрать нужный вам пакет, если зависимости можно "
+"удовлетворить в несколько способов, то rpmdrake просто покажет вам окно со "
+"списком вариантов удовлетворения зависимостей и кнопками получения "
+"дополнительных данных и выбора пакета, который следует установить."
 
 #. type: Content of: <section><info><title>
 #: en/scannerdrake.xml:10
@@ -6055,23 +9588,44 @@ msgstr "Установка"
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/scannerdrake.xml:22
-msgid "You can start this tool from the command line, by typing <emphasis>scannerdrake</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">scannerdrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing "
+"<emphasis>scannerdrake</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">scannerdrake</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:21
-msgid "This tool <placeholder type=\"footnote\" id=\"0\"/> allows you to configure a single scanner device or a multifunction device which includes scanning. It also allows you to share local devices connected to this computer with a remote computer or to access remote scanners."
-msgstr "С помощью этого модуля <placeholder type=\"footnote\" id=\"0\"/> вы можете настроить сканер или многофункциональное устройство, в котором предусмотрена возможность сканирования. Кроме того, с помощью модуля можно предоставить в совместное использование устройства, соединённые с вашим компьютером в пределах локальной сети или получить доступ к сканерам, соединённых с удаленными компьютерами."
+msgid ""
+"This tool <placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"a single scanner device or a multifunction device which includes scanning. "
+"It also allows you to share local devices connected to this computer with a "
+"remote computer or to access remote scanners."
+msgstr ""
+"С помощью этого модуля <placeholder type=\"footnote\" id=\"0\"/> вы можете "
+"настроить сканер или многофункциональное устройство, в котором предусмотрена "
+"возможность сканирования. Кроме того, с помощью модуля можно предоставить в "
+"совместное использование устройства, соединённые с вашим компьютером в "
+"пределах локальной сети или получить доступ к сканерам, соединённых с "
+"удаленными компьютерами."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:29
-msgid "When you start this tool for the first time, you may get the following message:"
-msgstr "После первого запуска этой программы вы можете увидеть такое сообщение:"
+msgid ""
+"When you start this tool for the first time, you may get the following "
+"message:"
+msgstr ""
+"После первого запуска этой программы вы можете увидеть такое сообщение:"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:32
-msgid "<emphasis>\"SANE packages need to be installed to use scanners</emphasis>"
-msgstr "<emphasis>Для использования сканера должны быть установлены пакеты SANE.</emphasis>"
+msgid ""
+"<emphasis>\"SANE packages need to be installed to use scanners</emphasis>"
+msgstr ""
+"<emphasis>Для использования сканера должны быть установлены пакеты SANE.</"
+"emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:35
@@ -6080,8 +9634,13 @@ msgstr "<emphasis>Вы хотите установить пакеты SANE?</emp
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:38
-msgid "Choose <emphasis>Yes</emphasis> to continue. It will install <code>scanner-gui</code> and <code>task-scanning</code> if they are not yet installed."
-msgstr "Нажмите кнопку <emphasis>Да</emphasis>, чтобы установить нужные пакеты. Если этого еще не было сделано ранее, будут установлены пакеты <code>scanner-gui</code> и <code>task-scanning</code>."
+msgid ""
+"Choose <emphasis>Yes</emphasis> to continue. It will install <code>scanner-"
+"gui</code> and <code>task-scanning</code> if they are not yet installed."
+msgstr ""
+"Нажмите кнопку <emphasis>Да</emphasis>, чтобы установить нужные пакеты. Если "
+"этого еще не было сделано ранее, будут установлены пакеты <code>scanner-gui</"
+"code> и <code>task-scanning</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:44
@@ -6090,23 +9649,49 @@ msgstr "scannerdrake.png"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:50
-msgid "If your scanner is identified correctly, so if in the above screen you see the name of your scanner, the scanner is ready for use with, for instance, <emphasis>XSane</emphasis> or <emphasis>Simple Scan</emphasis>."
-msgstr "Если сканер был идентифицирован правильно, то в окне, отображённом на скриншоте выше, вы увидите имя вашего сканера, сканер готов к работе, например, в <emphasis>XSane</emphasis>, <emphasis>Skanlite</emphasis> или <emphasis>Simple Scan</emphasis>."
+msgid ""
+"If your scanner is identified correctly, so if in the above screen you see "
+"the name of your scanner, the scanner is ready for use with, for instance, "
+"<emphasis>XSane</emphasis> or <emphasis>Simple Scan</emphasis>."
+msgstr ""
+"Если сканер был идентифицирован правильно, то в окне, отображённом на "
+"скриншоте выше, вы увидите имя вашего сканера, сканер готов к работе, "
+"например, в <emphasis>XSane</emphasis>, <emphasis>Skanlite</emphasis> или "
+"<emphasis>Simple Scan</emphasis>."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:55
-msgid "In that case, you might now want to want to configure the <emphasis>Scanner sharing</emphasis> option. You can read about it in the <xref linkend=\"scannersharing\"/>."
-msgstr "Итак, после этого вы можете настроить <emphasis>совместное использование сканера</emphasis>. Соответствующие сведения см. в разделе <xref linkend=\"scannersharing\"/>."
+msgid ""
+"In that case, you might now want to want to configure the <emphasis>Scanner "
+"sharing</emphasis> option. You can read about it in the <xref linkend="
+"\"scannersharing\"/>."
+msgstr ""
+"Итак, после этого вы можете настроить <emphasis>совместное использование "
+"сканера</emphasis>. Соответствующие сведения см. в разделе <xref linkend="
+"\"scannersharing\"/>."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:59
-msgid "However, if your scanner hasn't been correctly identified, and checking its cable(s) and power switch and then pressing <emphasis>Search for new scanners</emphasis> doesn't help, you'll need to press <emphasis>Add a scanner manually</emphasis>."
-msgstr "Впрочем, если программе не удалось должным образом идентифицировать ваш сканер, проверка кабеля и электропитания показала, что все работает, а после нажатия кнопки <emphasis>Искать новые сканеры</emphasis> сканеров не было найдено, вам придётся нажать кнопку <emphasis>Добавить сканер вручную</emphasis>."
+msgid ""
+"However, if your scanner hasn't been correctly identified, and checking its "
+"cable(s) and power switch and then pressing <emphasis>Search for new "
+"scanners</emphasis> doesn't help, you'll need to press <emphasis>Add a "
+"scanner manually</emphasis>."
+msgstr ""
+"Впрочем, если программе не удалось должным образом идентифицировать ваш "
+"сканер, проверка кабеля и электропитания показала, что все работает, а после "
+"нажатия кнопки <emphasis>Искать новые сканеры</emphasis> сканеров не было "
+"найдено, вам придётся нажать кнопку <emphasis>Добавить сканер вручную</"
+"emphasis>."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:64
-msgid "Choose the brand of your scanner in the list you see, then its type from the list for that brand and click <emphasis>Ok</emphasis>"
-msgstr "Выберите производителя сканеров в списке, а затем выберите марку сканера и нажмите кнопку <emphasis>OK</emphasis>."
+msgid ""
+"Choose the brand of your scanner in the list you see, then its type from the "
+"list for that brand and click <emphasis>Ok</emphasis>"
+msgstr ""
+"Выберите производителя сканеров в списке, а затем выберите марку сканера и "
+"нажмите кнопку <emphasis>OK</emphasis>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:69
@@ -6115,13 +9700,25 @@ msgstr "scannerdrake2.png"
 
 #. type: Content of: <section><section><note><para>
 #: en/scannerdrake.xml:76
-msgid "If you can't find your scanner in the list, then click <emphasis>Cancel</emphasis>"
-msgstr "Если вашего сканера в списке нет, то нажмите кнопку <emphasis>Отменить</emphasis>."
+msgid ""
+"If you can't find your scanner in the list, then click <emphasis>Cancel</"
+"emphasis>"
+msgstr ""
+"Если вашего сканера в списке нет, то нажмите кнопку <emphasis>Отменить</"
+"emphasis>."
 
 #. type: Content of: <section><section><note><para>
 #: en/scannerdrake.xml:79
-msgid "Please check whether your scanner is supported on the <link xlink:href=\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: Supported Devices</link> page and ask for help in the <link xlink:href=\"http://forums.mageia.org/en/\">forums</link>."
-msgstr "Пожалуйста, проверьте, предусмотрена ли поддержка вашего сканера с помощью страницы <link xlink:href=\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">Поддерживаемые сканеры SANE</link> и попросите о помощи на <link xlink:href=\"http://forums.mageia.org/en/\">форуме</link>."
+msgid ""
+"Please check whether your scanner is supported on the <link xlink:href="
+"\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: Supported "
+"Devices</link> page and ask for help in the <link xlink:href=\"http://forums."
+"mageia.org/en/\">forums</link>."
+msgstr ""
+"Пожалуйста, проверьте, предусмотрена ли поддержка вашего сканера с помощью "
+"страницы <link xlink:href=\"http://www.sane-project.org/lists/sane-mfgs-cvs."
+"html\">Поддерживаемые сканеры SANE</link> и попросите о помощи на <link "
+"xlink:href=\"http://forums.mageia.org/en/\">форуме</link>."
 
 #. type: Content of: <section><section><figure><info><title>
 #: en/scannerdrake.xml:87
@@ -6135,23 +9732,43 @@ msgstr "scannerdrake3.png"
 
 #. type: Content of: <section><section><figure>
 #: en/scannerdrake.xml:86
-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><section><para>
 #: en/scannerdrake.xml:97
-msgid "You can leave this setting to <emphasis>Auto-detect available ports</emphasis> unless your scanner's interface is a parallel port. In that case, select <emphasis>/dev/parport0</emphasis> if you have only one."
-msgstr "Вы можете оставить вариант по умолчанию, <emphasis>Автоматически определять доступные порты</emphasis>, если ваш сканер подключен к компьютеру не с помощью параллельного порта. Если сканер все же соединён с помощью параллельного порта, выберите <emphasis>/dev/parport0</emphasis> (если сканер только один)."
+msgid ""
+"You can leave this setting to <emphasis>Auto-detect available ports</"
+"emphasis> unless your scanner's interface is a parallel port. In that case, "
+"select <emphasis>/dev/parport0</emphasis> if you have only one."
+msgstr ""
+"Вы можете оставить вариант по умолчанию, <emphasis>Автоматически определять "
+"доступные порты</emphasis>, если ваш сканер подключен к компьютеру не с "
+"помощью параллельного порта. Если сканер все же соединён с помощью "
+"параллельного порта, выберите <emphasis>/dev/parport0</emphasis> (если "
+"сканер только один)."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:102
-msgid "After clicking <emphasis>Ok</emphasis>, in most cases you will see a screen similar to the one below."
-msgstr "После нажатия кнопки <emphasis>OK</emphasis> в подавляющем большинстве случаев вы увидите окно, подобное приведенному на снимке ниже."
+msgid ""
+"After clicking <emphasis>Ok</emphasis>, in most cases you will see a screen "
+"similar to the one below."
+msgstr ""
+"После нажатия кнопки <emphasis>OK</emphasis> в подавляющем большинстве "
+"случаев вы увидите окно, подобное приведенному на снимке ниже."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:104
-msgid "If you don't get that screen, then please read the <xref linkend=\"scannerextrasteps\"/>."
-msgstr "Если подобное окно не было показано, пожалуйста, ознакомьтесь с содержанием раздела <xref linkend=\"scannerextrasteps\"/>."
+msgid ""
+"If you don't get that screen, then please read the <xref linkend="
+"\"scannerextrasteps\"/>."
+msgstr ""
+"Если подобное окно не было показано, пожалуйста, ознакомьтесь с содержанием "
+"раздела <xref linkend=\"scannerextrasteps\"/>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:108
@@ -6170,18 +9787,37 @@ msgstr "scannerdrake5.png"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:128
-msgid "Here you can choose whether the scanners connected to this machine should be accessible by remote machines and by which remote machines. You can also decide here whether scanners on remote machines should be made available on this machine."
-msgstr "Здесь вы можете указать, могут ли присоединённые к вашей машине сканеры быть доступны всем остальным компьютерам и каким именно. Вы также можете разрешить, можно ли будет пользоваться с вашей машины сканерами, соединёнными с другими компьютерами."
+msgid ""
+"Here you can choose whether the scanners connected to this machine should be "
+"accessible by remote machines and by which remote machines. You can also "
+"decide here whether scanners on remote machines should be made available on "
+"this machine."
+msgstr ""
+"Здесь вы можете указать, могут ли присоединённые к вашей машине сканеры быть "
+"доступны всем остальным компьютерам и каким именно. Вы также можете "
+"разрешить, можно ли будет пользоваться с вашей машины сканерами, "
+"соединёнными с другими компьютерами."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:133
-msgid "Scanner sharing to hosts : name or IP address of hosts can be added or deleted from the list of hosts allowed to access the local device(s), on this computer."
-msgstr "Сканер общего доступа: можно добавить или удалить имена или IP-адреса хостов, которым предоставлен доступ к локальным устройствам на вашем компьютере."
+msgid ""
+"Scanner sharing to hosts : name or IP address of hosts can be added or "
+"deleted from the list of hosts allowed to access the local device(s), on "
+"this computer."
+msgstr ""
+"Сканер общего доступа: можно добавить или удалить имена или IP-адреса "
+"хостов, которым предоставлен доступ к локальным устройствам на вашем "
+"компьютере."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:137
-msgid "Usage of remote scanners : name or IP address of hosts can added or deleted from the list of hosts which give access to a remote scanner."
-msgstr "Использование удалённых сканеров: можете добавить новые или удалить старые из списка хостов, имена или IP-адреса хостов, которые дают доступ к удаленному сканеру."
+msgid ""
+"Usage of remote scanners : name or IP address of hosts can added or deleted "
+"from the list of hosts which give access to a remote scanner."
+msgstr ""
+"Использование удалённых сканеров: можете добавить новые или удалить старые "
+"из списка хостов, имена или IP-адреса хостов, которые дают доступ к "
+"удаленному сканеру."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:143
@@ -6191,7 +9827,9 @@ msgstr "scannerdrake6.png"
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:149
 msgid "Scanner sharing to hosts: you can add host."
-msgstr "Сканер общего доступа: с помощью этого пункта можно запустить инструмент добавления узлов."
+msgstr ""
+"Сканер общего доступа: с помощью этого пункта можно запустить инструмент "
+"добавления узлов."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:153
@@ -6200,8 +9838,12 @@ msgstr "scannerdrake7.png"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:159
-msgid "Scanner sharing to hosts: specify which host(s) to add, or allow all remote machines."
-msgstr "Сканер общего доступа: укажите хосты, которые следует добавить в список хостов с доступом или предоставьте доступ всем удалённым компьютерам."
+msgid ""
+"Scanner sharing to hosts: specify which host(s) to add, or allow all remote "
+"machines."
+msgstr ""
+"Сканер общего доступа: укажите хосты, которые следует добавить в список "
+"хостов с доступом или предоставьте доступ всем удалённым компьютерам."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:164
@@ -6211,7 +9853,9 @@ msgstr "scannerdrake8.png"
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:170
 msgid "\"All remote machines\" are allowed to access the local scanner."
-msgstr "«Все удалённые машины» - предоставить доступ к вашему локальному сканеру пользователям всех удаленных компьютеров в локальной сети."
+msgstr ""
+"«Все удалённые машины» - предоставить доступ к вашему локальному сканеру "
+"пользователям всех удаленных компьютеров в локальной сети."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:175
@@ -6220,8 +9864,12 @@ msgstr "scannerdrake9.png"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:181
-msgid "If the package <emphasis>saned</emphasis> is not yet installed, the tool offers to do it."
-msgstr "Если еще не установлен пакет <emphasis>saned</emphasis>, программа-мастер предложит его установить."
+msgid ""
+"If the package <emphasis>saned</emphasis> is not yet installed, the tool "
+"offers to do it."
+msgstr ""
+"Если еще не установлен пакет <emphasis>saned</emphasis>, программа-мастер "
+"предложит его установить."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:184
@@ -6240,17 +9888,24 @@ msgstr "<emphasis>/etc/sane.d/net.conf</emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:190
-msgid "<emphasis>/etc/sane.d/dll.conf </emphasis>to add or comment the directive \"net\""
-msgstr "<emphasis>/etc/sane.d/dll.conf</emphasis> (добавление и комментирование директивы «net»)"
+msgid ""
+"<emphasis>/etc/sane.d/dll.conf </emphasis>to add or comment the directive "
+"\"net\""
+msgstr ""
+"<emphasis>/etc/sane.d/dll.conf</emphasis> (добавление и комментирование "
+"директивы «net»)"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:193
-msgid "It will also configure <emphasis>saned</emphasis> and <emphasis>xinetd</emphasis> to be started on boot."
-msgstr "Также фоновые службы <emphasis>saned</emphasis> и <emphasis>xinetd</emphasis> будут настроены на запуск во время загрузки системы."
+msgid ""
+"It will also configure <emphasis>saned</emphasis> and <emphasis>xinetd</"
+"emphasis> to be started on boot."
+msgstr ""
+"Также фоновые службы <emphasis>saned</emphasis> и <emphasis>xinetd</"
+"emphasis> будут настроены на запуск во время загрузки системы."
 
 #. type: Content of: <section><section><title>
-#: en/scannerdrake.xml:199
-#: en/system-config-printer.xml:278
+#: en/scannerdrake.xml:199 en/system-config-printer.xml:278
 msgid "Specifics"
 msgstr "Специфические советы"
 
@@ -6261,8 +9916,16 @@ msgstr "Hewlett-Packard"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:207
-msgid "Most HP scanners are managed from <emphasis>HP Device Manager</emphasis> (hplip) which also manages printers. In this case, this tool does not allow you to configure it and invites you to use <emphasis>HP Device Manager</emphasis>."
-msgstr "Работа с большинством сканеров, а также принтеров HP обеспечивается программой <emphasis>HP Device Manager</emphasis>. Если вы имеете дело со сканером именно этой фирмы, вам будет предложено воспользоваться для настройки <emphasis>HP Device Manager</emphasis>."
+msgid ""
+"Most HP scanners are managed from <emphasis>HP Device Manager</emphasis> "
+"(hplip) which also manages printers. In this case, this tool does not allow "
+"you to configure it and invites you to use <emphasis>HP Device Manager</"
+"emphasis>."
+msgstr ""
+"Работа с большинством сканеров, а также принтеров HP обеспечивается "
+"программой <emphasis>HP Device Manager</emphasis>. Если вы имеете дело со "
+"сканером именно этой фирмы, вам будет предложено воспользоваться для "
+"настройки <emphasis>HP Device Manager</emphasis>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:214
@@ -6271,8 +9934,22 @@ msgstr "Epson"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:216
-msgid "Drivers are available from <link xlink:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this page</link>. When indicated, you must install the <emphasis>iscan-data</emphasis> package first, then <emphasis>iscan</emphasis> (in this order). It is possible that the <emphasis>iscan</emphasis> package will generate a warning about a conflict with <emphasis>sane</emphasis>. Users have reported that this warning can be ignored."
-msgstr "Драйверы можно получить с помощью <link xlink:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">этой страницы поиска</link>. Чтобы воспользоваться сканером, вам придётся сначала установить пакет «iscan-data», а затем пакет «iscan» (именно в таком порядке). Иногда во время установки пакета iscan может быть показано сообщение о конфликте с пакетом sane. Пользователями этого пакета сообщалось, что такие предупреждения можно смело игнорировать."
+msgid ""
+"Drivers are available from <link xlink:href=\"http://download.ebz.epson.net/"
+"dsc/search/01/search/?OSC=LX\">this page</link>. When indicated, you must "
+"install the <emphasis>iscan-data</emphasis> package first, then "
+"<emphasis>iscan</emphasis> (in this order). It is possible that the "
+"<emphasis>iscan</emphasis> package will generate a warning about a conflict "
+"with <emphasis>sane</emphasis>. Users have reported that this warning can be "
+"ignored."
+msgstr ""
+"Драйверы можно получить с помощью <link xlink:href=\"http://download.ebz."
+"epson.net/dsc/search/01/search/?OSC=LX\">этой страницы поиска</link>. Чтобы "
+"воспользоваться сканером, вам придётся сначала установить пакет «iscan-"
+"data», а затем пакет «iscan» (именно в таком порядке). Иногда во время "
+"установки пакета iscan может быть показано сообщение о конфликте с пакетом "
+"sane. Пользователями этого пакета сообщалось, что такие предупреждения можно "
+"смело игнорировать."
 
 #. type: Content of: <section><section><info><title>
 #: en/scannerdrake.xml:231
@@ -6281,32 +9958,63 @@ msgstr "Дополнительные шаги по установке"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:234
-msgid "It is possible that after selecting a port for your scanner in the <xref linkend=\"choosescannerport\"/> screen, you need to take one or more extra steps to correctly configure your scanner."
-msgstr "Возможно, после обозначения порта вашего сканера на странице <xref linkend=\"choosescannerport\"/> вам придется выполнить еще один или несколько шагов настройки сканера."
+msgid ""
+"It is possible that after selecting a port for your scanner in the <xref "
+"linkend=\"choosescannerport\"/> screen, you need to take one or more extra "
+"steps to correctly configure your scanner."
+msgstr ""
+"Возможно, после обозначения порта вашего сканера на странице <xref linkend="
+"\"choosescannerport\"/> вам придется выполнить еще один или несколько шагов "
+"настройки сканера."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:239
-msgid "In some cases, you're told the scanner needs its firmware to be uploaded each time it is started. This tool allows you to load it into the device, after you installed it on your system. In this screen you can install the firmware from a CD or a Windows installation, or install the one you downloaded from an Internet site of the vendor."
-msgstr "Работа с некоторыми сканерами требует загрузки микропрограммы в сканер при каждом его запуске. С помощью модуля настройки сканера можно приказать системе загружать эту прошивку в устройство после соединения его с компьютером. С помощью этого окна вы можете установить микропрограмму с компакт-диска или установленной системы Windows, или установить микропрограмму, полученную с сайта производителя устройства в интернете."
+msgid ""
+"In some cases, you're told the scanner needs its firmware to be uploaded "
+"each time it is started. This tool allows you to load it into the device, "
+"after you installed it on your system. In this screen you can install the "
+"firmware from a CD or a Windows installation, or install the one you "
+"downloaded from an Internet site of the vendor."
+msgstr ""
+"Работа с некоторыми сканерами требует загрузки микропрограммы в сканер при "
+"каждом его запуске. С помощью модуля настройки сканера можно приказать "
+"системе загружать эту прошивку в устройство после соединения его с "
+"компьютером. С помощью этого окна вы можете установить микропрограмму с "
+"компакт-диска или установленной системы Windows, или установить "
+"микропрограмму, полученную с сайта производителя устройства в интернете."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:241
-msgid "When your device's firmware needs to be loaded, it can take a long time at each first usage, possibly more than one minute. So be patient."
-msgstr "Если для работы с вашим сканером требуется загрузить микропрограмму, первая попытка воспользоваться устройством может быть довольно длинной, вероятно более одной минуты. Будьте терпеливы."
+msgid ""
+"When your device's firmware needs to be loaded, it can take a long time at "
+"each first usage, possibly more than one minute. So be patient."
+msgstr ""
+"Если для работы с вашим сканером требуется загрузить микропрограмму, первая "
+"попытка воспользоваться устройством может быть довольно длинной, вероятно "
+"более одной минуты. Будьте терпеливы."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:246
-msgid "Also, you may get a screen telling you to adjust the <emphasis>/etc/sane.d/\"name_of_your_SANE_backend\".conf file.</emphasis>"
-msgstr "Кроме того, может быть показан совет относительно внесения изменений в файл <emphasis>/etc/sane.d/название_соответствующего_модуля_SANE.conf</emphasis>."
+msgid ""
+"Also, you may get a screen telling you to adjust the <emphasis>/etc/sane.d/"
+"\"name_of_your_SANE_backend\".conf file.</emphasis>"
+msgstr ""
+"Кроме того, может быть показан совет относительно внесения изменений в файл "
+"<emphasis>/etc/sane.d/название_соответствующего_модуля_SANE.conf</emphasis>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:250
-msgid "Read those or other instructions you get carefully and if you don't know what to do, feel free to ask for help in the <link xlink:href=\"http://forums.mageia.org/en/\">forums</link>."
-msgstr "Тщательно ознакомьтесь с этими и другими установками. Если они вам не помогут, не сомневайтесь и попросите о помощи на <link xlink:href=\"http://forums.mageia.org/en/\">форуме</link>."
+msgid ""
+"Read those or other instructions you get carefully and if you don't know "
+"what to do, feel free to ask for help in the <link xlink:href=\"http://"
+"forums.mageia.org/en/\">forums</link>."
+msgstr ""
+"Тщательно ознакомьтесь с этими и другими установками. Если они вам не "
+"помогут, не сомневайтесь и попросите о помощи на <link xlink:href=\"http://"
+"forums.mageia.org/en/\">форуме</link>."
 
 #. type: Content of: <section><orderedlist><title>
-#: en/software-management.xml:5
-#: en/software-management.xml:15
+#: en/software-management.xml:5 en/software-management.xml:15
 msgid "Software Management"
 msgstr "Управление программами"
 
@@ -6317,8 +10025,13 @@ msgstr "software-management.png"
 
 #. type: Content of: <section><para>
 #: en/software-management.xml:14
-msgid "In this screen you can choose between several tools for software management. Click on a link below to learn more."
-msgstr "С помощью этой страницы можно получить доступ к нескольким инструментам управления пакетами с программным обеспечением. Нажмите на ссылке, расположенной ниже, чтобы узнать больше."
+msgid ""
+"In this screen you can choose between several tools for software management. "
+"Click on a link below to learn more."
+msgstr ""
+"С помощью этой страницы можно получить доступ к нескольким инструментам "
+"управления пакетами с программным обеспечением. Нажмите на ссылке, "
+"расположенной ниже, чтобы узнать больше."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:17
@@ -6327,8 +10040,12 @@ msgstr "<xref linkend=\"rpmdrake\"></xref>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:20
-msgid "<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Update your system</emphasis>"
-msgstr "<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Обновить систему</emphasis>"
+msgid ""
+"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Update your system</"
+"emphasis>"
+msgstr ""
+"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Обновить систему</"
+"emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:23
@@ -6337,8 +10054,12 @@ msgstr "<xref linkend=\"mgaapplet-config\"></xref>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:26
-msgid "<xref linkend=\"drakrpm-edit-media\"></xref><emphasis> = Configure media sources for install and update</emphasis>"
-msgstr "<xref linkend=\"drakrpm-edit-media\"></xref><emphasis> = Настроить источники установки и обновления</emphasis>"
+msgid ""
+"<xref linkend=\"drakrpm-edit-media\"></xref><emphasis> = Configure media "
+"sources for install and update</emphasis>"
+msgstr ""
+"<xref linkend=\"drakrpm-edit-media\"></xref><emphasis> = Настроить источники "
+"установки и обновления</emphasis>"
 
 #. type: Content of: <section><info><title>
 #: en/system-config-printer.xml:8
@@ -6357,28 +10078,61 @@ msgstr "system-config-printer.png"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:23
-msgid "Printing is managed on Mageia by a server named CUPS. It has its own <link ns2:title=\"CUPS\" ns2:href=\"http://localhost:631\">configuration interface</link> which is accessible via an Internet browser, but Mageia offers its own tool for installing printers called system-config-printer which is shared with other distributions such as Fedora, Mandriva, Ubuntu and openSUSE."
-msgstr "Задачами печати в Mageia управляет сервер, который называется CUPS. У сервера есть собственный <link ns2:title=\"CUPS\" ns2:href=\"http://localhost:631\">интерфейс настройки</link>, доступ к которому осуществляется с помощью программы для просмотра страниц в интернете (браузера). Впрочем, в Mageia предусмотрен и собственный инструмент для установки и настройки драйверов принтеров, который называется system-config-printer и используется также в других дистрибутивах, в частности Fedora, Mandriva, Ubuntu и openSUSE."
+msgid ""
+"Printing is managed on Mageia by a server named CUPS. It has its own <link "
+"ns2:title=\"CUPS\" ns2:href=\"http://localhost:631\">configuration "
+"interface</link> which is accessible via an Internet browser, but Mageia "
+"offers its own tool for installing printers called system-config-printer "
+"which is shared with other distributions such as Fedora, Mandriva, Ubuntu "
+"and openSUSE."
+msgstr ""
+"Задачами печати в Mageia управляет сервер, который называется CUPS. У "
+"сервера есть собственный <link ns2:title=\"CUPS\" ns2:href=\"http://"
+"localhost:631\">интерфейс настройки</link>, доступ к которому осуществляется "
+"с помощью программы для просмотра страниц в интернете (браузера). Впрочем, в "
+"Mageia предусмотрен и собственный инструмент для установки и настройки "
+"драйверов принтеров, который называется system-config-printer и используется "
+"также в других дистрибутивах, в частности Fedora, Mandriva, Ubuntu и "
+"openSUSE."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:30
-msgid "You should enable the non-free repository before proceeding with the installation, because some drivers may only be available in this way."
-msgstr "Вам стоит включить доступ к репозиториям пакетов, которые не являются свободными (non-free) до того, как вы продолжите установку, поскольку пакеты некоторых из драйверов хранятся только в этом репозитории."
+msgid ""
+"You should enable the non-free repository before proceeding with the "
+"installation, because some drivers may only be available in this way."
+msgstr ""
+"Вам стоит включить доступ к репозиториям пакетов, которые не являются "
+"свободными (non-free) до того, как вы продолжите установку, поскольку пакеты "
+"некоторых из драйверов хранятся только в этом репозитории."
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/system-config-printer.xml:37
-msgid "You can start this tool from the command line, by typing <emphasis>system-config-printer</emphasis>. The root password will be asked for."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis>system-config-printer</emphasis>. Для работы с программой придётся указать пароль администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis>system-"
+"config-printer</emphasis>. The root password will be asked for."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis>system-config-printer</emphasis>. Для работы с программой придётся "
+"указать пароль администратора (root)."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:34
-msgid "Printer installation is carried out in the <guilabel>Hardware</guilabel> section of the Mageia Control Centre. Select the <guilabel>Configure printing and scanning</guilabel> tool<placeholder type=\"footnote\" id=\"0\"/>."
-msgstr "Управлять установкой драйверов принтеров можно с помощью раздела <guilabel>Оборудование</guilabel> из Центра управления Mageia. Вам просто нужно выбрать пункт <guilabel>Настройка печати и сканирования</guilabel><placeholder type=\"footnote\" id=\"0\"/>."
+msgid ""
+"Printer installation is carried out in the <guilabel>Hardware</guilabel> "
+"section of the Mageia Control Centre. Select the <guilabel>Configure "
+"printing and scanning</guilabel> tool<placeholder type=\"footnote\" id=\"0\"/"
+">."
+msgstr ""
+"Управлять установкой драйверов принтеров можно с помощью раздела "
+"<guilabel>Оборудование</guilabel> из Центра управления Mageia. Вам просто "
+"нужно выбрать пункт <guilabel>Настройка печати и сканирования</"
+"guilabel><placeholder type=\"footnote\" id=\"0\"/>."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:42
 msgid "MCC will ask for the installation two packages:"
-msgstr "Центр управления Mageia (MCC) попросит вас разрешить установку двух пакетов:"
+msgstr ""
+"Центр управления Mageia (MCC) попросит вас разрешить установку двух пакетов:"
 
 #. type: Content of: <section><section><blockquote><para>
 #: en/system-config-printer.xml:45
@@ -6392,13 +10146,27 @@ msgstr "task-printing-hp"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:50
-msgid "It is necessary to accept this installation to continue. Up to 230MB of dependencies are needed."
-msgstr "Вам следует согласиться на установку этих пакетов, чтобы продолжить работу с программой. Вместе с зависимостями может быть установлено до 230 МБ данных."
+msgid ""
+"It is necessary to accept this installation to continue. Up to 230MB of "
+"dependencies are needed."
+msgstr ""
+"Вам следует согласиться на установку этих пакетов, чтобы продолжить работу с "
+"программой. Вместе с зависимостями может быть установлено до 230 МБ данных."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:53
-msgid "To add a printer, choose the \"Add\" printer button. The system will try to detect any printers and the ports available. The screenshot displays a printer connected to a parallel port. If a printer is detected, such as a printer on a USB port, it will be displayed on the first line.  The window will also attempt to configure a network printer."
-msgstr "Чтобы добавить принтер, нажмите кнопку <guilabel>Добавить</guilabel>. Система попытается обнаружить все доступные принтеры и порты. На снимке показан пункт принтера, соединенного посредством USB. Если принтер будет обнаружен, он будет указан в первой строке списка. С помощью этого же окна можно настроить сетевой принтер."
+msgid ""
+"To add a printer, choose the \"Add\" printer button. The system will try to "
+"detect any printers and the ports available. The screenshot displays a "
+"printer connected to a parallel port. If a printer is detected, such as a "
+"printer on a USB port, it will be displayed on the first line.  The window "
+"will also attempt to configure a network printer."
+msgstr ""
+"Чтобы добавить принтер, нажмите кнопку <guilabel>Добавить</guilabel>. "
+"Система попытается обнаружить все доступные принтеры и порты. На снимке "
+"показан пункт принтера, соединенного посредством USB. Если принтер будет "
+"обнаружен, он будет указан в первой строке списка. С помощью этого же окна "
+"можно настроить сетевой принтер."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:61
@@ -6407,8 +10175,22 @@ msgstr "Принтер обнаружен автоматически"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:63
-msgid "This usually refers to USB printers. The utility automatically finds the name of the printer and displays it. Select the printer and then click \"Next\". If there is a known driver associated for the printer, it will be automatically installed. If there is more than one driver or no known drivers, a window will ask you to select or furnish one, as explained in the next paragraph. Continue with <xref linkend=\"terminate\"/>"
-msgstr "Обычно, это касается принтеров, соединенных с компьютером с помощью кабеля USB. Программа автоматически определяет название принтера и показывает его. Выберите принтер и нажмите кнопку <guilabel>Далее</guilabel>. Если с принтером связан известный системе драйвер, он будет установлен автоматически. Если можно воспользоваться одним из нескольких драйверов или системе не удастся определить лучший драйвер, будет показано окно с просьбой выбрать драйвер, руководство приведено в следующем разделе. Продолжите чтение раздела <xref linkend=\"terminate\"/>."
+msgid ""
+"This usually refers to USB printers. The utility automatically finds the "
+"name of the printer and displays it. Select the printer and then click \"Next"
+"\". If there is a known driver associated for the printer, it will be "
+"automatically installed. If there is more than one driver or no known "
+"drivers, a window will ask you to select or furnish one, as explained in the "
+"next paragraph. Continue with <xref linkend=\"terminate\"/>"
+msgstr ""
+"Обычно, это касается принтеров, соединенных с компьютером с помощью кабеля "
+"USB. Программа автоматически определяет название принтера и показывает его. "
+"Выберите принтер и нажмите кнопку <guilabel>Далее</guilabel>. Если с "
+"принтером связан известный системе драйвер, он будет установлен "
+"автоматически. Если можно воспользоваться одним из нескольких драйверов или "
+"системе не удастся определить лучший драйвер, будет показано окно с просьбой "
+"выбрать драйвер, руководство приведено в следующем разделе. Продолжите "
+"чтение раздела <xref linkend=\"terminate\"/>."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:72
@@ -6422,8 +10204,13 @@ msgstr "printer3.png"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:80
-msgid "When you select a port, the system loads a driver list and displays a window to select a driver. The choice can be made through one of the following options."
-msgstr "После выбора порта система загрузит список драйверов и покажет окно выбора драйвера. Вы сможете выбрать один из приведённых ниже вариантов."
+msgid ""
+"When you select a port, the system loads a driver list and displays a window "
+"to select a driver. The choice can be made through one of the following "
+"options."
+msgstr ""
+"После выбора порта система загрузит список драйверов и покажет окно выбора "
+"драйвера. Вы сможете выбрать один из приведённых ниже вариантов."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:86
@@ -6442,8 +10229,20 @@ msgstr "поиск драйвера для загрузки"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:102
-msgid "By selecting from the database, the window suggests a printer manufacturer first, and then a device and a driver associated with it. If more than one driver is suggested, select one which is recommended, unless you have encountered some problems with that one before, in this case select the one which know to work."
-msgstr "Если будет выбран вариант с поиском в базе данных, программа сначала предложит вам выбрать название компании-производителя принтера, а затем название устройства и драйвер, связанный с работой этого устройства. Если можно будет воспользоваться несколькими драйверами, следует выбрать рекомендованные из них. Если у вас возникнут какие-либо проблемы с работой рекомендованного драйвера, выберите тот из драйверов, который работает лучше всего."
+msgid ""
+"By selecting from the database, the window suggests a printer manufacturer "
+"first, and then a device and a driver associated with it. If more than one "
+"driver is suggested, select one which is recommended, unless you have "
+"encountered some problems with that one before, in this case select the one "
+"which know to work."
+msgstr ""
+"Если будет выбран вариант с поиском в базе данных, программа сначала "
+"предложит вам выбрать название компании-производителя принтера, а затем "
+"название устройства и драйвер, связанный с работой этого устройства. Если "
+"можно будет воспользоваться несколькими драйверами, следует выбрать "
+"рекомендованные из них. Если у вас возникнут какие-либо проблемы с работой "
+"рекомендованного драйвера, выберите тот из драйверов, который работает лучше "
+"всего."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:110
@@ -6452,8 +10251,20 @@ msgstr "Завершение процедуры установки"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:112
-msgid "After the driver selection, a window requests some information which will allow the system to designate and discover the printer. The first line is the name under which the device will appear in applications in the list of available printers. The installer then suggests printing a test page. After this step, the printer is added and appears in the list of available printers."
-msgstr "После выбора драйвера будет открыто окно ввода данных, которые помогут системе обозначить и распознать принтер. В первой строке следует ввести название устройства, которое будет показано программой в списке доступных принтеров. После ввода данных, средство установки драйвера предложит напечатать тестовую страницу. После тестовой печати, принтер будет добавлен в список доступных принтеров, им можно будет пользоваться."
+msgid ""
+"After the driver selection, a window requests some information which will "
+"allow the system to designate and discover the printer. The first line is "
+"the name under which the device will appear in applications in the list of "
+"available printers. The installer then suggests printing a test page. After "
+"this step, the printer is added and appears in the list of available "
+"printers."
+msgstr ""
+"После выбора драйвера будет открыто окно ввода данных, которые помогут "
+"системе обозначить и распознать принтер. В первой строке следует ввести "
+"название устройства, которое будет показано программой в списке доступных "
+"принтеров. После ввода данных, средство установки драйвера предложит "
+"напечатать тестовую страницу. После тестовой печати, принтер будет добавлен "
+"в список доступных принтеров, им можно будет пользоваться."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:121
@@ -6462,33 +10273,86 @@ msgstr "Сетевой принтер"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:123
-msgid "Network printers are printers that are attached directly to a wired or wireless network, that are attached to a printserver or that are attached to another workstation that serves as printserver."
-msgstr "Сетевые принтеры - это принтеры, которые непосредственно соединены с проводной или беспроводной сетью, сервером печати или другой рабочей станцией, которая работает в режиме сервера печати."
+msgid ""
+"Network printers are printers that are attached directly to a wired or "
+"wireless network, that are attached to a printserver or that are attached to "
+"another workstation that serves as printserver."
+msgstr ""
+"Сетевые принтеры - это принтеры, которые непосредственно соединены с "
+"проводной или беспроводной сетью, сервером печати или другой рабочей "
+"станцией, которая работает в режиме сервера печати."
 
 #. type: Content of: <section><section><note><para>
 #: en/system-config-printer.xml:128
-msgid "Often, it is better to configure the DHCP server to always associate a fixed IP address with the printer's MAC-address. Of course that should be the same as the IP address the printer of printserver is set to, if it has a fixed one."
-msgstr "Часто, стоит настроить DHCP-сервер на автоматическую привязку IP-адреса к MAC-адресу принтера. Конечно же, если этот адрес является фиксированным, он должен совпадать с IP-адресом принтера, на который настроен сервер печати."
+msgid ""
+"Often, it is better to configure the DHCP server to always associate a fixed "
+"IP address with the printer's MAC-address. Of course that should be the same "
+"as the IP address the printer of printserver is set to, if it has a fixed "
+"one."
+msgstr ""
+"Часто, стоит настроить DHCP-сервер на автоматическую привязку IP-адреса к "
+"MAC-адресу принтера. Конечно же, если этот адрес является фиксированным, он "
+"должен совпадать с IP-адресом принтера, на который настроен сервер печати."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:134
-msgid "The printer's Mac-address is a serial number given to the printer or printserver or computer it is attached to, that can be obtained from a configuration page printed by the printer or which may be written on a label on the printer or printserver. If your shared printer is attached to a Mageia system, you can run <emphasis><code>ifconfig</code></emphasis> on it as root to find the MAC-address. It is the sequence of numbers and letters after \"HWaddr\"."
-msgstr "MAC-адрес принтера - это серийный номер, который предоставляется принтеру, серверу печати или компьютеру, к которому подключен принтер и который можно определить с помощью тестовой страницы, напечатанной самим принтером или на наклейке на принтере или сервере печати. Если ваш принтер общего пользования соединен с системой Mageia, вы можете выполнить от имени администратора (root) команду <emphasis><code>ifconfig</code></emphasis>, чтобы определить этот MAC-адрес. MAC-адрес есть последовательность цифр и букв после слова «HWaddr»."
+msgid ""
+"The printer's Mac-address is a serial number given to the printer or "
+"printserver or computer it is attached to, that can be obtained from a "
+"configuration page printed by the printer or which may be written on a label "
+"on the printer or printserver. If your shared printer is attached to a "
+"Mageia system, you can run <emphasis><code>ifconfig</code></emphasis> on it "
+"as root to find the MAC-address. It is the sequence of numbers and letters "
+"after \"HWaddr\"."
+msgstr ""
+"MAC-адрес принтера - это серийный номер, который предоставляется принтеру, "
+"серверу печати или компьютеру, к которому подключен принтер и который можно "
+"определить с помощью тестовой страницы, напечатанной самим принтером или на "
+"наклейке на принтере или сервере печати. Если ваш принтер общего пользования "
+"соединен с системой Mageia, вы можете выполнить от имени администратора "
+"(root) команду <emphasis><code>ifconfig</code></emphasis>, чтобы определить "
+"этот MAC-адрес. MAC-адрес есть последовательность цифр и букв после слова "
+"«HWaddr»."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:142
-msgid "You can add your network printer by choosing the protocol it uses to talk to your computer over the network. If you don't know which protocol to choose, you can try the <guilabel>Network Printer</guilabel> - <guilabel>Find Network Printer</guilabel> option in the <guilabel>Devices</guilabel> menu and give the IP address of the printer in the box on the right, where it says \"host\"."
-msgstr "Добавить ваш сетевой принтер можно так: выберите протокол, используемый принтером для обмена данными с сетью вашим компьютером. Если вы не знаете, какой протокол следует выбрать, вы можете попробовать воспользоваться пунктом <guilabel>Сетевой принтер</guilabel> - <guilabel>Найти сетевой принтер</guilabel> в меню <guilabel>Устройства</guilabel> и указать IP-адрес принтера в поле справа, где указано «host»."
+msgid ""
+"You can add your network printer by choosing the protocol it uses to talk to "
+"your computer over the network. If you don't know which protocol to choose, "
+"you can try the <guilabel>Network Printer</guilabel> - <guilabel>Find "
+"Network Printer</guilabel> option in the <guilabel>Devices</guilabel> menu "
+"and give the IP address of the printer in the box on the right, where it "
+"says \"host\"."
+msgstr ""
+"Добавить ваш сетевой принтер можно так: выберите протокол, используемый "
+"принтером для обмена данными с сетью вашим компьютером. Если вы не знаете, "
+"какой протокол следует выбрать, вы можете попробовать воспользоваться "
+"пунктом <guilabel>Сетевой принтер</guilabel> - <guilabel>Найти сетевой "
+"принтер</guilabel> в меню <guilabel>Устройства</guilabel> и указать IP-адрес "
+"принтера в поле справа, где указано «host»."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:149
-msgid "If the tool recognises your printer or printserver, it will propose a protocol and a queue, but you can choose a more appropriate one from the list below it or give the correct queue name if it isn't in the list."
-msgstr "Если программе удастся обнаружить ваш принтер или сервер печати, она предложит вам определённые параметры протокола и очереди печати. Впрочем, вы можете выбрать нужный вам вариант из списка, расположенного ниже или указать соответствующее название очереди печати, если соответствующего пункта нет в списке."
+msgid ""
+"If the tool recognises your printer or printserver, it will propose a "
+"protocol and a queue, but you can choose a more appropriate one from the "
+"list below it or give the correct queue name if it isn't in the list."
+msgstr ""
+"Если программе удастся обнаружить ваш принтер или сервер печати, она "
+"предложит вам определённые параметры протокола и очереди печати. Впрочем, вы "
+"можете выбрать нужный вам вариант из списка, расположенного ниже или указать "
+"соответствующее название очереди печати, если соответствующего пункта нет в "
+"списке."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:154
-msgid "Look in the documentation that came with your printer or printserver to find which protocol(s) it supports and for possible specific queue names."
-msgstr "Посмотрите в документации, поставляемой с принтером или с сервером принтера, чтобы выяснить, какие протоколы он поддерживает и по возможности, конкретные имена очередей."
+msgid ""
+"Look in the documentation that came with your printer or printserver to find "
+"which protocol(s) it supports and for possible specific queue names."
+msgstr ""
+"Посмотрите в документации, поставляемой с принтером или с сервером принтера, "
+"чтобы выяснить, какие протоколы он поддерживает и по возможности, конкретные "
+"имена очередей."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:160
@@ -6497,13 +10361,43 @@ msgstr "Протоколы сетевой печати"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:162
-msgid "One current technique is one developed by Hewlett-Packard and known as JetDirect. It allows access to a printer directly connected to the network via an Ethernet port. You must know the IP-address at which the printer is known on the network. This technique is also used inside some ADSL-routers which contain an USB port to connect the printer. In this case, the IP-address is that of the router. Note that the tool \"Hp Device manager\" can manage dynamically configured IP-adress, setting an URI like <emphasis>hp:/net/&lt;name-of-the-printer></emphasis> . In this case, fixed IP-adress is not required."
-msgstr "Одной из современных методик работы с принтерами является разработанная Hewlett-Packard технология под названием JetDirect. С ее помощью можно осуществлять доступ к принтеру, напрямую соединенного с сетью с помощью порта Ethernet. Вам необходимо будет указать IP-адрес, используемый принтером в сети. Эта технология используется также в некоторых ADSL-маршрутизаторах, в которых предусмотрен порт USB для подключения принтера. Если вы пользуетесь таким маршрутизатором, следует указать его IP-адрес. Заметьте, что программа «Hp Device manager» может работать с динамически определяемым IP-адресом, настройками URI записывающего устройства <emphasis>hp:/net/&lt;название_принтера&gt;</emphasis> . В этом случае фиксированный IP-адрес не требуется."
+msgid ""
+"One current technique is one developed by Hewlett-Packard and known as "
+"JetDirect. It allows access to a printer directly connected to the network "
+"via an Ethernet port. You must know the IP-address at which the printer is "
+"known on the network. This technique is also used inside some ADSL-routers "
+"which contain an USB port to connect the printer. In this case, the IP-"
+"address is that of the router. Note that the tool \"Hp Device manager\" can "
+"manage dynamically configured IP-adress, setting an URI like <emphasis>hp:/"
+"net/&lt;name-of-the-printer></emphasis> . In this case, fixed IP-adress is "
+"not required."
+msgstr ""
+"Одной из современных методик работы с принтерами является разработанная "
+"Hewlett-Packard технология под названием JetDirect. С ее помощью можно "
+"осуществлять доступ к принтеру, напрямую соединенного с сетью с помощью "
+"порта Ethernet. Вам необходимо будет указать IP-адрес, используемый "
+"принтером в сети. Эта технология используется также в некоторых ADSL-"
+"маршрутизаторах, в которых предусмотрен порт USB для подключения принтера. "
+"Если вы пользуетесь таким маршрутизатором, следует указать его IP-адрес. "
+"Заметьте, что программа «Hp Device manager» может работать с динамически "
+"определяемым IP-адресом, настройками URI записывающего устройства "
+"<emphasis>hp:/net/&lt;название_принтера&gt;</emphasis> . В этом случае "
+"фиксированный IP-адрес не требуется."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:172
-msgid "Choose the option <guilabel>AppSocket/HP JetDirect</guilabel> as the protocol and set the address in <guilabel>Host:</guilabel>, do not change the <guilabel>Port Number</guilabel>, unless you know that it needs to be changed. After the selection of the protocol, the selection of the driver is the same as above."
-msgstr "Выберите <guilabel>AppSocket/HP JetDirect</guilabel> в списке протоколов и укажите адрес в поле <guilabel>Узел:</guilabel>. Не изменяйте содержимое поля <guilabel>Номер порта</guilabel>, если не уверены, что это следует делать. После выбора протокола выполните выбор драйвера, как уже было описано выше."
+msgid ""
+"Choose the option <guilabel>AppSocket/HP JetDirect</guilabel> as the "
+"protocol and set the address in <guilabel>Host:</guilabel>, do not change "
+"the <guilabel>Port Number</guilabel>, unless you know that it needs to be "
+"changed. After the selection of the protocol, the selection of the driver is "
+"the same as above."
+msgstr ""
+"Выберите <guilabel>AppSocket/HP JetDirect</guilabel> в списке протоколов и "
+"укажите адрес в поле <guilabel>Узел:</guilabel>. Не изменяйте содержимое "
+"поля <guilabel>Номер порта</guilabel>, если не уверены, что это следует "
+"делать. После выбора протокола выполните выбор драйвера, как уже было "
+"описано выше."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/system-config-printer.xml:180
@@ -6517,33 +10411,66 @@ msgstr "Другие протоколы:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:188
-msgid "<emphasis>Internet Printing Protocol (ipp)</emphasis>: a printer which can be accessed on a TCP/IP network via the IPP protocol, for example a printer connected to a station using CUPS. This protocol may also be used also by some ADSL-routers."
-msgstr "<emphasis>Протокол печати через интернет (ipp)</emphasis>: принтер, доступ к которому осуществляется по сети TCP/IP с помощью протокола IPP. Например, принтер, соединенный с рабочей станцией, где используется CUPS. Этот протокол может также использоваться некоторыми ADSL-маршрутизаторами."
+msgid ""
+"<emphasis>Internet Printing Protocol (ipp)</emphasis>: a printer which can "
+"be accessed on a TCP/IP network via the IPP protocol, for example a printer "
+"connected to a station using CUPS. This protocol may also be used also by "
+"some ADSL-routers."
+msgstr ""
+"<emphasis>Протокол печати через интернет (ipp)</emphasis>: принтер, доступ к "
+"которому осуществляется по сети TCP/IP с помощью протокола IPP. Например, "
+"принтер, соединенный с рабочей станцией, где используется CUPS. Этот "
+"протокол может также использоваться некоторыми ADSL-маршрутизаторами."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:197
-msgid "<emphasis>Internet Printing Protocol (https): </emphasis>the same as ipp, but using http transport and with TLS secured protocol.  The port has to be defined. By default, the port 631 is used."
-msgstr "<emphasis>Протокол печати через интернет (https)</emphasis>: то же, что и ipp, но с использованием передачи данных HTTP с защитой TLS. Следует указать порт. По умолчанию это 631 порт."
+msgid ""
+"<emphasis>Internet Printing Protocol (https): </emphasis>the same as ipp, "
+"but using http transport and with TLS secured protocol.  The port has to be "
+"defined. By default, the port 631 is used."
+msgstr ""
+"<emphasis>Протокол печати через интернет (https)</emphasis>: то же, что и "
+"ipp, но с использованием передачи данных HTTP с защитой TLS. Следует указать "
+"порт. По умолчанию это 631 порт."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:205
-msgid "<emphasis>Internet Printing Protocol (ipps): </emphasis>the same as ipp, but with TLS secured protocol."
-msgstr "<emphasis>Протокол печати через интернет (ipps)</emphasis>: то же, что и ipp, но с защитой TLS."
+msgid ""
+"<emphasis>Internet Printing Protocol (ipps): </emphasis>the same as ipp, but "
+"with TLS secured protocol."
+msgstr ""
+"<emphasis>Протокол печати через интернет (ipps)</emphasis>: то же, что и "
+"ipp, но с защитой TLS."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:212
-msgid "<emphasis>LPD/LPR host or Printer</emphasis>: a printer which can be accessed on a TCP/IP network via the LPD protocol, for example a printer connected to a station using LPD."
-msgstr "<emphasis>Узел или принтер LPD/LPR</emphasis>: принтер, доступ к которому осуществляется по сети TCP/IP по протоколу LPD. Например принтер, соединенный с рабочей станцией, на которой используется LPD."
+msgid ""
+"<emphasis>LPD/LPR host or Printer</emphasis>: a printer which can be "
+"accessed on a TCP/IP network via the LPD protocol, for example a printer "
+"connected to a station using LPD."
+msgstr ""
+"<emphasis>Узел или принтер LPD/LPR</emphasis>: принтер, доступ к которому "
+"осуществляется по сети TCP/IP по протоколу LPD. Например принтер, "
+"соединенный с рабочей станцией, на которой используется LPD."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:220
-msgid "<emphasis>Windows printer via SAMBA</emphasis>: a printer connected to a station running Windows or a SMB server and shared."
-msgstr "<emphasis>Принтер Windows через SAMBA</emphasis>: принтер в совместном пользовании, соединенный с рабочей станцией под управлением Windows или сервером SMB."
+msgid ""
+"<emphasis>Windows printer via SAMBA</emphasis>: a printer connected to a "
+"station running Windows or a SMB server and shared."
+msgstr ""
+"<emphasis>Принтер Windows через SAMBA</emphasis>: принтер в совместном "
+"пользовании, соединенный с рабочей станцией под управлением Windows или "
+"сервером SMB."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:226
-msgid "The URI can also be added directly. Here are some examples on how to form the URI:"
-msgstr "URI также могут быть добавлены непосредственно. Вот несколько примеров форматирования URI:"
+msgid ""
+"The URI can also be added directly. Here are some examples on how to form "
+"the URI:"
+msgstr ""
+"URI также могут быть добавлены непосредственно. Вот несколько примеров "
+"форматирования URI:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:231
@@ -6582,8 +10509,12 @@ msgstr "<uri>lpd://пользователь@ip-адрес-или-имя-узла
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:251
-msgid "Additional information can be found in the <link ns2:href=\"http://www.cups.org/documentation.php/doc-1.5/network.html\">CUPS documentation.</link>"
-msgstr "Дополнительные сведения можно найти в <link ns2:href=\"http://www.cups.org/documentation.php/doc-1.5/network.html\">документации к CUPS</link>."
+msgid ""
+"Additional information can be found in the <link ns2:href=\"http://www.cups."
+"org/documentation.php/doc-1.5/network.html\">CUPS documentation.</link>"
+msgstr ""
+"Дополнительные сведения можно найти в <link ns2:href=\"http://www.cups.org/"
+"documentation.php/doc-1.5/network.html\">документации к CUPS</link>."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:256
@@ -6592,8 +10523,21 @@ msgstr "Свойства устройства"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:258
-msgid "You can access the properties of the device. The menu allows access to parameters for the CUPS server. By default a CUPS server is launched on your system, but you can specify a different one with the <guimenu>Server</guimenu> | <guimenuitem>Connect...</guimenuitem> menu, another window which gives access to the tuning of other specific parameters of the server, following <guimenu>Server</guimenu> | <guimenuitem>Settings.</guimenuitem>"
-msgstr "Вы можете просмотреть и изменить параметры работы устройства. С помощью меню можно получить доступ к панели настройки сервера CUPS. По умолчанию сервер CUPS запускается вашей операционной системой, но вы можете выбрать другой вариант с помощью пункта меню <guimenu>Сервер</guimenu> | <guimenuitem>Соединиться...</guimenuitem>. Другое окно настройки параметров сервера можно открыть с помощью пункта меню <guimenu>Сервер</guimenu> | <guimenuitem>Параметры</guimenuitem>."
+msgid ""
+"You can access the properties of the device. The menu allows access to "
+"parameters for the CUPS server. By default a CUPS server is launched on your "
+"system, but you can specify a different one with the <guimenu>Server</"
+"guimenu> | <guimenuitem>Connect...</guimenuitem> menu, another window which "
+"gives access to the tuning of other specific parameters of the server, "
+"following <guimenu>Server</guimenu> | <guimenuitem>Settings.</guimenuitem>"
+msgstr ""
+"Вы можете просмотреть и изменить параметры работы устройства. С помощью меню "
+"можно получить доступ к панели настройки сервера CUPS. По умолчанию сервер "
+"CUPS запускается вашей операционной системой, но вы можете выбрать другой "
+"вариант с помощью пункта меню <guimenu>Сервер</guimenu> | "
+"<guimenuitem>Соединиться...</guimenuitem>. Другое окно настройки параметров "
+"сервера можно открыть с помощью пункта меню <guimenu>Сервер</guimenu> | "
+"<guimenuitem>Параметры</guimenuitem>."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:268
@@ -6602,18 +10546,52 @@ msgstr "Диагностика проблем"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:270
-msgid "You can find some information on occurring errors during printing by inspecting <filename>/var/log/cups/error_log</filename>"
-msgstr "Данные об ошибках, которые могли случиться при печати, можно найти в файле <filename>/var/log/cups/error_log</filename>"
+msgid ""
+"You can find some information on occurring errors during printing by "
+"inspecting <filename>/var/log/cups/error_log</filename>"
+msgstr ""
+"Данные об ошибках, которые могли случиться при печати, можно найти в файле "
+"<filename>/var/log/cups/error_log</filename>"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:273
-msgid "You can also access to a tool to diagnose problems using the <guimenu>Help</guimenu> | <guilabel>Troubleshoot</guilabel> menu."
-msgstr "Кроме того, вы можете воспользоваться инструментом для диагностики и решения проблем. Доступ к нему можно получить с помощью пункта меню <guimenu>Справка</guimenu> | <guilabel>Устранение проблем с печатью</guilabel>."
+msgid ""
+"You can also access to a tool to diagnose problems using the <guimenu>Help</"
+"guimenu> | <guilabel>Troubleshoot</guilabel> menu."
+msgstr ""
+"Кроме того, вы можете воспользоваться инструментом для диагностики и решения "
+"проблем. Доступ к нему можно получить с помощью пункта меню "
+"<guimenu>Справка</guimenu> | <guilabel>Устранение проблем с печатью</"
+"guilabel>."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:280
-msgid "It is possible that some drivers for specific printers are not available in Mageia or are not functional. In this case, have a look at the <link ns2:href=\"http://openprinting.org/printers/\">openprinting</link> site to check if a driver for your device is available. If yes, check if the package is already present in Mageia and in this case install it manually. Then, redo the installation process to configure the printer. In all cases, report the problem in bugzilla or on the forum if you are comfortable with this tool and furnish the model and driver information and whether the printer works or not after installation. Here are some sources to find other up-to-date drivers or for more recent devices."
-msgstr "Вполне возможно, что в репозиториях Mageia нет некоторых драйверов, необходимых для работы определенных принтеров, из-за лицензионных проблем или эти драйверы оказались неработоспособными. Если вы не можете найти нужного драйвера воспользуйтесь страницей системы <link ns2:href=\"http://openprinting.org/printers/\">openprinting</link>, чтобы убедиться, существует ли драйвер вообще. Если окажется, что драйвер существует, проверьте, есть ли пакет с этим драйвером в репозиториях Mageia. Если такой пакет будет обнаружен, установите его вручную. После установки драйвера повторите процедуру установки и настройки принтера. О проблемах сообщайте с помощью системы слежения за ошибками дистрибутива или через форум. Также можно сообщать о пожеланиях относительно работы программ для настройки и о том, работает ли принтер после установки. Ниже приведены несколько адресов, по которым можно найти последние версии драйверов или драйверы к новым устройствам."
+msgid ""
+"It is possible that some drivers for specific printers are not available in "
+"Mageia or are not functional. In this case, have a look at the <link ns2:"
+"href=\"http://openprinting.org/printers/\">openprinting</link> site to check "
+"if a driver for your device is available. If yes, check if the package is "
+"already present in Mageia and in this case install it manually. Then, redo "
+"the installation process to configure the printer. In all cases, report the "
+"problem in bugzilla or on the forum if you are comfortable with this tool "
+"and furnish the model and driver information and whether the printer works "
+"or not after installation. Here are some sources to find other up-to-date "
+"drivers or for more recent devices."
+msgstr ""
+"Вполне возможно, что в репозиториях Mageia нет некоторых драйверов, "
+"необходимых для работы определенных принтеров, из-за лицензионных проблем "
+"или эти драйверы оказались неработоспособными. Если вы не можете найти "
+"нужного драйвера воспользуйтесь страницей системы <link ns2:href=\"http://"
+"openprinting.org/printers/\">openprinting</link>, чтобы убедиться, "
+"существует ли драйвер вообще. Если окажется, что драйвер существует, "
+"проверьте, есть ли пакет с этим драйвером в репозиториях Mageia. Если такой "
+"пакет будет обнаружен, установите его вручную. После установки драйвера "
+"повторите процедуру установки и настройки принтера. О проблемах сообщайте с "
+"помощью системы слежения за ошибками дистрибутива или через форум. Также "
+"можно сообщать о пожеланиях относительно работы программ для настройки и о "
+"том, работает ли принтер после установки. Ниже приведены несколько адресов, "
+"по которым можно найти последние версии драйверов или драйверы к новым "
+"устройствам."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:292
@@ -6622,28 +10600,72 @@ msgstr "<emphasis role=\"bold\">Принтеры Brother</emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:294
-msgid "<link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/download_prn.html\">This page</link> give a list of drivers provided by Brother. Search the driver for your device, download the rpm(s) and install."
-msgstr "На <link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/download_prn.html\">этой странице</link> можно найти список драйверов,  предоставляемые Brother. Найдите драйвер устройства, загрузите пакеты rpm с ним и установите эти пакеты."
+msgid ""
+"<link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/"
+"en/download_prn.html\">This page</link> give a list of drivers provided by "
+"Brother. Search the driver for your device, download the rpm(s) and install."
+msgstr ""
+"На <link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/"
+"linux/en/download_prn.html\">этой странице</link> можно найти список "
+"драйверов,  предоставляемые Brother. Найдите драйвер устройства, загрузите "
+"пакеты rpm с ним и установите эти пакеты."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:298
-msgid "You should install Brother drivers before running the configuration utility."
-msgstr "Драйвера Brother следует установить до запуска программы настройки системы печати."
+msgid ""
+"You should install Brother drivers before running the configuration utility."
+msgstr ""
+"Драйвера Brother следует установить до запуска программы настройки системы "
+"печати."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:301
-msgid "<emphasis role=\"bold\">Hewlett-Packard printers and All in one devices</emphasis>"
-msgstr "<emphasis role=\"bold\">Принтеры и многофункциональные устройства Hewlett-Packard</emphasis>"
+msgid ""
+"<emphasis role=\"bold\">Hewlett-Packard printers and All in one devices</"
+"emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Принтеры и многофункциональные устройства Hewlett-"
+"Packard</emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:304
-msgid "These devices use the hplip tool. It is installed automatically after the detection or the selection of the printer. You can find other information <link ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">here</link>.  The tool \"HP Device Manager\" is available in the <guilabel>System</guilabel> menu. Also view <link ns2:href=\"http://hplipopensource.com/hplip-web/install/manual/hp_setup.html\">configuration</link> for the management of the printer."
-msgstr "Для этих устройств используются программы из комплекта hplip. Этот комплект программ будет автоматически установлен после выбора принтера. Дополнительные сведения о комплектах программ можно найти <link ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">здесь</link>. Программу «HP Device Manager (Управление устройствами HP) можно будет найти в меню системы. Справку по настройкам принтера можно найти <link ns2:href=\"http://hplipopensource.com/hplip-web/install/manual/hp_setup.html\">здесь</link>."
+msgid ""
+"These devices use the hplip tool. It is installed automatically after the "
+"detection or the selection of the printer. You can find other information "
+"<link ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">here</"
+"link>.  The tool \"HP Device Manager\" is available in the <guilabel>System</"
+"guilabel> menu. Also view <link ns2:href=\"http://hplipopensource.com/hplip-"
+"web/install/manual/hp_setup.html\">configuration</link> for the management "
+"of the printer."
+msgstr ""
+"Для этих устройств используются программы из комплекта hplip. Этот комплект "
+"программ будет автоматически установлен после выбора принтера. "
+"Дополнительные сведения о комплектах программ можно найти <link ns2:href="
+"\"http://hplipopensource.com/hplip-web/index.html\">здесь</link>. Программу "
+"«HP Device Manager (Управление устройствами HP) можно будет найти в меню "
+"системы. Справку по настройкам принтера можно найти <link ns2:href=\"http://"
+"hplipopensource.com/hplip-web/install/manual/hp_setup.html\">здесь</link>."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:311
-msgid "A HP All in one device must be installed as a printer and the scanner features will be added. Note that sometimes, the Xsane interface doesn't allow to scan films or slides (the lighting slid can't operate).  In this case, it is possible to scan, using the standalone mode, and save the picture on a memory card or USB stick inserted in the device.  Afterwards, open your favourite imaging software and load your picture from the memory card which is appeared in the /media folder."
-msgstr "Многофункциональные устройства HP требуют установки драйвера принтера, чтобы работать и в режиме сканера. Обратите внимание, что иногда в интерфейсе программы для сканирования не предусмотрено возможностей по сканированию пленок или слайдов (не работает модуль для слайдов). В этом случае можно воспользоваться для сканирования автономным режимом с сохранением изображения на карту памяти или флэш-устройство USB, вставленный в USB порт. После сканирования полученные изображения можно перенести с носителя данных в хранилище вашего любимого программного обеспечения для работы с изображениями."
+msgid ""
+"A HP All in one device must be installed as a printer and the scanner "
+"features will be added. Note that sometimes, the Xsane interface doesn't "
+"allow to scan films or slides (the lighting slid can't operate).  In this "
+"case, it is possible to scan, using the standalone mode, and save the "
+"picture on a memory card or USB stick inserted in the device.  Afterwards, "
+"open your favourite imaging software and load your picture from the memory "
+"card which is appeared in the /media folder."
+msgstr ""
+"Многофункциональные устройства HP требуют установки драйвера принтера, чтобы "
+"работать и в режиме сканера. Обратите внимание, что иногда в интерфейсе "
+"программы для сканирования не предусмотрено возможностей по сканированию "
+"пленок или слайдов (не работает модуль для слайдов). В этом случае можно "
+"воспользоваться для сканирования автономным режимом с сохранением "
+"изображения на карту памяти или флэш-устройство USB, вставленный в USB порт. "
+"После сканирования полученные изображения можно перенести с носителя данных "
+"в хранилище вашего любимого программного обеспечения для работы с "
+"изображениями."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:319
@@ -6652,8 +10674,14 @@ msgstr "<emphasis role=\"bold\">Цветные принтеры Samsung</emphasi
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:321
-msgid "For specific Samsung and Xerox colour printers, <link ns2:href=\"http://foo2qpdl.rkkda.com/\">this site provides drivers</link> for the QPDL protocol."
-msgstr "Драйверы для отдельных цветных принтеров Samsung и Xerox, работающих по протоколу QPDL, можно найти <link ns2:href=\"http://foo2qpdl.rkkda.com/\">здесь</link>."
+msgid ""
+"For specific Samsung and Xerox colour printers, <link ns2:href=\"http://"
+"foo2qpdl.rkkda.com/\">this site provides drivers</link> for the QPDL "
+"protocol."
+msgstr ""
+"Драйверы для отдельных цветных принтеров Samsung и Xerox, работающих по "
+"протоколу QPDL, можно найти <link ns2:href=\"http://foo2qpdl.rkkda.com/"
+"\">здесь</link>."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:324
@@ -6662,13 +10690,31 @@ msgstr "<emphasis role=\"bold\">Принтеры и сканеры Epson</emphas
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:326
-msgid "Drivers for Epson printers are available from <link ns2:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this search page</link>. For the scanner part, you must install the \"iscan-data\" package first, then \"iscan\" (in this order). A iscan-plugin package can also be available and is to install. Choose the <emphasis>rpm</emphasis> packages according to your architecture."
-msgstr "Драйверы можно получить с помощью <link ns2:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">этой страницы поиска</link>. Чтобы воспользоваться сканером, вам придётся сначала установить пакет «iscan-data», а затем пакет «iscan» (именно в таком порядке). Кроме того, может возникнуть необходимость в установке пакета iscan-plugin. Выберите пакеты <emphasis>rpm</emphasis>, архитектура которых соответствует установленной на компьютере системе."
+msgid ""
+"Drivers for Epson printers are available from <link ns2:href=\"http://"
+"download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this search page</"
+"link>. For the scanner part, you must install the \"iscan-data\" package "
+"first, then \"iscan\" (in this order). A iscan-plugin package can also be "
+"available and is to install. Choose the <emphasis>rpm</emphasis> packages "
+"according to your architecture."
+msgstr ""
+"Драйверы можно получить с помощью <link ns2:href=\"http://download.ebz.epson."
+"net/dsc/search/01/search/?OSC=LX\">этой страницы поиска</link>. Чтобы "
+"воспользоваться сканером, вам придётся сначала установить пакет «iscan-"
+"data», а затем пакет «iscan» (именно в таком порядке). Кроме того, может "
+"возникнуть необходимость в установке пакета iscan-plugin. Выберите пакеты "
+"<emphasis>rpm</emphasis>, архитектура которых соответствует установленной на "
+"компьютере системе."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:332
-msgid "It is possible that the iscan package will generate a warning about a conflict with sane. Users have reported that this warning can be ignored."
-msgstr "Иногда во время установки пакета iscan может быть показано сообщение о конфликте с пакетом sane. Пользователями этого пакета сообщалось, что такие предупреждения можно смело игнорировать."
+msgid ""
+"It is possible that the iscan package will generate a warning about a "
+"conflict with sane. Users have reported that this warning can be ignored."
+msgstr ""
+"Иногда во время установки пакета iscan может быть показано сообщение о "
+"конфликте с пакетом sane. Пользователями этого пакета сообщалось, что такие "
+"предупреждения можно смело игнорировать."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:336
@@ -6677,8 +10723,13 @@ msgstr "<emphasis role=\"bold\">Принтеры Canon</emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:338
-msgid "For Canon printers, it may be advisable to install a tool named turboprint <link ns2:href=\"http://www.turboprint.info/\">available here </link>."
-msgstr "Если вы работаете с принтерами Canon, вам может пригодиться программа turboprint. Соответствующий (тестовый) пакет можно получить <link ns2:href=\"http://www.turboprint.info/\">здесь</link>."
+msgid ""
+"For Canon printers, it may be advisable to install a tool named turboprint "
+"<link ns2:href=\"http://www.turboprint.info/\">available here </link>."
+msgstr ""
+"Если вы работаете с принтерами Canon, вам может пригодиться программа "
+"turboprint. Соответствующий (тестовый) пакет можно получить <link ns2:href="
+"\"http://www.turboprint.info/\">здесь</link>."
 
 #. type: Content of: <section><info><title>
 #: en/transfugdrake.xml:9
@@ -6697,38 +10748,84 @@ msgstr "transfugdrake.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/transfugdrake.xml:22
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">transfugdrake</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">transfugdrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">transfugdrake</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">transfugdrake</emphasis> от имени администратора "
+"(root)."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the <emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
-msgstr "Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно получить с помощью пункта <emphasis role=\"bold\">Система</emphasis> из Центра управления Mageia, подпункт <guilabel>Импорт документов и настроек Windows™</guilabel>."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
+"<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
+"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+msgstr ""
+"Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить с помощью пункта <emphasis role=\"bold\">Система</emphasis> из "
+"Центра управления Mageia, подпункт <guilabel>Импорт документов и настроек "
+"Windows™</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
-msgid "The tool allows an administrator to import the user documents and settings from a <trademark class=\"registered\">Windows</trademark> 2000, <trademark class=\"registered\">Windows</trademark> XP or <trademark class=\"registered\">Windows</trademark> <trademark>Vista</trademark> installation on the same computer as the Mageia installation."
-msgstr "С помощью этого инструмента, администратор системы может импортировать документы и настройки учётных записей пользователей с установленной системы <trademark class=\"registered\">Windows</trademark> 2000, <trademark class=\"registered\">Windows</trademark> XP или <trademark class=\"registered\">Windows</trademark> <trademark>Vista</trademark> на том же компьютере, на котором установлена Mageia."
+msgid ""
+"The tool allows an administrator to import the user documents and settings "
+"from a <trademark class=\"registered\">Windows</trademark> 2000, <trademark "
+"class=\"registered\">Windows</trademark> XP or <trademark class=\"registered"
+"\">Windows</trademark> <trademark>Vista</trademark> installation on the same "
+"computer as the Mageia installation."
+msgstr ""
+"С помощью этого инструмента, администратор системы может импортировать "
+"документы и настройки учётных записей пользователей с установленной системы "
+"<trademark class=\"registered\">Windows</trademark> 2000, <trademark class="
+"\"registered\">Windows</trademark> XP или <trademark class=\"registered"
+"\">Windows</trademark> <trademark>Vista</trademark> на том же компьютере, на "
+"котором установлена Mageia."
 
 #. type: Content of: <section><warning><para>
 #: en/transfugdrake.xml:33
-msgid "Please note that all the changes will be applied by transfugdrake immediately after pressing <guibutton>Next</guibutton>."
-msgstr "Пожалуйста, обратите внимание, что все изменения вступят в силу немедленно после нажатия кнопки <guibutton>Далее</guibutton>."
+msgid ""
+"Please note that all the changes will be applied by transfugdrake "
+"immediately after pressing <guibutton>Next</guibutton>."
+msgstr ""
+"Пожалуйста, обратите внимание, что все изменения вступят в силу немедленно "
+"после нажатия кнопки <guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:37
-msgid "After starting transfugdrake you will see the first wizard page with some explanation about the tool and import options."
-msgstr "После запуска transfugdrake вы увидите первую страницу мастера с пояснениями о назначении программы и вариантами импорта данных."
+msgid ""
+"After starting transfugdrake you will see the first wizard page with some "
+"explanation about the tool and import options."
+msgstr ""
+"После запуска transfugdrake вы увидите первую страницу мастера с пояснениями "
+"о назначении программы и вариантами импорта данных."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:40
-msgid "As soon as you read and understand the instructions, press the <guibutton>Next</guibutton> button. This should run a detection of <trademark class=\"registered\">Windows</trademark> installation."
-msgstr "Как только вы прочтёте и поймёте установки, нажмите кнопку <guibutton>Далее</guibutton>. В ответ программа выполнит обнаружение соответствующих данных в установленной операционной системе <trademark class=\"registered\">Windows</trademark>."
+msgid ""
+"As soon as you read and understand the instructions, press the "
+"<guibutton>Next</guibutton> button. This should run a detection of "
+"<trademark class=\"registered\">Windows</trademark> installation."
+msgstr ""
+"Как только вы прочтёте и поймёте установки, нажмите кнопку <guibutton>Далее</"
+"guibutton>. В ответ программа выполнит обнаружение соответствующих данных в "
+"установленной операционной системе <trademark class=\"registered\">Windows</"
+"trademark>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:44
-msgid "When the detection step is complete you will see a page which allows you to choose accounts in <trademark class=\"registered\">Windows</trademark> and Mageia for the import procedure. It is possible to choose other user account than yours own."
-msgstr "После завершения процедуры выявления данных вы увидите страницу, с помощью которой сможете выбрать учётные записи в <trademark class=\"registered\">Windows</trademark> и Mageia для выполнения процедуры импорта. Вы можете выбрать не только свою учётную запись."
+msgid ""
+"When the detection step is complete you will see a page which allows you to "
+"choose accounts in <trademark class=\"registered\">Windows</trademark> and "
+"Mageia for the import procedure. It is possible to choose other user account "
+"than yours own."
+msgstr ""
+"После завершения процедуры выявления данных вы увидите страницу, с помощью "
+"которой сможете выбрать учётные записи в <trademark class=\"registered"
+"\">Windows</trademark> и Mageia для выполнения процедуры импорта. Вы можете "
+"выбрать не только свою учётную запись."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:51
@@ -6737,23 +10834,51 @@ msgstr "transfugdrake1.png"
 
 #. type: Content of: <section><note><para>
 #: en/transfugdrake.xml:56
-msgid "Please take into account that due to migrate-assistant (the backend of transfugdrake) limitations <trademark class=\"registered\">Windows</trademark> user account names with special symbols can be displayed incorrectly."
-msgstr "Пожалуйста, обратите внимание на то, что из-за ограничения migrate-assistant (основного компонента transfugdrake) названия учётных записей <trademark class=\"registered\">Windows</trademark>, которые содержат специальные символы (кириллицу), могут отображаться некорректно."
+msgid ""
+"Please take into account that due to migrate-assistant (the backend of "
+"transfugdrake) limitations <trademark class=\"registered\">Windows</"
+"trademark> user account names with special symbols can be displayed "
+"incorrectly."
+msgstr ""
+"Пожалуйста, обратите внимание на то, что из-за ограничения migrate-assistant "
+"(основного компонента transfugdrake) названия учётных записей <trademark "
+"class=\"registered\">Windows</trademark>, которые содержат специальные "
+"символы (кириллицу), могут отображаться некорректно."
 
 #. type: Content of: <section><note><para>
 #: en/transfugdrake.xml:62
-msgid "Migration may take some time depending on the size of the document folders."
-msgstr "Продолжительность переноса данных будет зависеть от размера папок с документами."
+msgid ""
+"Migration may take some time depending on the size of the document folders."
+msgstr ""
+"Продолжительность переноса данных будет зависеть от размера папок с "
+"документами."
 
 #. type: Content of: <section><warning><para>
 #: en/transfugdrake.xml:67
-msgid "Some <trademark class=\"registered\">Windows</trademark> applications (especially drivers) may create user accounts for different purposes. For example, NVidia drivers in <trademark class=\"registered\">Windows</trademark>are updated using <emphasis>UpdatusUser</emphasis>. Please do not use such accounts for the import purposes."
-msgstr "Некоторые программы <trademark class=\"registered\">Windows</trademark> (в частности драйверы) могут создавать учётные записи для реализации специальных возможностей. Например, драйверы NVidia <trademark class=\"registered\">Windows</trademark> обновляются с помощью учётной записи <emphasis>UpdatusUser</emphasis>. Пожалуйста, не используйте такие учётные записи для импорта данных."
+msgid ""
+"Some <trademark class=\"registered\">Windows</trademark> applications "
+"(especially drivers) may create user accounts for different purposes. For "
+"example, NVidia drivers in <trademark class=\"registered\">Windows</"
+"trademark>are updated using <emphasis>UpdatusUser</emphasis>. Please do not "
+"use such accounts for the import purposes."
+msgstr ""
+"Некоторые программы <trademark class=\"registered\">Windows</trademark> (в "
+"частности драйверы) могут создавать учётные записи для реализации "
+"специальных возможностей. Например, драйверы NVidia <trademark class="
+"\"registered\">Windows</trademark> обновляются с помощью учётной записи "
+"<emphasis>UpdatusUser</emphasis>. Пожалуйста, не используйте такие учётные "
+"записи для импорта данных."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:74
-msgid "When you finished with the accounts selection press <guibutton>Next</guibutton> button. The next page is used to select a method to import documents:"
-msgstr "После завершения выбора способа импорта учётных записей нажмите кнопку <guibutton>Далее</guibutton>. Следующее окно используется для выбора способа импортирования документов:"
+msgid ""
+"When you finished with the accounts selection press <guibutton>Next</"
+"guibutton> button. The next page is used to select a method to import "
+"documents:"
+msgstr ""
+"После завершения выбора способа импорта учётных записей нажмите кнопку "
+"<guibutton>Далее</guibutton>. Следующее окно используется для выбора способа "
+"импортирования документов:"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:80
@@ -6762,13 +10887,28 @@ msgstr "transfugdrake2.png"
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:84
-msgid "Transfugdrake is designed to import <trademark class=\"registered\">Windows</trademark> data from <emphasis>My Documents</emphasis>, <emphasis>My Music</emphasis> and <emphasis>My Pictures</emphasis> folders. It is possible to skip import by selecting the appropriate item in this window."
-msgstr "Transfugdrake разработан для импорта данных <trademark class=\"registered\">Windows</trademark> из <emphasis>Мои документы</emphasis>, <emphasis>Моя музыка</emphasis> и <emphasis>Мои рисунки</emphasis>. Вы можете не выполнять импорт определённых данных, сняв галочку c соответствующего пункта в этом окне."
+msgid ""
+"Transfugdrake is designed to import <trademark class=\"registered\">Windows</"
+"trademark> data from <emphasis>My Documents</emphasis>, <emphasis>My Music</"
+"emphasis> and <emphasis>My Pictures</emphasis> folders. It is possible to "
+"skip import by selecting the appropriate item in this window."
+msgstr ""
+"Transfugdrake разработан для импорта данных <trademark class=\"registered"
+"\">Windows</trademark> из <emphasis>Мои документы</emphasis>, <emphasis>Моя "
+"музыка</emphasis> и <emphasis>Мои рисунки</emphasis>. Вы можете не выполнять "
+"импорт определённых данных, сняв галочку c соответствующего пункта в этом "
+"окне."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:89
-msgid "When you finished with the document import method choosing press <guibutton>Next</guibutton> button. The next page is used to select a method to import bookmarks:"
-msgstr "После завершения выбора способа импортирования документов нажмите кнопку <guibutton>Далее</guibutton>. Следующее окно используется для выбора способа импортирования закладок:"
+msgid ""
+"When you finished with the document import method choosing press "
+"<guibutton>Next</guibutton> button. The next page is used to select a method "
+"to import bookmarks:"
+msgstr ""
+"После завершения выбора способа импортирования документов нажмите кнопку "
+"<guibutton>Далее</guibutton>. Следующее окно используется для выбора способа "
+"импортирования закладок:"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:95
@@ -6777,18 +10917,30 @@ msgstr "transfugdrake3.png"
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:99
-msgid "Transfugdrake can import <emphasis>Internet Explorer</emphasis> and <emphasis>Mozilla Firefox</emphasis> bookmarks into the bookmarks of Mageia <emphasis>Mozilla Firefox</emphasis> instance."
-msgstr "Transfugdrake может импортировать закладки <emphasis>Internet Explorer</emphasis> и <emphasis>Mozilla Firefox</emphasis> в закладки программы <emphasis>Mozilla Firefox</emphasis>, установленную в Mageia."
+msgid ""
+"Transfugdrake can import <emphasis>Internet Explorer</emphasis> and "
+"<emphasis>Mozilla Firefox</emphasis> bookmarks into the bookmarks of Mageia "
+"<emphasis>Mozilla Firefox</emphasis> instance."
+msgstr ""
+"Transfugdrake может импортировать закладки <emphasis>Internet Explorer</"
+"emphasis> и <emphasis>Mozilla Firefox</emphasis> в закладки программы "
+"<emphasis>Mozilla Firefox</emphasis>, установленную в Mageia."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:103
-msgid "Choose the preferred import option and press the <guibutton>Next</guibutton> button."
-msgstr "Выберите желаемый вариант импорта и нажмите кнопку <guibutton>Далее</guibutton>."
+msgid ""
+"Choose the preferred import option and press the <guibutton>Next</guibutton> "
+"button."
+msgstr ""
+"Выберите желаемый вариант импорта и нажмите кнопку <guibutton>Далее</"
+"guibutton>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:112
 msgid "The next page allows you to import desktop background:"
-msgstr "С помощью следующей страницы вы сможете импортировать изображения фона рабочего стола:"
+msgstr ""
+"С помощью следующей страницы вы сможете импортировать изображения фона "
+"рабочего стола:"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:116
@@ -6797,13 +10949,19 @@ msgstr "transfugdrake4.png"
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:120
-msgid "Choose the preferred option and press the <guibutton>Next</guibutton> button."
-msgstr "Выберите желаемый вариант и нажмите кнопку <guibutton>Далее</guibutton>."
+msgid ""
+"Choose the preferred option and press the <guibutton>Next</guibutton> button."
+msgstr ""
+"Выберите желаемый вариант и нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:123
-msgid "The last page of wizard shows some congratulation message. Just press the <guibutton>Finish</guibutton> button."
-msgstr "На последней странице мастера будет показано сообщение с приветствием. Просто нажмите кнопку <guibutton>Завершить</guibutton>."
+msgid ""
+"The last page of wizard shows some congratulation message. Just press the "
+"<guibutton>Finish</guibutton> button."
+msgstr ""
+"На последней странице мастера будет показано сообщение с приветствием. "
+"Просто нажмите кнопку <guibutton>Завершить</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:128
@@ -6827,23 +10985,47 @@ msgstr "userdrake.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/userdrake.xml:23
-msgid "You can start this tool from the command line, by typing <emphasis role=\"bold\">userdrake</emphasis> as root."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">userdrake</emphasis> от имени администратора (root)."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">userdrake</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">userdrake</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:22
-msgid "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the <emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center labelled \"Manage users on system\""
-msgstr "Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно получить с помощью пункта <emphasis role=\"bold\">Система</emphasis> из Центра управления Mageia, пункт «Управление пользователями»."
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
+"<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
+"labelled \"Manage users on system\""
+msgstr ""
+"Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно "
+"получить с помощью пункта <emphasis role=\"bold\">Система</emphasis> из "
+"Центра управления Mageia, пункт «Управление пользователями»."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:27
-msgid "The tool allows an administrator to manage the users and the groups, this means to add or delete a user or group and to modify user and group settings (ID, shell, ...)"
-msgstr "С помощью этого инструмента, администратор системы может управлять пользователями и группами пользователей, то есть добавлять или удалять пользователя или группу и вносить изменения в параметры записи пользователя или группы (идентификатора, командной оболочки и т.п.)."
+msgid ""
+"The tool allows an administrator to manage the users and the groups, this "
+"means to add or delete a user or group and to modify user and group settings "
+"(ID, shell, ...)"
+msgstr ""
+"С помощью этого инструмента, администратор системы может управлять "
+"пользователями и группами пользователей, то есть добавлять или удалять "
+"пользователя или группу и вносить изменения в параметры записи пользователя "
+"или группы (идентификатора, командной оболочки и т.п.)."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:31
-msgid "When userdrake is opened, all the users existing on the system are listed in the <guibutton>Users</guibutton> tab, and all the groups in the <guibutton>Groups</guibutton> tab. Both tabs operate the same way."
-msgstr "В открытом окне userdrake будет показан список всех пользователей системы на вкладке <guibutton>Пользователи</guibutton>, а список всех групп - на вкладке <guibutton>Группы</guibutton>. Принцип работы с двумя вкладками является одинаковым."
+msgid ""
+"When userdrake is opened, all the users existing on the system are listed in "
+"the <guibutton>Users</guibutton> tab, and all the groups in the "
+"<guibutton>Groups</guibutton> tab. Both tabs operate the same way."
+msgstr ""
+"В открытом окне userdrake будет показан список всех пользователей системы на "
+"вкладке <guibutton>Пользователи</guibutton>, а список всех групп - на "
+"вкладке <guibutton>Группы</guibutton>. Принцип работы с двумя вкладками "
+"является одинаковым."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:35
@@ -6853,7 +11035,8 @@ msgstr "<guibutton>1. Добавить пользователя</guibutton>"
 #. type: Content of: <section><para>
 #: en/userdrake.xml:37
 msgid "This button opens a new window with all fields shown empty:"
-msgstr "С помощью этой кнопки можно открыть новое окно с незаполненными полями:"
+msgstr ""
+"С помощью этой кнопки можно открыть новое окно с незаполненными полями:"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/userdrake.xml:41
@@ -6862,38 +11045,81 @@ msgstr "userdrake1.png"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:45
-msgid "The field <emphasis role=\"bold\">Full Name</emphasis> is intended for the entry of a family name and first name, but it is possible to write anything or nothing as well!"
-msgstr "Поле <emphasis role=\"bold\">Имя полностью</emphasis> предназначено для ввода фамилии и имени, но вы можете ввести в него любые данные!"
+msgid ""
+"The field <emphasis role=\"bold\">Full Name</emphasis> is intended for the "
+"entry of a family name and first name, but it is possible to write anything "
+"or nothing as well!"
+msgstr ""
+"Поле <emphasis role=\"bold\">Имя полностью</emphasis> предназначено для "
+"ввода фамилии и имени, но вы можете ввести в него любые данные!"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:49
 msgid "<emphasis role=\"bold\">Login</emphasis> is the only required field."
-msgstr "Поле <emphasis role=\"bold\">Пользователь</emphasis> является единственным обязательным для заполнения."
+msgstr ""
+"Поле <emphasis role=\"bold\">Пользователь</emphasis> является единственным "
+"обязательным для заполнения."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:52
-msgid "Setting a <emphasis role=\"bold\">Password</emphasis> is highly recommended. There is a little shield on the right, if it is red, the password is weak, too short or is too similar to the login name. You should use figures, lower and upper case characters, punctuation marks, etc. The shield will turn orange and then green as the password strength improves."
-msgstr "Мы настоятельно рекомендуем вам установить <emphasis role=\"bold\">Пароль</emphasis> к учётной записи пользователя. Справа от поля пароля вы увидите небольшое изображение щита. Если цвет этого щита будет красным, то указанный пароль является слишком простым, слишком коротким или слишком похожим на название учётной записи. В пароле вам следует использовать цифры, строчные и прописные буквы, знаки препинания и т.д. С повышением сложности пароля цвет щита изменится на желтый, а потом на зелёный."
+msgid ""
+"Setting a <emphasis role=\"bold\">Password</emphasis> is highly recommended. "
+"There is a little shield on the right, if it is red, the password is weak, "
+"too short or is too similar to the login name. You should use figures, lower "
+"and upper case characters, punctuation marks, etc. The shield will turn "
+"orange and then green as the password strength improves."
+msgstr ""
+"Мы настоятельно рекомендуем вам установить <emphasis role=\"bold\">Пароль</"
+"emphasis> к учётной записи пользователя. Справа от поля пароля вы увидите "
+"небольшое изображение щита. Если цвет этого щита будет красным, то указанный "
+"пароль является слишком простым, слишком коротким или слишком похожим на "
+"название учётной записи. В пароле вам следует использовать цифры, строчные и "
+"прописные буквы, знаки препинания и т.д. С повышением сложности пароля цвет "
+"щита изменится на желтый, а потом на зелёный."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:59
-msgid "<emphasis role=\"bold\">Confirm Password</emphasis> field is there to ensure you entered what you intended to."
-msgstr "В поле <emphasis role=\"bold\">Подтвердите пароль</emphasis> вам следует повторно ввести пароль, чтобы обеспечить соответствие символов вашим намерениям."
+msgid ""
+"<emphasis role=\"bold\">Confirm Password</emphasis> field is there to ensure "
+"you entered what you intended to."
+msgstr ""
+"В поле <emphasis role=\"bold\">Подтвердите пароль</emphasis> вам следует "
+"повторно ввести пароль, чтобы обеспечить соответствие символов вашим "
+"намерениям."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:62
-msgid "<emphasis role=\"bold\">Login Shell </emphasis>is a drop down list that allows you to change the shell used by the user you are adding, the options are Bash, Dash and Sh."
-msgstr "<emphasis role=\"bold\">Командная оболочка</emphasis>: с помощью этого выпадающего списка вы можете изменить командную оболочку, которая будет использоваться для работы пользователя, учётную запись которого вы добавляете. Возможны следующие варианты: Bash, Dash и Sh."
+msgid ""
+"<emphasis role=\"bold\">Login Shell </emphasis>is a drop down list that "
+"allows you to change the shell used by the user you are adding, the options "
+"are Bash, Dash and Sh."
+msgstr ""
+"<emphasis role=\"bold\">Командная оболочка</emphasis>: с помощью этого "
+"выпадающего списка вы можете изменить командную оболочку, которая будет "
+"использоваться для работы пользователя, учётную запись которого вы "
+"добавляете. Возможны следующие варианты: Bash, Dash и Sh."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:66
-msgid "<emphasis role=\"bold\">Create a private group for the user</emphasis>, if checked will automatically create a group with the same name and the new user as the only member (this may be edited)."
-msgstr "Если будет выбрана опция <emphasis role=\"bold\">Создать личную группу для пользователя</emphasis>, userdrake автоматически создаст группу с тем же названием, что и название учётной записи нового пользователя, и единственным участником (позже параметры группы можно изменить)."
+msgid ""
+"<emphasis role=\"bold\">Create a private group for the user</emphasis>, if "
+"checked will automatically create a group with the same name and the new "
+"user as the only member (this may be edited)."
+msgstr ""
+"Если будет выбрана опция <emphasis role=\"bold\">Создать личную группу для "
+"пользователя</emphasis>, userdrake автоматически создаст группу с тем же "
+"названием, что и название учётной записи нового пользователя, и единственным "
+"участником (позже параметры группы можно изменить)."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:70
-msgid "The other options should be obvious. The new user is created immediately after you click on <guibutton>OK</guibutton>."
-msgstr "Назначение других пунктов диалогового окна понятно из надписей. Запись нового пользователя будет создана сразу после нажатия кнопки <guibutton>OK</guibutton>."
+msgid ""
+"The other options should be obvious. The new user is created immediately "
+"after you click on <guibutton>OK</guibutton>."
+msgstr ""
+"Назначение других пунктов диалогового окна понятно из надписей. Запись "
+"нового пользователя будет создана сразу после нажатия кнопки <guibutton>OK</"
+"guibutton>."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:73
@@ -6902,18 +11128,28 @@ msgstr "<emphasis role=\"bold\">2. Добавить группу</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:75
-msgid "You only need to enter the new group name, and if required, the specific group ID."
-msgstr "Вам следует лишь указать название новой группы и если это нужно, специфический номер-идентификатор группы."
+msgid ""
+"You only need to enter the new group name, and if required, the specific "
+"group ID."
+msgstr ""
+"Вам следует лишь указать название новой группы и если это нужно, "
+"специфический номер-идентификатор группы."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:78
 msgid "<emphasis role=\"bold\">3 Edit</emphasis> (a selected user)"
-msgstr "<emphasis role=\"bold\">3. Редактировать</emphasis> (выбранного пользователя)"
+msgstr ""
+"<emphasis role=\"bold\">3. Редактировать</emphasis> (выбранного пользователя)"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:80
-msgid "<guibutton>User Data</guibutton>: Allows you to modify all the data given for the user at creation (the ID can't be changed)."
-msgstr "<guibutton>Данные Пользователя</guibutton>: с помощью этой вкладки вы можете изменить все данные, указанные в учётной записи пользователя во время её создания (но идентификатор записи пользователя ID изменять нельзя)."
+msgid ""
+"<guibutton>User Data</guibutton>: Allows you to modify all the data given "
+"for the user at creation (the ID can't be changed)."
+msgstr ""
+"<guibutton>Данные Пользователя</guibutton>: с помощью этой вкладки вы можете "
+"изменить все данные, указанные в учётной записи пользователя во время её "
+"создания (но идентификатор записи пользователя ID изменять нельзя)."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:83
@@ -6927,13 +11163,24 @@ msgstr "userdrake2.png"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:91
-msgid "The first option is for setting an expiration date for the account.  Connection is impossible after this date. This is useful for temporary accounts."
-msgstr "Первый пункт предназначен для установления предельного срока действия учётной записи. По завершению срока действия вход в аккаунт станет невозможным. Этим пунктом можно воспользоваться для создания временных учётных записей."
+msgid ""
+"The first option is for setting an expiration date for the account.  "
+"Connection is impossible after this date. This is useful for temporary "
+"accounts."
+msgstr ""
+"Первый пункт предназначен для установления предельного срока действия "
+"учётной записи. По завершению срока действия вход в аккаунт станет "
+"невозможным. Этим пунктом можно воспользоваться для создания временных "
+"учётных записей."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:95
-msgid "The second option is to lock the account, connection is impossible as long as the account is locked."
-msgstr "Второй пункт предназначен для блокировки учётной записи. Вход в заблокированные учётные записи невозможен."
+msgid ""
+"The second option is to lock the account, connection is impossible as long "
+"as the account is locked."
+msgstr ""
+"Второй пункт предназначен для блокировки учётной записи. Вход в "
+"заблокированные учётные записи невозможен."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:98
@@ -6942,8 +11189,15 @@ msgstr "Также можно изменить значок пользовате
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:100
-msgid "<emphasis role=\"bold\">Password Info</emphasis>: Allows you to set an expiration date for the password, this forces the user to change his password periodically."
-msgstr "<emphasis role=\"bold\">Информация о пароле</emphasis>: с помощью этой вкладки вы можете установить срок действия пароля. Установление срока действия побуждает пользователя к периодической смене пароля, с целью обеспечения лучшей защиты системы от несанкционированного вмешательства."
+msgid ""
+"<emphasis role=\"bold\">Password Info</emphasis>: Allows you to set an "
+"expiration date for the password, this forces the user to change his "
+"password periodically."
+msgstr ""
+"<emphasis role=\"bold\">Информация о пароле</emphasis>: с помощью этой "
+"вкладки вы можете установить срок действия пароля. Установление срока "
+"действия побуждает пользователя к периодической смене пароля, с целью "
+"обеспечения лучшей защиты системы от несанкционированного вмешательства."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/userdrake.xml:106
@@ -6952,28 +11206,46 @@ msgstr "userdrake3.png"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:110
-msgid "<emphasis role=\"bold\">Group</emphasis>: Here you can select the groups that the user is a member of."
-msgstr "<emphasis role=\"bold\">Группы</emphasis>: с помощью этой вкладки вы можете выбрать группы, участником которых будет пользователь."
+msgid ""
+"<emphasis role=\"bold\">Group</emphasis>: Here you can select the groups "
+"that the user is a member of."
+msgstr ""
+"<emphasis role=\"bold\">Группы</emphasis>: с помощью этой вкладки вы можете "
+"выбрать группы, участником которых будет пользователь."
 
 #. type: Content of: <section><note><para>
 #: en/userdrake.xml:114
-msgid "If you are modifying a connected user account, modifications will not be effective until his/her next login."
-msgstr "Если изменения будут внесены в учётную запись пользователя, который уже работает в системе, то эти изменения вступят в силу только после перезагрузки системы."
+msgid ""
+"If you are modifying a connected user account, modifications will not be "
+"effective until his/her next login."
+msgstr ""
+"Если изменения будут внесены в учётную запись пользователя, который уже "
+"работает в системе, то эти изменения вступят в силу только после "
+"перезагрузки системы."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:118
 msgid "<emphasis role=\"bold\">4 Edit</emphasis> (with a group selected)"
-msgstr "<emphasis role=\"bold\">4. Редактировать</emphasis> (обозначенную группу)"
+msgstr ""
+"<emphasis role=\"bold\">4. Редактировать</emphasis> (обозначенную группу)"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:120
-msgid "<emphasis role=\"bold\">Group Data</emphasis>: Allows you to modify the group name."
-msgstr "<emphasis role=\"bold\">Данные группы</emphasis>: с помощью этой вкладки можно изменить название группы."
+msgid ""
+"<emphasis role=\"bold\">Group Data</emphasis>: Allows you to modify the "
+"group name."
+msgstr ""
+"<emphasis role=\"bold\">Данные группы</emphasis>: с помощью этой вкладки "
+"можно изменить название группы."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:123
-msgid "<emphasis role=\"bold\">Group Users</emphasis>: Here you can select the users who are members of the group"
-msgstr "<emphasis role=\"bold\">Группы пользователей</emphasis>: с помощью этой вкладки вы можете выбрать пользователей, которые будут участниками группы."
+msgid ""
+"<emphasis role=\"bold\">Group Users</emphasis>: Here you can select the "
+"users who are members of the group"
+msgstr ""
+"<emphasis role=\"bold\">Группы пользователей</emphasis>: с помощью этой "
+"вкладки вы можете выбрать пользователей, которые будут участниками группы."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:126
@@ -6982,8 +11254,19 @@ msgstr "<emphasis role=\"bold\">5. Удалить</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:128
-msgid "Select a user or a group and click on <emphasis role=\"bold\">Delete</emphasis> to remove it. For a user, a window appears to ask if home directory and mailbox must also be deleted. If a private group has been created for the user, it will be deleted as well."
-msgstr "Чтобы удалить учётную запись пользователя или группу, выберите запись в списке и нажмите кнопку <emphasis role=\"bold\">Удалить</emphasis>. Если был указан пункт учётной записи пользователя, будет показано окно с вопросом, следует ли удалить также домашний каталог и каталог почтового ящика пользователя. Если для учётной записи пользователя была создана личная группа, то эта группа будет также удалена вместе с учётной записью пользователя."
+msgid ""
+"Select a user or a group and click on <emphasis role=\"bold\">Delete</"
+"emphasis> to remove it. For a user, a window appears to ask if home "
+"directory and mailbox must also be deleted. If a private group has been "
+"created for the user, it will be deleted as well."
+msgstr ""
+"Чтобы удалить учётную запись пользователя или группу, выберите запись в "
+"списке и нажмите кнопку <emphasis role=\"bold\">Удалить</emphasis>. Если был "
+"указан пункт учётной записи пользователя, будет показано окно с вопросом, "
+"следует ли удалить также домашний каталог и каталог почтового ящика "
+"пользователя. Если для учётной записи пользователя была создана личная "
+"группа, то эта группа будет также удалена вместе с учётной записью "
+"пользователя."
 
 #. type: Content of: <section><warning><para>
 #: en/userdrake.xml:133
@@ -6997,8 +11280,12 @@ msgstr "<emphasis role=\"bold\">6. Восстановить</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:138
-msgid "The User database can be changed outside of Userdrake. Click on this icon to refresh the display."
-msgstr "База данных учётных записей пользователей может быть изменена за пределами Userdrake. Нажмите эту кнопку, чтобы обновить данные в списке."
+msgid ""
+"The User database can be changed outside of Userdrake. Click on this icon to "
+"refresh the display."
+msgstr ""
+"База данных учётных записей пользователей может быть изменена за пределами "
+"Userdrake. Нажмите эту кнопку, чтобы обновить данные в списке."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:141
@@ -7007,8 +11294,23 @@ msgstr "<emphasis роль=\"bold\">7 Гостевой аккаунт</emphasis>
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:143
-msgid "<emphasis role=\"bold\">guest</emphasis> is a special account. It is intended to give somebody temporary access to the system with total security. Login is xguest, there is no password, and it is impossible to make modifications to the system from this account. The personal directories are deleted at the end of the session. This account is enabled by default, to disable it, click in the menu on<guimenu> Actions -> Uninstall guest account</guimenu>."
-msgstr "<emphasis role=\"bold\">guest</emphasis> является особой учётной записью. Она предназначена для предоставления кому-либо временного доступа к системе с максимальными мерами безопасности. Именем пользователя такой записи является xguest, пароль пустой. Внесение каких-либо изменений в систему с этой учётной записи невозможно. Личные каталоги пользователя учётной записи будут удалятся сразу по завершению сеанса работы в аккаунте. По умолчанию учётная запись включена. Чтобы отключить её, воспользуйтесь пунктом меню <guimenu>Действия -> Удалить аккаунт для гостя</guimenu>."
+msgid ""
+"<emphasis role=\"bold\">guest</emphasis> is a special account. It is "
+"intended to give somebody temporary access to the system with total "
+"security. Login is xguest, there is no password, and it is impossible to "
+"make modifications to the system from this account. The personal directories "
+"are deleted at the end of the session. This account is enabled by default, "
+"to disable it, click in the menu on<guimenu> Actions -> Uninstall guest "
+"account</guimenu>."
+msgstr ""
+"<emphasis role=\"bold\">guest</emphasis> является особой учётной записью. "
+"Она предназначена для предоставления кому-либо временного доступа к системе "
+"с максимальными мерами безопасности. Именем пользователя такой записи "
+"является xguest, пароль пустой. Внесение каких-либо изменений в систему с "
+"этой учётной записи невозможно. Личные каталоги пользователя учётной записи "
+"будут удалятся сразу по завершению сеанса работы в аккаунте. По умолчанию "
+"учётная запись включена. Чтобы отключить её, воспользуйтесь пунктом меню "
+"<guimenu>Действия -> Удалить аккаунт для гостя</guimenu>."
 
 #. type: Content of: <section><info><title>
 #: en/XFdrake.xml:3
@@ -7027,18 +11329,34 @@ msgstr "XFdrake.png"
 
 #. type: Content of: <section><para><footnote><para>
 #: en/XFdrake.xml:17
-msgid "You can start this tool from the command line, by typing <emphasis>XFdrake</emphasis> as normal user or <emphasis>drakx11</emphasis> as root. Mind the capital letters."
-msgstr "Запустить эту программу можно с помощью терминала: достаточно ввести команду <emphasis role=\"bold\">XFdrake</emphasis> от имени обычного пользователя или команду <emphasis>drakx11</emphasis> от имени администратора (root). Обратите внимание на регистр используемых в командах букв."
+msgid ""
+"You can start this tool from the command line, by typing <emphasis>XFdrake</"
+"emphasis> as normal user or <emphasis>drakx11</emphasis> as root. Mind the "
+"capital letters."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">XFdrake</emphasis> от имени обычного пользователя "
+"или команду <emphasis>drakx11</emphasis> от имени администратора (root). "
+"Обратите внимание на регистр используемых в командах букв."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:14
-msgid "This tool is present in the Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</emphasis>. Select <emphasis><guilabel>Set up the graphical server</guilabel></emphasis>.  <placeholder type=\"footnote\" id=\"0\"/>"
-msgstr "Доступ к этой программе можно получить из Центра управления Mageia, пункт <emphasis role=\"bold\">Оборудование</emphasis>. Выберете <emphasis><guilabel>Настройка графического сервера</guilabel></emphasis>. <placeholder type=\"footnote\" id=\"0\"/>"
+msgid ""
+"This tool is present in the Mageia Control Center under the tab <emphasis "
+"role=\"bold\">Hardware</emphasis>. Select <emphasis><guilabel>Set up the "
+"graphical server</guilabel></emphasis>.  <placeholder type=\"footnote\" id="
+"\"0\"/>"
+msgstr ""
+"Доступ к этой программе можно получить из Центра управления Mageia, пункт "
+"<emphasis role=\"bold\">Оборудование</emphasis>. Выберете "
+"<emphasis><guilabel>Настройка графического сервера</guilabel></emphasis>. "
+"<placeholder type=\"footnote\" id=\"0\"/>"
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:23
 msgid "The buttons allow you to change the graphical configuration."
-msgstr "С помощью этих кнопок можно настроить параметры графической подсистемы."
+msgstr ""
+"С помощью этих кнопок можно настроить параметры графической подсистемы."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:25
@@ -7047,28 +11365,61 @@ msgstr "<emphasis role=\"bold\">Графическая карта</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:27
-msgid "The graphic card currently detected is displayed and the matching server configured. Click on this button to change to another server, for example one with a proprietary driver."
-msgstr "Здесь показано - программой обнаружен тип графической карты и соответствующий драйвер. Нажмите кнопку, чтобы изменить на другой, например, на проприетарный (с закрытым кодом) драйвер от производителя."
+msgid ""
+"The graphic card currently detected is displayed and the matching server "
+"configured. Click on this button to change to another server, for example "
+"one with a proprietary driver."
+msgstr ""
+"Здесь показано - программой обнаружен тип графической карты и "
+"соответствующий драйвер. Нажмите кнопку, чтобы изменить на другой, например, "
+"на проприетарный (с закрытым кодом) драйвер от производителя."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:31
-msgid "The available servers are sorted under <guilabel>Vendor</guilabel> by manufacturer in alphabetical order and then by model also in alphabetical order. The free drivers are sorted by alphabetical order under<guilabel> Xorg</guilabel>."
-msgstr "Доступные драйверы упорядочены в списке <guilabel>Производитель</guilabel> по производителю по алфавиту, а затем по модели также по алфавиту. Свободные драйверы отсортированы в алфавитном порядке в списке <guilabel>Xorg</guilabel>"
+msgid ""
+"The available servers are sorted under <guilabel>Vendor</guilabel> by "
+"manufacturer in alphabetical order and then by model also in alphabetical "
+"order. The free drivers are sorted by alphabetical order under<guilabel> "
+"Xorg</guilabel>."
+msgstr ""
+"Доступные драйверы упорядочены в списке <guilabel>Производитель</guilabel> "
+"по производителю по алфавиту, а затем по модели также по алфавиту. Свободные "
+"драйверы отсортированы в алфавитном порядке в списке <guilabel>Xorg</"
+"guilabel>"
 
 #. type: Content of: <section><para><note><para>
 #: en/XFdrake.xml:37
-msgid "In case of problems, <emphasis>Xorg - Vesa</emphasis> will work with most graphic cards and give you time to find and install the right driver while in your Desktop Environment."
-msgstr "Если у вас возникнут проблемы, вы можете воспользоваться вариантом <emphasis>Xorg - Vesa</emphasis>, который работает для большинства карт и предоставит вам возможность найти и установить драйвер, работая в ваших графических средах."
+msgid ""
+"In case of problems, <emphasis>Xorg - Vesa</emphasis> will work with most "
+"graphic cards and give you time to find and install the right driver while "
+"in your Desktop Environment."
+msgstr ""
+"Если у вас возникнут проблемы, вы можете воспользоваться вариантом "
+"<emphasis>Xorg - Vesa</emphasis>, который работает для большинства карт и "
+"предоставит вам возможность найти и установить драйвер, работая в ваших "
+"графических средах."
 
 #. type: Content of: <section><para><note><para>
 #: en/XFdrake.xml:38
-msgid "If even Vesa doesn't work, choose <emphasis><guilabel>Xorg</guilabel> - <guilabel>fbdev</guilabel></emphasis>, which is used while installing Mageia, but doesn't allow you to change resolution or refresh rates."
-msgstr "Если даже Vesa не работает, то выберите вариант <emphasis><guilabel>Xorg</guilabel> - <guilabel>fbdev</guilabel></emphasis>, который используется во время установки Mageia, но не предоставляет возможности менять разрешение или частоту обновления изображения."
+msgid ""
+"If even Vesa doesn't work, choose <emphasis><guilabel>Xorg</guilabel> - "
+"<guilabel>fbdev</guilabel></emphasis>, which is used while installing "
+"Mageia, but doesn't allow you to change resolution or refresh rates."
+msgstr ""
+"Если даже Vesa не работает, то выберите вариант <emphasis><guilabel>Xorg</"
+"guilabel> - <guilabel>fbdev</guilabel></emphasis>, который используется во "
+"время установки Mageia, но не предоставляет возможности менять разрешение "
+"или частоту обновления изображения."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:39
-msgid "If you made your choice for a free driver, you may be asked if you want to use a proprietary driver instead with more features (3D effects for example)."
-msgstr "Если вы ранее выбрали свободный драйвер, то система может предложить вам воспользоваться вместо него проприетарным (с закрытым кодом) драйвером, который имеет более широкие возможности (например, 3D эффекты)."
+msgid ""
+"If you made your choice for a free driver, you may be asked if you want to "
+"use a proprietary driver instead with more features (3D effects for example)."
+msgstr ""
+"Если вы ранее выбрали свободный драйвер, то система может предложить вам "
+"воспользоваться вместо него проприетарным (с закрытым кодом) драйвером, "
+"который имеет более широкие возможности (например, 3D эффекты)."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:45
@@ -7077,8 +11428,16 @@ msgstr "<emphasis role=\"bold\">Монитор:</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:47
-msgid "In the same way as above, the monitor currently detected is displayed and you can click on the button to change to another one. If the desired monitor isn't in the <guilabel>Vendor</guilabel> list, choose in the <guilabel>Generic</guilabel> list a monitor with the same features."
-msgstr "Наряду с этим пунктом будет показан монитор, определённый системой. Нажмите кнопку, чтобы изменить определённое название на другое. Если нужного вам названия нет в списке <guilabel>Производитель</guilabel>, то вы можете выбрать наиболее подходящий монитор в поле <guilabel>Общий</guilabel>."
+msgid ""
+"In the same way as above, the monitor currently detected is displayed and "
+"you can click on the button to change to another one. If the desired monitor "
+"isn't in the <guilabel>Vendor</guilabel> list, choose in the "
+"<guilabel>Generic</guilabel> list a monitor with the same features."
+msgstr ""
+"Наряду с этим пунктом будет показан монитор, определённый системой. Нажмите "
+"кнопку, чтобы изменить определённое название на другое. Если нужного вам "
+"названия нет в списке <guilabel>Производитель</guilabel>, то вы можете "
+"выбрать наиболее подходящий монитор в поле <guilabel>Общий</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:54
@@ -7087,8 +11446,13 @@ msgstr "<emphasis role=\"bold\">Разрешение:</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:56
-msgid "This button allows the choice of the resolution (number of pixels) and the colour depth (number of colours). It displays this screen:"
-msgstr "С помощью этой кнопки можно выбрать разрешение (количество пикселей) и глубину цвета (число цветов в изображении). В ответ на её нажатие будет показано следующее окно:"
+msgid ""
+"This button allows the choice of the resolution (number of pixels) and the "
+"colour depth (number of colours). It displays this screen:"
+msgstr ""
+"С помощью этой кнопки можно выбрать разрешение (количество пикселей) и "
+"глубину цвета (число цветов в изображении). В ответ на её нажатие будет "
+"показано следующее окно:"
 
 #. type: Attribute 'fileref' of: <section><para><mediaobject><imageobject><imagedata>
 #: en/XFdrake.xml:61
@@ -7097,23 +11461,46 @@ msgstr "XFdrake1.png"
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:59
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>The image of the monitor in the middle gives a preview with the chosen configuration."
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>На изображении монитора посередине окна будет показан предварительный просмотр текущих настроек."
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>The image of the monitor in the "
+"middle gives a preview with the chosen configuration."
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>На изображении монитора "
+"посередине окна будет показан предварительный просмотр текущих настроек."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:66
-msgid "The first button shows the currently resolution, click to change for another one. The list gives all the possible choices according to the graphic card and the monitor, it is possible to click on <guilabel>Other</guilabel> to set other resolutions, but bear in mind that you can damage your monitor or select an uncomfortable setting."
-msgstr "На первой кнопке будет показано текущее разрешение. Нажмите, чтобы изменить разрешение. В списке будут показаны возможные варианты, что соответствует возможностям графической карты и монитора. Вы можете выбрать пункт <guilabel>Другие</guilabel>, чтобы указать другое разрешение, но стоит учитывать то, что произвольное изменение параметров разрешения может привести к повреждению монитора или нарушению комфортности работы."
+msgid ""
+"The first button shows the currently resolution, click to change for another "
+"one. The list gives all the possible choices according to the graphic card "
+"and the monitor, it is possible to click on <guilabel>Other</guilabel> to "
+"set other resolutions, but bear in mind that you can damage your monitor or "
+"select an uncomfortable setting."
+msgstr ""
+"На первой кнопке будет показано текущее разрешение. Нажмите, чтобы изменить "
+"разрешение. В списке будут показаны возможные варианты, что соответствует "
+"возможностям графической карты и монитора. Вы можете выбрать пункт "
+"<guilabel>Другие</guilabel>, чтобы указать другое разрешение, но стоит "
+"учитывать то, что произвольное изменение параметров разрешения может "
+"привести к повреждению монитора или нарушению комфортности работы."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:72
-msgid "The second button shows the currently colour depth, click to change this for another one."
-msgstr "На второй кнопке будет показана текущая глубина цвета. Нажмите кнопку, чтобы изменить глубину цвета на другую."
+msgid ""
+"The second button shows the currently colour depth, click to change this for "
+"another one."
+msgstr ""
+"На второй кнопке будет показана текущая глубина цвета. Нажмите кнопку, чтобы "
+"изменить глубину цвета на другую."
 
 #. type: Content of: <section><para><note><para>
 #: en/XFdrake.xml:76
-msgid "Depending on the chosen resolution, it may be necessary to logout and restart the graphical environment for the settings to take effect."
-msgstr "В зависимости от выбранного разрешения, может понадобиться выход из графической среды и её перезапуск, чтобы настройки вступили в силу."
+msgid ""
+"Depending on the chosen resolution, it may be necessary to logout and "
+"restart the graphical environment for the settings to take effect."
+msgstr ""
+"В зависимости от выбранного разрешения, может понадобиться выход из "
+"графической среды и её перезапуск, чтобы настройки вступили в силу."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:83
@@ -7122,18 +11509,39 @@ msgstr "<emphasis role=\"bold\">Проверить:</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:85
-msgid "Once the configuration done, it is recommended to do a test before clicking on OK because it is easier to modify the settings now than later if the graphical environment doesn't work."
-msgstr "Как только настройки будут завершены, рекомендуем вам проверить их до нажатия кнопки <guibutton>OK</guibutton>, поскольку проще изменить значения параметров сразу, чем получить неработоспособную графическую среду."
+msgid ""
+"Once the configuration done, it is recommended to do a test before clicking "
+"on OK because it is easier to modify the settings now than later if the "
+"graphical environment doesn't work."
+msgstr ""
+"Как только настройки будут завершены, рекомендуем вам проверить их до "
+"нажатия кнопки <guibutton>OK</guibutton>, поскольку проще изменить значения "
+"параметров сразу, чем получить неработоспособную графическую среду."
 
 #. type: Content of: <section><para><note><para>
 #: en/XFdrake.xml:90
-msgid "In case of a non working graphical environment, type Alt+Ctrl+F2 to open a text environment, connect as root and type XFdrake (with the caps) to to use XFdrake's text version."
-msgstr "В случае нерабочей графической среды, нажмите комбинацию клавиш Alt+Ctrl+F2, чтобы открыть текстовую консоль, войдите в систему от имени администратора (root) и дайте команду XFdrake (первые две буквы должны быть большими), чтобы воспользоваться текстовой версией XFdrake."
+msgid ""
+"In case of a non working graphical environment, type Alt+Ctrl+F2 to open a "
+"text environment, connect as root and type XFdrake (with the caps) to to use "
+"XFdrake's text version."
+msgstr ""
+"В случае нерабочей графической среды, нажмите комбинацию клавиш Alt+Ctrl+F2, "
+"чтобы открыть текстовую консоль, войдите в систему от имени администратора "
+"(root) и дайте команду XFdrake (первые две буквы должны быть большими), "
+"чтобы воспользоваться текстовой версией XFdrake."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:93
-msgid "If the test fails, just wait until the end, if it works but you don't want to change after all, click on <guibutton>No</guibutton>, if everything is right, click on <guibutton role=\"bold\">OK</guibutton>."
-msgstr "Если заданные параметры не сработают, просто дождитесь завершения проверки, чтобы вернуться к начальным параметрам. Если значения сработают, но вы всё равно не хотите их изменять, то нажмите кнопку <guibutton>Нет</guibutton>. Если же полученные результаты вас устраивают, то нажмите кнопку <guibutton role=\"bold\">OK</guibutton>."
+msgid ""
+"If the test fails, just wait until the end, if it works but you don't want "
+"to change after all, click on <guibutton>No</guibutton>, if everything is "
+"right, click on <guibutton role=\"bold\">OK</guibutton>."
+msgstr ""
+"Если заданные параметры не сработают, просто дождитесь завершения проверки, "
+"чтобы вернуться к начальным параметрам. Если значения сработают, но вы всё "
+"равно не хотите их изменять, то нажмите кнопку <guibutton>Нет</guibutton>. "
+"Если же полученные результаты вас устраивают, то нажмите кнопку <guibutton "
+"role=\"bold\">OK</guibutton>."
 
 #. type: Content of: <section><orderedlist><title>
 #: en/XFdrake.xml:97
@@ -7142,21 +11550,52 @@ msgstr "Параметры:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/XFdrake.xml:99
-msgid "<guilabel>Global options</guilabel>: If <emphasis>Disable Ctrl-Alt-Backspace</emphasis> is checked, it will no longer be possible to restart X server using Ctrl+Alt+Backspace keys."
-msgstr "В разделе <guilabel>Глобальные параметры</guilabel> вы можете настроить систему на перезапуск графической среды с помощью комбинации клавиш Ctrl+Alt+Backspace."
+msgid ""
+"<guilabel>Global options</guilabel>: If <emphasis>Disable Ctrl-Alt-"
+"Backspace</emphasis> is checked, it will no longer be possible to restart X "
+"server using Ctrl+Alt+Backspace keys."
+msgstr ""
+"В разделе <guilabel>Глобальные параметры</guilabel> вы можете настроить "
+"систему на перезапуск графической среды с помощью комбинации клавиш Ctrl+Alt"
+"+Backspace."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/XFdrake.xml:103
-msgid "<guilabel>Graphic card options</guilabel>: Allows you to enable or disable three specific features depending on the graphic card."
-msgstr "С помощью раздела <guilabel>Параметры видеокарты</guilabel> можно включить или выключить три специфические возможности, зависящие от типа графической видеокарты."
+msgid ""
+"<guilabel>Graphic card options</guilabel>: Allows you to enable or disable "
+"three specific features depending on the graphic card."
+msgstr ""
+"С помощью раздела <guilabel>Параметры видеокарты</guilabel> можно включить "
+"или выключить три специфические возможности, зависящие от типа графической "
+"видеокарты."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/XFdrake.xml:107
-msgid "<guilabel>Graphical interface at startup</guilabel>: Most of the time, <emphasis>Automatically start the graphical interface (Xorg) upon booting</emphasis> is checked to make the boot switch to graphical mode, it may be unchecked for a server."
-msgstr "<guilabel>Графический интерфейс при загрузке</guilabel>: следует оставить вариант <emphasis>Автоматически запускать графическую оболочку (Xorg) при загрузке</emphasis>, чтобы система загружалась в графическом режиме. Впрочем, вы можете снять отметку, если загрузка должна быть выполнена без использования графического режима для сервера."
+msgid ""
+"<guilabel>Graphical interface at startup</guilabel>: Most of the time, "
+"<emphasis>Automatically start the graphical interface (Xorg) upon booting</"
+"emphasis> is checked to make the boot switch to graphical mode, it may be "
+"unchecked for a server."
+msgstr ""
+"<guilabel>Графический интерфейс при загрузке</guilabel>: следует оставить "
+"вариант <emphasis>Автоматически запускать графическую оболочку (Xorg) при "
+"загрузке</emphasis>, чтобы система загружалась в графическом режиме. "
+"Впрочем, вы можете снять отметку, если загрузка должна быть выполнена без "
+"использования графического режима для сервера."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:112
-msgid "After a click on the <guibutton>Quit</guibutton> button, the system will ask you to confirm.  There is still time to cancel everything and keep the previous configuration, or to accept. In this case, you have to disconnect and reconnect to activate the new configuration."
-msgstr "В ответ на нажатие кнопки <guibutton>Выйти</guibutton> программа предложит вам подтвердить выход. Вы можете отменить или подтвердить внесённые изменения, или сохранить предварительные настройки. Если изменения будут подтверждены, вам придётся выйти из аккаунта и снова войти в него, чтобы внесённые изменения вступили в силу."
-
+msgid ""
+"After a click on the <guibutton>Quit</guibutton> button, the system will ask "
+"you to confirm.  There is still time to cancel everything and keep the "
+"previous configuration, or to accept. In this case, you have to disconnect "
+"and reconnect to activate the new configuration."
+msgstr ""
+"В ответ на нажатие кнопки <guibutton>Выйти</guibutton> программа предложит "
+"вам подтвердить выход. Вы можете отменить или подтвердить внесённые "
+"изменения, или сохранить предварительные настройки. Если изменения будут "
+"подтверждены, вам придётся выйти из аккаунта и снова войти в него, чтобы "
+"внесённые изменения вступили в силу."
+
+#~ msgid "Another lesson learned."
+#~ msgstr "Ну, вот мы и научились чему-то."
diff --git a/docs/mcc-help/tr.po b/docs/mcc-help/tr.po
index 48e1fb7e..fd1a5058 100644
--- a/docs/mcc-help/tr.po
+++ b/docs/mcc-help/tr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Control Center Help package.
-# 
+#
 # Translators:
 # osifa Kutlu <firatkutlu@gmail.com>, 2013
 # kemalokmen <kemal@comu.edu.tr>, 2013, 2014
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:29+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
 "PO-Revision-Date: 2014-04-12 00:08+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
 "Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -32,8 +32,7 @@ msgstr "WebDAV paylaşımlı sürücü ve dizinlere erişim"
 msgid "diskdrake --dav"
 msgstr "diskdrake --dav"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--dav.xml:19
 msgid "diskdrake--dav1.png"
 msgstr "diskdrake--dav1.png"
@@ -41,9 +40,11 @@ msgstr "diskdrake--dav1.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--dav.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --dav</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">diskdrake --dav</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --dav</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">diskdrake --dav</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--dav.xml:24
@@ -51,14 +52,17 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
 "Control Center, under the Network Sharing tab, labeled <guilabel>Configure "
 "WebDAV shares</guilabel>."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Ağ Paylaşımı sekmesi altında, <guilabel>WebDAV paylaşımlarını yapılandır</guilabel> etiketi ile Mageia Denetim Merkezi' nde bulunabilir."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Ağ Paylaşımı sekmesi "
+"altında, <guilabel>WebDAV paylaşımlarını yapılandır</guilabel> etiketi ile "
+"Mageia Denetim Merkezi' nde bulunabilir."
 
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Giriş"
@@ -71,7 +75,12 @@ msgid ""
 "appears as a local directory. It is necessary that the remote machine run a "
 "WebDAV server. This is not the aim of this tool to configure the WebDAV "
 "server."
-msgstr "<link xlink:href=\"http://en.wikipedia.org/wiki/WebDAV\">WebDAV</link>bir web sunucusu dizinini yerel olarak bağlamanıza, böylece o dizinin bir yerel dizin olarak kullanılabilmesine izin veren bir protokoldür. Uzak sunucunun bir WebDAV sunucusu çalıştırması zorunludur. Bu aracın maksadı WebDAV sunucusunu yapılandırmak değildir."
+msgstr ""
+"<link xlink:href=\"http://en.wikipedia.org/wiki/WebDAV\">WebDAV</link>bir "
+"web sunucusu dizinini yerel olarak bağlamanıza, böylece o dizinin bir yerel "
+"dizin olarak kullanılabilmesine izin veren bir protokoldür. Uzak sunucunun "
+"bir WebDAV sunucusu çalıştırması zorunludur. Bu aracın maksadı WebDAV "
+"sunucusunu yapılandırmak değildir."
 
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:40
@@ -84,7 +93,10 @@ msgid ""
 "The first screen of the tool displays the already configured entries, if "
 "any, and a <guibutton>New</guibutton> button. Use it to create a new entry. "
 "Insert the server URL in the field of the new screen."
-msgstr "Aracın ilk ekranı varsa önceden yapılandırılmış girdileri ve bir <guibutton>Yeni</guibutton> düğmesi görüntüler. Yeni bir girdi oluşturmak için bunu kullanın. Yeni ekranın boş alanına sunucu URL bağlantısını girin."
+msgstr ""
+"Aracın ilk ekranı varsa önceden yapılandırılmış girdileri ve bir "
+"<guibutton>Yeni</guibutton> düğmesi görüntüler. Yeni bir girdi oluşturmak "
+"için bunu kullanın. Yeni ekranın boş alanına sunucu URL bağlantısını girin."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:46
@@ -92,12 +104,16 @@ msgid ""
 "Then you get a screen with radio buttons to select some actions.  Continue "
 "with the action <guibutton>Mount point</guibutton> by clicking "
 "<guibutton>OK</guibutton> after selecting the radio button, as the "
-"<guibutton>Server</guibutton> is already configured. You can however correct"
-" it, if needed."
-msgstr "Sonra, bazı eylemleri seçebileceğiniz işaretleme düğmeleri olan bir ekran gelir. İşaretleme düğmesini seçtikten sonra <guibutton>Tamam</guibutton> düğmesine tıklayarak <guibutton>Bağlama noktası</guibutton> eylemi ile devam edin; çünkü <guibutton>Sunucu</guibutton> önceden yapılandırılmıştır. Ancak gerekirse bunu düzeltebilirsiniz."
+"<guibutton>Server</guibutton> is already configured. You can however correct "
+"it, if needed."
+msgstr ""
+"Sonra, bazı eylemleri seçebileceğiniz işaretleme düğmeleri olan bir ekran "
+"gelir. İşaretleme düğmesini seçtikten sonra <guibutton>Tamam</guibutton> "
+"düğmesine tıklayarak <guibutton>Bağlama noktası</guibutton> eylemi ile devam "
+"edin; çünkü <guibutton>Sunucu</guibutton> önceden yapılandırılmıştır. Ancak "
+"gerekirse bunu düzeltebilirsiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--dav.xml:54
 msgid "diskdrake--dav3.png"
 msgstr "diskdrake--dav3.png"
@@ -114,10 +130,12 @@ msgstr "Uzak dizin içeriğine bu bağlama noktasından ulaşılabilecektir."
 msgid ""
 "In the next step, give your user name and password. If you need some other "
 "options, you can give them in the <guibutton>advanced</guibutton> screen."
-msgstr "Sonraki adımda kullanıcı adınızı ve parolanızı verin. Başka seçenekler gerekiyorsa, bunları <guibutton>gelişmiş</guibutton> ekranında verebilirsiniz."
+msgstr ""
+"Sonraki adımda kullanıcı adınızı ve parolanızı verin. Başka seçenekler "
+"gerekiyorsa, bunları <guibutton>gelişmiş</guibutton> ekranında "
+"verebilirsiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--dav.xml:67
 msgid "diskdrake--dav4.png"
 msgstr "diskdrake--dav4.png"
@@ -127,19 +145,26 @@ msgstr "diskdrake--dav4.png"
 msgid ""
 "The option <guibutton>Mount</guibutton> allows you to mount immediately the "
 "access."
-msgstr "<guibutton>Bağla</guibutton> seçeneği derhal erişim için bağlamanızı sağlar."
+msgstr ""
+"<guibutton>Bağla</guibutton> seçeneği derhal erişim için bağlamanızı sağlar."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:74
 msgid ""
-"After you accepted the configuration with the radio button "
-"<guibutton>Done</guibutton>, the first screen is displayed again and your "
-"new mount point is listed. After you choose <guibutton>Quit</guibutton>, you"
-" are asked whether or not to save the modifications in "
-"<emphasis>/etc/fstab</emphasis>. Choose this option if you want that the "
-"remote directory is available at each boot. If your configuration is for "
-"one-time usage, do not save it."
-msgstr "İşaretleme düğmesi <guibutton>Tamamlandı</guibutton> kullanarak yapılandırmayı kabul ettikten sonra ilk ekran yeniden gösterilir ve yeni bağlama noktası listelenir. <guibutton>Çık</guibutton> düğmesini seçtikten sonra, <emphasis>/etc/fstab</emphasis> içindeki değişiklikleri kaydetmek isteyip istemediğiniz sorulur. Uzak dizin her önyüklemede erişilebilir olsun istiyorsanız bunu seçin. Yapılandırmanız tek seferlik kullanım içinse kaydetmeyin."
+"After you accepted the configuration with the radio button <guibutton>Done</"
+"guibutton>, the first screen is displayed again and your new mount point is "
+"listed. After you choose <guibutton>Quit</guibutton>, you are asked whether "
+"or not to save the modifications in <emphasis>/etc/fstab</emphasis>. Choose "
+"this option if you want that the remote directory is available at each boot. "
+"If your configuration is for one-time usage, do not save it."
+msgstr ""
+"İşaretleme düğmesi <guibutton>Tamamlandı</guibutton> kullanarak "
+"yapılandırmayı kabul ettikten sonra ilk ekran yeniden gösterilir ve yeni "
+"bağlama noktası listelenir. <guibutton>Çık</guibutton> düğmesini seçtikten "
+"sonra, <emphasis>/etc/fstab</emphasis> içindeki değişiklikleri kaydetmek "
+"isteyip istemediğiniz sorulur. Uzak dizin her önyüklemede erişilebilir olsun "
+"istiyorsanız bunu seçin. Yapılandırmanız tek seferlik kullanım içinse "
+"kaydetmeyin."
 
 #. type: Content of: <section><info><title>
 #: en/diskdrake--fileshare.xml:3
@@ -151,8 +176,7 @@ msgstr "Sabit disk bölümlerini paylaşın"
 msgid "diskdrake --fileshare"
 msgstr "diskdrake --fileshare"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--fileshare.xml:11
 msgid "diskdrake--fileshare.png"
 msgstr "diskdrake--fileshare.png"
@@ -160,9 +184,11 @@ msgstr "diskdrake--fileshare.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--fileshare.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --fileshare</emphasis> as root."
-msgstr "Bu aracı komut satırında ve kök olarak <emphasis role=\"bold\">diskdrake --fileshare</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --fileshare</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında ve kök olarak <emphasis role=\"bold\">diskdrake --"
+"fileshare</emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:15
@@ -171,14 +197,20 @@ msgid ""
 "administrator, to allow users to share parts of their own /home "
 "subdirectories with other users of a same local network which may have "
 "computers running either Linux or Windows operating system."
-msgstr "Bu basit araç<placeholder type=\"footnote\" id=\"0\"/> size, yani yöneticiye, kullanıcıların kendi /home alt dizinlerinin kısımlarını aynı yerel ağda Linux veya Windows işletim sistemi kullanan diğer kullanıcılarla paylaşmalarına izin verme yetkisi verir."
+msgstr ""
+"Bu basit araç<placeholder type=\"footnote\" id=\"0\"/> size, yani "
+"yöneticiye, kullanıcıların kendi /home alt dizinlerinin kısımlarını aynı "
+"yerel ağda Linux veya Windows işletim sistemi kullanan diğer kullanıcılarla "
+"paylaşmalarına izin verme yetkisi verir."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:20
 msgid ""
-"It is found in the Mageia Control Center, under the Local Disk tab, labelled"
-" \"Share your hard disk partitions\"."
-msgstr "Bu araç Mageia Denetim Merkezinde, Yerel Disk sekmesi altında, \"Sabit disk bölümlerinizi paylaşın\" etiketinde bulunur."
+"It is found in the Mageia Control Center, under the Local Disk tab, labelled "
+"\"Share your hard disk partitions\"."
+msgstr ""
+"Bu araç Mageia Denetim Merkezinde, Yerel Disk sekmesi altında, \"Sabit disk "
+"bölümlerinizi paylaşın\" etiketinde bulunur."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:23
@@ -187,11 +219,21 @@ msgid ""
 "share some of their directories ?</guilabel>\", click on <guibutton>No "
 "sharing</guibutton> if the answer is no for all users, click on "
 "<guibutton>Allow all users</guibutton> for all users and click on "
-"<guibutton>Custom</guibutton> if the answer is no for some users and yes for"
-" the others. In this last case, the users that are authorised to share their"
-" directories must belong to the fileshare group, which is automatically "
+"<guibutton>Custom</guibutton> if the answer is no for some users and yes for "
+"the others. In this last case, the users that are authorised to share their "
+"directories must belong to the fileshare group, which is automatically "
 "created by the system. You will be asked about this later."
-msgstr "İlk olarak  \"<guilabel>Kullanıcıların kendi dizinlerinden bazılarını paylaşmasına izin vermek ister misiniz?</guilabel>\" sorusuna cevap verin, eğer cevap tüm kullanıcılar için Hayır ise <guibutton>Paylaşım Yok</guibutton> butonuna tıklayın, tüm kullanıcılara izin vermek için <guibutton>Tüm kullanıcılara izin ver</guibutton> butonuna tıklayın, eğer cevap bazı kullanıcılar için evet bazı kullanıcılar için hayır ise <guibutton>Özel</guibutton> butonuna tıklayın. Sonuncusu durumunda, kendi dizinlerini paylaşmak için yetkilendirilecek kullanıcılar sistem tarafından otomatik olarak oluştrurulan fileshare grubuna dahil olmalı. Bu daha sonra sizden istenecek. "
+msgstr ""
+"İlk olarak  \"<guilabel>Kullanıcıların kendi dizinlerinden bazılarını "
+"paylaşmasına izin vermek ister misiniz?</guilabel>\" sorusuna cevap verin, "
+"eğer cevap tüm kullanıcılar için Hayır ise <guibutton>Paylaşım Yok</"
+"guibutton> butonuna tıklayın, tüm kullanıcılara izin vermek için "
+"<guibutton>Tüm kullanıcılara izin ver</guibutton> butonuna tıklayın, eğer "
+"cevap bazı kullanıcılar için evet bazı kullanıcılar için hayır ise "
+"<guibutton>Özel</guibutton> butonuna tıklayın. Sonuncusu durumunda, kendi "
+"dizinlerini paylaşmak için yetkilendirilecek kullanıcılar sistem tarafından "
+"otomatik olarak oluştrurulan fileshare grubuna dahil olmalı. Bu daha sonra "
+"sizden istenecek. "
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:32
@@ -202,7 +244,13 @@ msgid ""
 "the network, check <guibutton>SMB</guibutton> if the network includes both "
 "Linux and Windows machines and then click on <guibutton>OK</guibutton>. Any "
 "required packages will be installed if necessary."
-msgstr "<guilabel>OK</guilabel> butonuna tıklayın,  <guibutton>NFS</guibutton> ya da <guibutton>SMB</guibutton> den birini seçmenizi isteyen ikinci bir ekran görünecek. Ağdaki tek işletim sistemi Linux ise <guibutton>NFS</guibutton> işaretleyin, ağ hem Linux hem de Windows makineleri içeriyor ise <guibutton>SMB</guibutton> işaretleyin ve sonra  <guibutton>OK</guibutton> tıklayın.  Eğer gerekliyse tüm ihtiyaç duyulan paketler kurulacaktır."
+msgstr ""
+"<guilabel>OK</guilabel> butonuna tıklayın,  <guibutton>NFS</guibutton> ya da "
+"<guibutton>SMB</guibutton> den birini seçmenizi isteyen ikinci bir ekran "
+"görünecek. Ağdaki tek işletim sistemi Linux ise <guibutton>NFS</guibutton> "
+"işaretleyin, ağ hem Linux hem de Windows makineleri içeriyor ise "
+"<guibutton>SMB</guibutton> işaretleyin ve sonra  <guibutton>OK</guibutton> "
+"tıklayın.  Eğer gerekliyse tüm ihtiyaç duyulan paketler kurulacaktır."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:39
@@ -212,24 +260,37 @@ msgid ""
 "you to add users authorised to share their directories to the fileshare "
 "group. In the User tab, click on the user to add to the fileshare group, "
 "then on <guimenuitem>Edit</guimenuitem>, In the Groups tab. Check the "
-"fileshare group and click on <guibutton>OK</guibutton>. For more information"
-" about Userdrake, see <link ns2:href=\"userdrake.xml\">this page</link>"
-msgstr "Yapılandırma, Özel seçeneği seçilmediyse, tamalanmış durumdadır. Bu durumda ek bir pencere Userdrake'i açmanızı ister. Bu araç kullanıcıları kendi dizinlerini paylaşma yetkisi olan fileshare grubuna eklemenizi sağlar. Kullanıcı sekmesinde fileshare grubuna eklemek istediğiniz kullanıcıya tıklayın, sonra Gruplar sekmesinde <guimenuitem>Düzenle</guimenuitem> tıklayın. fileshare grubunu işaretleyin  <guibutton>Tamam</guibutton> butonuna tıklayın. Userdrake ile ilgili daha fazla bilgi için  <link ns2:href=\"userdrake.xml\">bu sayfaya</link> bakınız"
+"fileshare group and click on <guibutton>OK</guibutton>. For more information "
+"about Userdrake, see <link ns2:href=\"userdrake.xml\">this page</link>"
+msgstr ""
+"Yapılandırma, Özel seçeneği seçilmediyse, tamalanmış durumdadır. Bu durumda "
+"ek bir pencere Userdrake'i açmanızı ister. Bu araç kullanıcıları kendi "
+"dizinlerini paylaşma yetkisi olan fileshare grubuna eklemenizi sağlar. "
+"Kullanıcı sekmesinde fileshare grubuna eklemek istediğiniz kullanıcıya "
+"tıklayın, sonra Gruplar sekmesinde <guimenuitem>Düzenle</guimenuitem> "
+"tıklayın. fileshare grubunu işaretleyin  <guibutton>Tamam</guibutton> "
+"butonuna tıklayın. Userdrake ile ilgili daha fazla bilgi için  <link ns2:"
+"href=\"userdrake.xml\">bu sayfaya</link> bakınız"
 
 #. type: Content of: <section><note><para>
 #: en/diskdrake--fileshare.xml:50
 msgid ""
 "When adding a new user to the fileshare group, you have to disconnect and "
 "reconnect the network for the modifications to be taken into account."
-msgstr "fileshare grubuna yeni bir kullanıcı eklediğinizde değişikliklerin etkili olabilmesi için ağ bağlantısını kesmeniz ve yeniden bağlanmanız gerekir."
+msgstr ""
+"fileshare grubuna yeni bir kullanıcı eklediğinizde değişikliklerin etkili "
+"olabilmesi için ağ bağlantısını kesmeniz ve yeniden bağlanmanız gerekir."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:55
 msgid ""
-"From now on each user belonging to the fileshare group can select in his/her"
-" file manager the directories to be shared, although not all file managers "
+"From now on each user belonging to the fileshare group can select in his/her "
+"file manager the directories to be shared, although not all file managers "
 "have this facility."
-msgstr "Şu andan itibaren fileshare grubuna ait tüm kullanıcılar, bu özelliği tüm dosya yöneticileri desteklemese de, dosya yöneticisinden paylaştırılacak dizinlerini seçebilir."
+msgstr ""
+"Şu andan itibaren fileshare grubuna ait tüm kullanıcılar, bu özelliği tüm "
+"dosya yöneticileri desteklemese de, dosya yöneticisinden paylaştırılacak "
+"dizinlerini seçebilir."
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/diskdrake--nfs.xml:1 en/mcc-network.xml:1 en/MCC.xml:1
@@ -247,8 +308,7 @@ msgstr "NFS paylaşımları ve dizinlerine erişim"
 msgid "diskdrake --nfs"
 msgstr "diskdrake --nfs"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:11
 msgid "diskdrake--nfs.png"
 msgstr "diskdrake--nfs.png"
@@ -261,9 +321,11 @@ msgstr "."
 #. type: Content of: <section><section><para><footnote><para>
 #: en/diskdrake--nfs.xml:25
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --nfs</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">diskdrake --nfs</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --nfs</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">diskdrake --nfs</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:24
@@ -272,9 +334,15 @@ msgid ""
 "some shared directories to be accessible to all users on the machine. The "
 "protocol used for this is NFS which is available on most Linux or Unix "
 "systems. The shared directory will be thus available directly at boot. "
-"Shared directories can be also accessible directly in a single session for a"
-" user with tools such as file browsers."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> bazı paylaşılan dizinlere bilgisayardaki tüm kullanıcılarca erişilebilir kılmanızı sağlar. Bunun için kullanılan protokol bir çok Linux ve Unix sistemde bulanan NFS protokolüdür. Böylece paylaşılan dizin doğrudan önyüklemede erişilebilir olacaktır. Paylaşılan dizinler ayrıca dosya tarayıcıları gibi araçlar ile bir kullanıcı için tek oturumda doğrudan erişilebilir olabilir."
+"Shared directories can be also accessible directly in a single session for a "
+"user with tools such as file browsers."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> bazı paylaşılan dizinlere "
+"bilgisayardaki tüm kullanıcılarca erişilebilir kılmanızı sağlar. Bunun için "
+"kullanılan protokol bir çok Linux ve Unix sistemde bulanan NFS protokolüdür. "
+"Böylece paylaşılan dizin doğrudan önyüklemede erişilebilir olacaktır. "
+"Paylaşılan dizinler ayrıca dosya tarayıcıları gibi araçlar ile bir kullanıcı "
+"için tek oturumda doğrudan erişilebilir olabilir."
 
 #. type: Content of: <section><section><title>
 #: en/diskdrake--nfs.xml:36 en/diskdrake--smb.xml:38
@@ -286,17 +354,20 @@ msgstr "Yöntem"
 msgid ""
 "Select <guibutton>search servers</guibutton> to obtain a list of servers "
 "which share directories."
-msgstr "Dizinleri paylaşan sunucuların bir listesini edinmek için <guibutton>sunucuları ara</guibutton> düğmesine tıklayın."
+msgstr ""
+"Dizinleri paylaşan sunucuların bir listesini edinmek için "
+"<guibutton>sunucuları ara</guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:41
 msgid ""
 "Click on the > symbol before the server name to display the list of the "
 "shared directories and select the directory you want to access."
-msgstr "Paylaşılan dizinlerin listesini görüntülemek için sunucu adı önündeki > işaretine tıklayın ve erişmek istediğiniz dizini seçin."
+msgstr ""
+"Paylaşılan dizinlerin listesini görüntülemek için sunucu adı önündeki > "
+"işaretine tıklayın ve erişmek istediğiniz dizini seçin."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:47
 msgid "diskdrake--nfs2.png"
 msgstr "diskdrake--nfs2.png"
@@ -304,12 +375,13 @@ msgstr "diskdrake--nfs2.png"
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:51
 msgid ""
-"The button <guibutton>Mount point</guibutton> will be available and you have"
-" to specify where to mount the directory."
-msgstr "<guibutton>Bağlama noktası</guibutton> düğmesi erişilebilir olacaktır. Dizini nereye bağlayacağınızı belirtmelisiniz."
+"The button <guibutton>Mount point</guibutton> will be available and you have "
+"to specify where to mount the directory."
+msgstr ""
+"<guibutton>Bağlama noktası</guibutton> düğmesi erişilebilir olacaktır. "
+"Dizini nereye bağlayacağınızı belirtmelisiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:56
 msgid "diskdrake--nfs3.png"
 msgstr "diskdrake--nfs3.png"
@@ -320,16 +392,18 @@ msgid ""
 "After choosing the mount point, You can mount it. You can also verify and "
 "change some options with the <guibutton>Options</guibutton> button. After "
 "mounting the directory, you can unmount it with the same button."
-msgstr "Bağlama noktasını seçtikten sonra bunu bağlayabilirsiniz. Ayrıca bazı seçenekleri <guibutton>Seçenekler</guibutton> düğmesi ile gözden geçirebilir ve değiştirebilirsiniz. Dizini bağladıktan sonra aynı düğme ile ayırabilirsiniz."
+msgstr ""
+"Bağlama noktasını seçtikten sonra bunu bağlayabilirsiniz. Ayrıca bazı "
+"seçenekleri <guibutton>Seçenekler</guibutton> düğmesi ile gözden geçirebilir "
+"ve değiştirebilirsiniz. Dizini bağladıktan sonra aynı düğme ile "
+"ayırabilirsiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:67
 msgid "diskdrake--nfs4.png"
 msgstr "diskdrake--nfs4.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:73
 msgid "diskdrake--nfs5.png"
 msgstr "diskdrake--nfs5.png"
@@ -339,13 +413,16 @@ msgstr "diskdrake--nfs5.png"
 msgid ""
 "On accepting the configuration with the <guibutton>Done</guibutton> button, "
 "a message will displayed, asking \"Do you want to save the /etc/fstab "
-"modifications\". This will make the directory available at each boot, if the"
-" network is accessible. The new directory is then available in your file "
+"modifications\". This will make the directory available at each boot, if the "
+"network is accessible. The new directory is then available in your file "
 "browser, for example in Dolphin."
-msgstr "<guibutton>Bitti<guibutton> düğmesi ile yapılandırma kabul edildiğinde \"/etc/fstab değişikliklerini kaydetmek istiyor musunuz?\" diye sorulur. Ağ erişilebilir durumdaysa bu, dizini her önyüklemede erişilebilir kılar. Yeni dizine bundan sonra Dolphin gibi dosya tarayıcılarından erişilebilir."
+msgstr ""
+"<guibutton>Bitti<guibutton> düğmesi ile yapılandırma kabul edildiğinde \"/"
+"etc/fstab değişikliklerini kaydetmek istiyor musunuz?\" diye sorulur. Ağ "
+"erişilebilir durumdaysa bu, dizini her önyüklemede erişilebilir kılar. Yeni "
+"dizine bundan sonra Dolphin gibi dosya tarayıcılarından erişilebilir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:85
 msgid "diskdrake--nfs6.png"
 msgstr "diskdrake--nfs6.png"
@@ -360,8 +437,7 @@ msgstr "CD/DVD yazıcı"
 msgid "diskdrake --removable"
 msgstr "diskdrake --removable"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--removable.xml:10
 msgid "diskdrake--removable.png"
 msgstr "diskdrake--removable.png"
@@ -369,9 +445,11 @@ msgstr "diskdrake--removable.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--removable.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --removable</emphasis> as root."
-msgstr "Bu aracı komut satırında ve kök olarak <emphasis role=\"bold\">diskdrake --removable</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --removable</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında ve kök olarak <emphasis role=\"bold\">diskdrake --"
+"removable</emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--removable.xml:14
@@ -379,7 +457,10 @@ msgid ""
 "This tool <placeholder type=\"footnote\" id=\"0\"/>is found under the tab "
 "Local disks in the Mageia Control Center labelled accordingly with your "
 "removable hardware (CD/DVD players and burners and floppy drives only)."
-msgstr "Bu araç <placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezindeki Yerel diskler sekmesinde çıkartılabilir donanımınızla (sadece CD/DVD oynatıcılar/yazıcılar ve disket sürücüleri) eş olarak etiketlenmiştir."
+msgstr ""
+"Bu araç <placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim "
+"Merkezindeki Yerel diskler sekmesinde çıkartılabilir donanımınızla (sadece "
+"CD/DVD oynatıcılar/yazıcılar ve disket sürücüleri) eş olarak etiketlenmiştir."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--removable.xml:20
@@ -393,7 +474,11 @@ msgid ""
 "the chosen options to mount it. Use the menu on the bottom to change them. "
 "Check the item to be changed and then on the <guibutton>OK</guibutton> "
 "button."
-msgstr "Pencerenin en üstünde donanımınızın kısa açıklaması ve bağlamak için kullanılan seçenekler yer alır. Bunları değiştirmek için en alttaki düğmeyi kullanın. Değişecek ögeyi işaretleyin ve <guibutton>Tamam</guibutton> düğmesine tıklayın."
+msgstr ""
+"Pencerenin en üstünde donanımınızın kısa açıklaması ve bağlamak için "
+"kullanılan seçenekler yer alır. Bunları değiştirmek için en alttaki düğmeyi "
+"kullanın. Değişecek ögeyi işaretleyin ve <guibutton>Tamam</guibutton> "
+"düğmesine tıklayın."
 
 #. type: Content of: <section><section><title>
 #: en/diskdrake--removable.xml:28
@@ -404,7 +489,9 @@ msgstr "Bağlama noktası"
 #: en/diskdrake--removable.xml:30
 msgid ""
 "Check this box to change the mount point. The default one is /media/cdrom."
-msgstr "Bağlama noktasını değiştirmek için bu kutuyu işaretleyin. Öntanımlı olan /media/cdrom."
+msgstr ""
+"Bağlama noktasını değiştirmek için bu kutuyu işaretleyin. Öntanımlı olan /"
+"media/cdrom."
 
 #. type: Content of: <section><section><para><bridgehead>
 #: en/diskdrake--removable.xml:37 en/harddrake2.xml:66
@@ -414,9 +501,12 @@ msgstr "Seçenekler"
 #. type: Content of: <section><section><para>
 #: en/diskdrake--removable.xml:39
 msgid ""
-"Many mount options can be chosen here either directly in the list or via the"
-" <guilabel>Advanced</guilabel> submenu. The main are:"
-msgstr "Buradaki bir çok bağlama seçenekleri ya listeden doğrudan ya da <guilabel>Gelişmiş</guilabel> alt menüsü aracılığıyla seçilebilir. Başlıcaları:"
+"Many mount options can be chosen here either directly in the list or via the "
+"<guilabel>Advanced</guilabel> submenu. The main are:"
+msgstr ""
+"Buradaki bir çok bağlama seçenekleri ya listeden doğrudan ya da "
+"<guilabel>Gelişmiş</guilabel> alt menüsü aracılığıyla seçilebilir. "
+"Başlıcaları:"
 
 #. type: Content of: <section><section><section><title>
 #: en/diskdrake--removable.xml:45
@@ -429,7 +519,10 @@ msgid ""
 "user allows an ordinary user (not root) to mount the removable disk, this "
 "option involves noexec, nosuid and nodev. The user who mounted the disk is "
 "the only one who can umount it."
-msgstr "user, (kök olmayan) normal bir kullanıcının çıkartılabilir diski bağlamasını sağlar. Bu seçenek noexec, nosuid ve nodev seçeneklerini içerir. Diski, sadece onu bağlayan kullanıcı ayırabilir."
+msgstr ""
+"user, (kök olmayan) normal bir kullanıcının çıkartılabilir diski bağlamasını "
+"sağlar. Bu seçenek noexec, nosuid ve nodev seçeneklerini içerir. Diski, "
+"sadece onu bağlayan kullanıcı ayırabilir."
 
 #. type: Content of: <section><info><title>
 #: en/diskdrake--smb.xml:11
@@ -444,9 +537,11 @@ msgstr "diskdrake --smb"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/diskdrake--smb.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --smb</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">diskdrake --smb</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --smb</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">diskdrake --smb</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:23
@@ -455,40 +550,53 @@ msgid ""
 "which shared directories to be accessible to all users on the machine. The "
 "protocol used for this is SMB which has been popularized on Windows(R) "
 "systems. The shared directory will be available directly at boot. Shared "
-"directories can be also accessed directly in a single session by a user with"
-" tools such as file browsers."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> paylaşılan dizinleri bilgisayardaki tüm kullanıcılarca erişilebilir kılmanızı sağlar. Bunun için kullanılan protokol Windows(R) sistemlerinde popüler olan SMB protokolüdür. Böylece paylaşılan dizin doğrudan önyüklemede erişilebilir olacaktır. Paylaşılan dizinler ayrıca dosya tarayıcıları gibi araçlar ile bir kullanıcı için tek oturumda doğrudan erişilebilir olabilir."
+"directories can be also accessed directly in a single session by a user with "
+"tools such as file browsers."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> paylaşılan dizinleri "
+"bilgisayardaki tüm kullanıcılarca erişilebilir kılmanızı sağlar. Bunun için "
+"kullanılan protokol Windows(R) sistemlerinde popüler olan SMB protokolüdür. "
+"Böylece paylaşılan dizin doğrudan önyüklemede erişilebilir olacaktır. "
+"Paylaşılan dizinler ayrıca dosya tarayıcıları gibi araçlar ile bir kullanıcı "
+"için tek oturumda doğrudan erişilebilir olabilir."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:33
 msgid ""
 "Before starting the tool, it is a good idea to declare the names of "
 "available servers, for example with <xref linkend=\"drakhosts\"/>"
-msgstr "Aracı başlatmadan önce, erişilebilir sunucuların isimlerini mesela <xref linkend=\"drakhosts\"/> ile bildirmek, iyi bir fikirdir"
+msgstr ""
+"Aracı başlatmadan önce, erişilebilir sunucuların isimlerini mesela <xref "
+"linkend=\"drakhosts\"/> ile bildirmek, iyi bir fikirdir"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:40
 msgid ""
-"Select <guibutton>search servers</guibutton> to obtain a list of servers who"
-" share directories."
-msgstr "Dizinleri paylaşan sunucuların bir listesini edinmek için <guibutton>sunucuları ara</guibutton> düğmesine tıklayın."
+"Select <guibutton>search servers</guibutton> to obtain a list of servers who "
+"share directories."
+msgstr ""
+"Dizinleri paylaşan sunucuların bir listesini edinmek için "
+"<guibutton>sunucuları ara</guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:43
 msgid ""
 "Click on the server name and on &gt; before the server name to display the "
 "list of the shared directories and select the directory you want to access."
-msgstr "Paylaşılan dizinlerin listesini görüntülemek için sunucu adına ve sunucu adı önündeki &gt; tıklayın ve erişmek istediğiniz dizini seçin."
+msgstr ""
+"Paylaşılan dizinlerin listesini görüntülemek için sunucu adına ve sunucu adı "
+"önündeki &gt; tıklayın ve erişmek istediğiniz dizini seçin."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:47
 msgid ""
 "The <guibutton>Mount point</guibutton> button will become available, you "
 "have to specify where to mount the directory."
-msgstr "<guibutton>Bağlama noktası</guibutton> düğmesi erişilebilir olacaktır. Dizini nereye bağlayacağınızı belirtmelisiniz."
+msgstr ""
+"<guibutton>Bağlama noktası</guibutton> düğmesi erişilebilir olacaktır. "
+"Dizini nereye bağlayacağınızı belirtmelisiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--smb.xml:52
 msgid "diskdrake--smb2.png"
 msgstr "diskdrake--smb2.png"
@@ -499,7 +607,10 @@ msgid ""
 "After choosing the mount point, it can be mounted with the <guimenu>Mount "
 "button</guimenu>. You can also verify and change some options with the "
 "<guibutton>Options</guibutton> button."
-msgstr "Bağlama noktasını seçtikten sonra bunu <guimenu>Bağlama düğmesi</guimenu> ile bağlayabilirsiniz. Ayrıca bazı ayarları <guibutton>Seçenekler</guibutton> düğmesi ile gözden geçirebilir ve değiştirebilirsiniz."
+msgstr ""
+"Bağlama noktasını seçtikten sonra bunu <guimenu>Bağlama düğmesi</guimenu> "
+"ile bağlayabilirsiniz. Ayrıca bazı ayarları <guibutton>Seçenekler</"
+"guibutton> düğmesi ile gözden geçirebilir ve değiştirebilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:60
@@ -507,16 +618,17 @@ msgid ""
 "In options, you can specify the user name and the password of those able to "
 "connect to the SMB server. After mounting the directory, you can unmount it "
 "with the same button."
-msgstr "Seçeneklerde, SMB sunucusuna bağlanabilecek kullanıcı adını ve parolasını belirtebilirsiniz. Dizini bağladıktan sonra yine aynı düğme ile ayırabilirsiniz."
+msgstr ""
+"Seçeneklerde, SMB sunucusuna bağlanabilecek kullanıcı adını ve parolasını "
+"belirtebilirsiniz. Dizini bağladıktan sonra yine aynı düğme ile "
+"ayırabilirsiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--smb.xml:66
 msgid "diskdrake--smb3.png"
 msgstr "diskdrake--smb3.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--smb.xml:72
 msgid "diskdrake--smb4.png"
 msgstr "diskdrake--smb4.png"
@@ -527,12 +639,14 @@ msgid ""
 "After accepting the configuration with the Done button, a message will ask "
 "\"Do you want to save the /etc/fstab modifications\". Saving, will allow "
 "directory to made available at each boot, if the network is accessible. The "
-"new directory is then available in your file browser, for example in "
-"dolphin."
-msgstr "Bitti düğmesi ile yapılandırma kabul edildikten sonra \"/etc/fstab değişikliklerini kaydetmek istiyor musunuz?\" diye sorulur. Kaydetmek, ağ erişilebilir durumdaysa dizini her önyüklemede erişilebilir kılar. Yeni dizine bundan sonra dolphin gibi dosya tarayıcılarından erişilebilir."
+"new directory is then available in your file browser, for example in dolphin."
+msgstr ""
+"Bitti düğmesi ile yapılandırma kabul edildikten sonra \"/etc/fstab "
+"değişikliklerini kaydetmek istiyor musunuz?\" diye sorulur. Kaydetmek, ağ "
+"erişilebilir durumdaysa dizini her önyüklemede erişilebilir kılar. Yeni "
+"dizine bundan sonra dolphin gibi dosya tarayıcılarından erişilebilir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--smb.xml:84
 msgid "diskdrake--smb5.png"
 msgstr "diskdrake--smb5.png"
@@ -547,8 +661,7 @@ msgstr "3B Masaüstü Efektleri"
 msgid "drak3d"
 msgstr "drak3d"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drak3d.xml:10
 msgid "drak3d.png"
 msgstr "drak3d.png"
@@ -556,9 +669,11 @@ msgstr "drak3d.png"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drak3d.xml:18
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drak3d</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drak3d</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drak3d</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drak3d</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:17
@@ -566,7 +681,10 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> lets you manage the 3D "
 "desktop effects on your operating system. 3D effects are turned off by "
 "default."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> işletim sisteminizdeki 3B efektlerini yönetmenizi sağlar. Öntanımlı olarak 3B efektleri devre dışı bırakılmıştır."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> işletim sisteminizdeki 3B "
+"efektlerini yönetmenizi sağlar. Öntanımlı olarak 3B efektleri devre dışı "
+"bırakılmıştır."
 
 #. type: Content of: <section><section><title>
 #: en/drak3d.xml:25
@@ -579,30 +697,39 @@ msgid ""
 "To use this tool, you need to have the glxinfo package installed. If the "
 "package is not installed, you will be prompted to do so before drak3d can "
 "start."
-msgstr "Bu aracı kullanmak için glxinfo paketi kurulmuş olmalıdır. Paket kurulu değilse, drak3d başlamadan önce kurmanız için uyarılırsınız."
+msgstr ""
+"Bu aracı kullanmak için glxinfo paketi kurulmuş olmalıdır. Paket kurulu "
+"değilse, drak3d başlamadan önce kurmanız için uyarılırsınız."
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:31
 msgid ""
 "After starting drak3d, you will be presented with a menu window.  Here you "
 "can choose either <guilabel>No 3D Desktop Effects</guilabel> or "
-"<guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a "
-"composite/window manager, which includes hardware-accelerated special "
-"effects for your desktop. Choose <guilabel>Compiz Fusion</guilabel> to turn "
-"it on."
-msgstr "Drak3d başladıktan sonra bir menü penceresi ile karşılaşacaksınız. Burada ya <guilabel>3B Masaüstü Efektleri Yok</guilabel> veya <guilabel>Compiz Fusion</guilabel> seçeneklerinden birini seçebilirsiniz. Compiz Fusion bir bileşik pencere yöneticisi olup donanım hızlandırmalı özel efektleri içerir. Etkinleştirmek için <guilabel>Compiz Fusion</guilabel> seçin."
+"<guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a composite/"
+"window manager, which includes hardware-accelerated special effects for your "
+"desktop. Choose <guilabel>Compiz Fusion</guilabel> to turn it on."
+msgstr ""
+"Drak3d başladıktan sonra bir menü penceresi ile karşılaşacaksınız. Burada ya "
+"<guilabel>3B Masaüstü Efektleri Yok</guilabel> veya <guilabel>Compiz Fusion</"
+"guilabel> seçeneklerinden birini seçebilirsiniz. Compiz Fusion bir bileşik "
+"pencere yöneticisi olup donanım hızlandırmalı özel efektleri içerir. "
+"Etkinleştirmek için <guilabel>Compiz Fusion</guilabel> seçin."
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:38
 msgid ""
 "If this is your first time using this program after a clean installation of "
-"Mageia, you will get a warning message telling you which packages need to be"
-" installed in order to use Compiz Fusion. Click on the "
-"<guibutton>Ok</guibutton> button to continue."
-msgstr "Temiz bir Mageia kurulumundan sonra bu uygulamayı ilk kez kullanıyorsanız Compiz Fusion' un kullanılabilmesi için hangi ek paketlerin kurulması gerektiğini bildiren bir ileti görüntülenecektir. Devam etmek için <guibutton>Tamam</guibutton> düğmesine tıklayın."
+"Mageia, you will get a warning message telling you which packages need to be "
+"installed in order to use Compiz Fusion. Click on the <guibutton>Ok</"
+"guibutton> button to continue."
+msgstr ""
+"Temiz bir Mageia kurulumundan sonra bu uygulamayı ilk kez kullanıyorsanız "
+"Compiz Fusion' un kullanılabilmesi için hangi ek paketlerin kurulması "
+"gerektiğini bildiren bir ileti görüntülenecektir. Devam etmek için "
+"<guibutton>Tamam</guibutton> düğmesine tıklayın."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/drak3d.xml:45
 msgid "drak3d_installing_CompizFusion.png"
 msgstr "drak3d_installing_CompizFusion.png"
@@ -613,14 +740,20 @@ msgid ""
 "Once the appropriate packages are installed, you will notice that Compiz "
 "Fusion is selected in the drak3d menu, but you must log out and log back in "
 "for the changes to take effect."
-msgstr "Uygun paketler kurulduktan sonra drak3d menüsünde Compiz Fusion' un seçili olduğunu fark edeceksiniz. Fakat değişikliklerin etkili olması için oturumdan çıkıp yeniden giriş yapmalısınız."
+msgstr ""
+"Uygun paketler kurulduktan sonra drak3d menüsünde Compiz Fusion' un seçili "
+"olduğunu fark edeceksiniz. Fakat değişikliklerin etkili olması için "
+"oturumdan çıkıp yeniden giriş yapmalısınız."
 
 #. type: Content of: <section><section><para>
 #: en/drak3d.xml:53
 msgid ""
 "After logging back in, Compiz Fusion will be activated. To configure Compiz "
 "Fusion, see the page for the ccsm (CompizConfig Settings Manager)  tool."
-msgstr "Yeniden giriş yaptığınızda Compiz Fusion devreye girecektir. Compiz Fusion' u yapılandırmak içinccsm (CompizConfig Ayarlar Yöneticisi) aracı için sayfasına bakın."
+msgstr ""
+"Yeniden giriş yaptığınızda Compiz Fusion devreye girecektir. Compiz Fusion' "
+"u yapılandırmak içinccsm (CompizConfig Ayarlar Yöneticisi) aracı için "
+"sayfasına bakın."
 
 #. type: Content of: <section><section><title>
 #: en/drak3d.xml:59
@@ -638,10 +771,13 @@ msgid ""
 "If after turning on Compiz Fusion you attempt to log back into your desktop "
 "but can't see anything, restart your computer to get back to the log in "
 "screen. Once there, click on the Desktop icon and select drak3d."
-msgstr "Compiz Fusion' u etkinleştirikten sonra masaüstüne giriş yapmaya çalıştığınızda hiç bir şey göremiyorsanız, yeniden giriş ekranına dönebilmek için bilgisayarınızı yeniden başlatın. Giriş ekranına eriştiğinizde Masaüstü simgesine tıklayın ve drak3d' yi seçin."
+msgstr ""
+"Compiz Fusion' u etkinleştirikten sonra masaüstüne giriş yapmaya "
+"çalıştığınızda hiç bir şey göremiyorsanız, yeniden giriş ekranına dönebilmek "
+"için bilgisayarınızı yeniden başlatın. Giriş ekranına eriştiğinizde Masaüstü "
+"simgesine tıklayın ve drak3d' yi seçin."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/drak3d.xml:71
 msgid "drak3d_troubleshooting_login_option.png"
 msgstr "drak3d_troubleshooting_login_option.png"
@@ -651,9 +787,13 @@ msgstr "drak3d_troubleshooting_login_option.png"
 msgid ""
 "When you log in, if your account is listed as an administrator, you will be "
 "prompted for your password again. Otherwise, use the administrator login "
-"with his/her account. Then you can undo any changes that may have caused the"
-" log in problem."
-msgstr "Giriş yaptığınızda hesabınız yönetici olarak listelenmişse, parolanızı yeniden girmeniz istenecektir. Aksi halde yönetici hesabını kullanarak giriş yapmalısınız. Yöneticiler giriş sorununa neden olabilecek her türlü değişikliği geri alabilirler."
+"with his/her account. Then you can undo any changes that may have caused the "
+"log in problem."
+msgstr ""
+"Giriş yaptığınızda hesabınız yönetici olarak listelenmişse, parolanızı "
+"yeniden girmeniz istenecektir. Aksi halde yönetici hesabını kullanarak giriş "
+"yapmalısınız. Yöneticiler giriş sorununa neden olabilecek her türlü "
+"değişikliği geri alabilirler."
 
 #. type: Content of: <section><info><title>
 #: en/drakauth.xml:9
@@ -665,8 +805,7 @@ msgstr "Kimlik kanıtlama"
 msgid "drakauth"
 msgstr "drakauth"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakauth.xml:16
 msgid "drakauth.png"
 msgstr "drakauth.png"
@@ -674,16 +813,21 @@ msgstr "drakauth.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakauth.xml:21
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakauth</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakauth</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakauth</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakauth</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakauth.xml:21
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> enables you to modify the"
-" manner in which you can be recognized as user of the machine or on the net."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> makinenin kullanıcısı veya internetteki kullanıcı olaak nasıl algılanacağınızı değiştirmenize olanak sağlar."
+"This tool<placeholder type=\"footnote\" id=\"0\"/> enables you to modify the "
+"manner in which you can be recognized as user of the machine or on the net."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> makinenin kullanıcısı veya "
+"internetteki kullanıcı olaak nasıl algılanacağınızı değiştirmenize olanak "
+"sağlar."
 
 #. type: Content of: <section><para>
 #: en/drakauth.xml:25
@@ -691,7 +835,10 @@ msgid ""
 "By default, information for your authentication is stored in a file on your "
 "computer. Modify it only if your network administrator invites you to do so "
 "and give information about that."
-msgstr "Ön tanımlı olarak, kimlik doğrulama bilgileriniz bilgisayarınızdaki bir dosyaya depolanır. Bunu sadece ağ yöneticiniz değiştirmenizi istediğinde değiştirin ve hakkında ona bilgi verin."
+msgstr ""
+"Ön tanımlı olarak, kimlik doğrulama bilgileriniz bilgisayarınızdaki bir "
+"dosyaya depolanır. Bunu sadece ağ yöneticiniz değiştirmenizi istediğinde "
+"değiştirin ve hakkında ona bilgi verin."
 
 #. type: Content of: <section><info><title>
 #: en/drakboot--boot.xml:3
@@ -703,18 +850,19 @@ msgstr "Önyükleme sistemini ayarlayın"
 msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakboot--boot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakboot --boot</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakboot --boot</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot --boot</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakboot --boot</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:14
@@ -722,50 +870,73 @@ msgid ""
 "this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
-msgstr "bu araç<placeholder type=\"footnote\" id=\"0\"/> önyükleme seçeneklerini (önyükleyici seçimi, parola konulması, öntanımlı önyükleme v.b.) ayarlamanızı sağlar"
+msgstr ""
+"bu araç<placeholder type=\"footnote\" id=\"0\"/> önyükleme seçeneklerini "
+"(önyükleyici seçimi, parola konulması, öntanımlı önyükleme v.b.) "
+"ayarlamanızı sağlar"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:19
 msgid ""
 "It is found under the Boot tab in the Mageia Control Center labelled \"Set "
 "up boot system\"."
-msgstr "Mageia Denetim Merkezi' ndeki Önyükleme sekmesinde \"Önyükleme sistemini ayarlayın\" etiketi altında bulunur."
+msgstr ""
+"Mageia Denetim Merkezi' ndeki Önyükleme sekmesinde \"Önyükleme sistemini "
+"ayarlayın\" etiketi altında bulunur."
 
 #. type: Content of: <section><warning><para>
 #: en/drakboot--boot.xml:23
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
-msgstr "Eğer tam olarak ne yaptığınızı bilmiyorsanız bu aracı kullanmayın.Bazı ayarlarını değiştirerek makinenizin tekrar başlamasına engel olabilir!"
+msgstr ""
+"Eğer tam olarak ne yaptığınızı bilmiyorsanız bu aracı kullanmayın.Bazı "
+"ayarlarını değiştirerek makinenizin tekrar başlamasına engel olabilir!"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:28
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to"
-" choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
+"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
 "with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot "
-"device</guibutton>, don't change anything here unless you are an expert. The"
-" boot device is where the bootloader is installed and any modification can "
-"prevent you machine from booting."
-msgstr "<guilabel>Önyükleyici</guilabel> denilen ilk bölümde, hangi <guibutton>Önyükleyicinin kullanılacağı</guibutton>nı, Grub veya Lilo ve grafiksel veya metin tabanlı menü; seçmek mümkündür. Bu sadece bir zevk meselesidir ve bir bedeli yoktur. Ayrıca, <guibutton>Önyükleme aygıtı</guibutton>nı da ayarlayabilirsiniz ancak bir uzman değilseniz burada hiç bir şeyi değiştirmeyin. Önyükleme aygıtı, önyükleyicinin kurulacağı sabit disk olup burada yapılacak herhangi bir değişikliğin makinenizin önyükleme yapmasını engelleyebileceğini unutmayın."
+"no other consequences. You can also set the <guibutton>Boot device</"
+"guibutton>, don't change anything here unless you are an expert. The boot "
+"device is where the bootloader is installed and any modification can prevent "
+"you machine from booting."
+msgstr ""
+"<guilabel>Önyükleyici</guilabel> denilen ilk bölümde, hangi "
+"<guibutton>Önyükleyicinin kullanılacağı</guibutton>nı, Grub veya Lilo ve "
+"grafiksel veya metin tabanlı menü; seçmek mümkündür. Bu sadece bir zevk "
+"meselesidir ve bir bedeli yoktur. Ayrıca, <guibutton>Önyükleme aygıtı</"
+"guibutton>nı da ayarlayabilirsiniz ancak bir uzman değilseniz burada hiç bir "
+"şeyi değiştirmeyin. Önyükleme aygıtı, önyükleyicinin kurulacağı sabit disk "
+"olup burada yapılacak herhangi bir değişikliğin makinenizin önyükleme "
+"yapmasını engelleyebileceğini unutmayın."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:36
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating"
-" systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice, if no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
-msgstr "<guilabel>Ana seçenekler</guilabel> olarak adlandırılan ikinci bölümde, saniye bazında <guibutton>Öntanımlı görüntünün yüklenmesinden önceki gecikme</guibutton>yi  ayarlayabilirsiniz. Bu gecikme sırasında grub veya Lilo erişilebilir işletim sistemlerini listeleyecek, bir seçim yapmanızı isteyecek ve herhangi bir seçim yapılmamışsa gecikme sonlandığında ön tanımlı olanı yükleyecektir."
+msgstr ""
+"<guilabel>Ana seçenekler</guilabel> olarak adlandırılan ikinci bölümde, "
+"saniye bazında <guibutton>Öntanımlı görüntünün yüklenmesinden önceki "
+"gecikme</guibutton>yi  ayarlayabilirsiniz. Bu gecikme sırasında grub veya "
+"Lilo erişilebilir işletim sistemlerini listeleyecek, bir seçim yapmanızı "
+"isteyecek ve herhangi bir seçim yapılmamışsa gecikme sonlandığında ön "
+"tanımlı olanı yükleyecektir."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:43
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
-msgstr "<guibutton>Güvenlik</guibutton> denilen üçüncü ve son bölümde bir parola ayarlamak mümkündür."
+msgstr ""
+"<guibutton>Güvenlik</guibutton> denilen üçüncü ve son bölümde bir parola "
+"ayarlamak mümkündür."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:46
@@ -784,7 +955,11 @@ msgid ""
 "power management. It can save energy by stopping unused devices, this was "
 "the method used before APM. Check this box if your hardware is ACPI "
 "compatible."
-msgstr "ACPI (Gelişmiş Yapılandırma ve Güç Arabirimi) bir güç yönetimi standardıdır. Kullanılmayan aygıtları durdurarak, ki bu APM öncesinde kullanılan yöntemdir, enerji tasarrufu sağlayabilir. Donanımınız ACPI ile uyumlu ise bu seçeneği işaretleyin."
+msgstr ""
+"ACPI (Gelişmiş Yapılandırma ve Güç Arabirimi) bir güç yönetimi standardıdır. "
+"Kullanılmayan aygıtları durdurarak, ki bu APM öncesinde kullanılan "
+"yöntemdir, enerji tasarrufu sağlayabilir. Donanımınız ACPI ile uyumlu ise bu "
+"seçeneği işaretleyin."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:56
@@ -796,21 +971,28 @@ msgstr "<guibutton>SMP özelliğini etkinleştir:</guibutton>"
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
-msgstr "SMP, Simetrik Çoklu İşlemci teriminin kısaltmasıdır, çok çekirdekli işlemciler için bir mimaridir."
+msgstr ""
+"SMP, Simetrik Çoklu İşlemci teriminin kısaltmasıdır, çok çekirdekli "
+"işlemciler için bir mimaridir."
 
 #. type: Content of: <section><note><para>
 #: en/drakboot--boot.xml:62
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
-msgstr "HyperThreading kullanan bir işlemciniz varsa, Mageia bunu bir çift işlemci olarak algılayacak ve SMP etkinleştirilecektir."
+msgstr ""
+"HyperThreading kullanan bir işlemciniz varsa, Mageia bunu bir çift işlemci "
+"olarak algılayacak ve SMP etkinleştirilecektir."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:66
 msgid ""
-"<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local "
-"APIC:</guibutton>"
-msgstr "<guibutton>APIC etkinleştir</guibutton> ve <guibutton>Yerel APIC etkinleştir:</guibutton>Bu \"Kur önyükleme sistemi\" etiketli Mageia Kontrol Merkezi'nde Boot sekmesi altında bulunur."
+"<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
+"guibutton>"
+msgstr ""
+"<guibutton>APIC etkinleştir</guibutton> ve <guibutton>Yerel APIC etkinleştir:"
+"</guibutton>Bu \"Kur önyükleme sistemi\" etiketli Mageia Kontrol Merkezi'nde "
+"Boot sekmesi altında bulunur."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:69
@@ -821,12 +1003,19 @@ msgid ""
 "to one or more local APICs that are in the processor. It is really useful "
 "for multi-processor systems. Some computers have problems with the APIC "
 "system which can cause freezes or incorrect device detection (error message "
-"\"spurious 8259A interrupt: IRQ7\"). In this case, disable APIC and/or Local"
-" APIC."
-msgstr "APIC Gelişmiş Programlanabilir Kesme Denetleyicisi' nin kısaltmasıdır. Intel APIC sisteminde iki bileşen vardır, yerel APIC (LAPIC) ve I/O APIC. Bu sonuncusu, işlemcideki bir veya birden fazla yerel APIC'lerin çevre yollarından aldığı kesmeleri yönlendirir. Bu, çok çekirdekli işlemciler için oldukça yararlıdır. Bazı bilgisayarların APIC sistemi ile donmaların meydana gelmesi veya hatalı aygıt algılama (hata iletisi \"spurious 8259A interrupt: IRQ7\") gibi sorunları vardır. Bu durumda APIC ve/veya Yerel APIC devre dışı bırakılmalıdır."
-
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+"\"spurious 8259A interrupt: IRQ7\"). In this case, disable APIC and/or Local "
+"APIC."
+msgstr ""
+"APIC Gelişmiş Programlanabilir Kesme Denetleyicisi' nin kısaltmasıdır. Intel "
+"APIC sisteminde iki bileşen vardır, yerel APIC (LAPIC) ve I/O APIC. Bu "
+"sonuncusu, işlemcideki bir veya birden fazla yerel APIC'lerin çevre "
+"yollarından aldığı kesmeleri yönlendirir. Bu, çok çekirdekli işlemciler için "
+"oldukça yararlıdır. Bazı bilgisayarların APIC sistemi ile donmaların meydana "
+"gelmesi veya hatalı aygıt algılama (hata iletisi \"spurious 8259A interrupt: "
+"IRQ7\") gibi sorunları vardır. Bu durumda APIC ve/veya Yerel APIC devre dışı "
+"bırakılmalıdır."
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakboot--boot.xml:80
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
@@ -835,16 +1024,23 @@ msgstr "drakboot1.png"
 #: en/drakboot--boot.xml:84
 msgid ""
 "In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the"
-" order of the menu entries, click on the up or down arrows to move the "
+"available entries at boot time. The default one is asterisked. To change the "
+"order of the menu entries, click on the up or down arrows to move the "
 "selected item. If you click on the <guibutton>Add</guibutton> or "
 "<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar"
-" with Lilo or Grub to be able to use these tools."
-msgstr "<guibutton>İleri</guibutton> ekranında, önyükleme sırasında kullanılabilir durumdaki tüm girdilerin bir listesini görebilirsiniz. Öntanımlı olan yıldız ile işaretlidir. Menü girdilerinin sırasını değiştirmek için yukarı veya aşağı oklara tıklayarak seçili ögeyi kaydırabilirsiniz.<guibutton>Ekle</guibutton> veya <guibutton>Düzenle</guibutton> düğmelerine tıklarsanız, yeni bir girdi eklemek veya mevcut olan bir tanesini değiştirmek için yeni bir pencere açılacaktır. Bu araçları kullanabilmek için Lilo veya Grub' a aşina olmanız gerekir. "
-
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+"entry in the Grub menu or to modify an existing one. You need to be familiar "
+"with Lilo or Grub to be able to use these tools."
+msgstr ""
+"<guibutton>İleri</guibutton> ekranında, önyükleme sırasında kullanılabilir "
+"durumdaki tüm girdilerin bir listesini görebilirsiniz. Öntanımlı olan yıldız "
+"ile işaretlidir. Menü girdilerinin sırasını değiştirmek için yukarı veya "
+"aşağı oklara tıklayarak seçili ögeyi kaydırabilirsiniz.<guibutton>Ekle</"
+"guibutton> veya <guibutton>Düzenle</guibutton> düğmelerine tıklarsanız, yeni "
+"bir girdi eklemek veya mevcut olan bir tanesini değiştirmek için yeni bir "
+"pencere açılacaktır. Bu araçları kullanabilmek için Lilo veya Grub' a aşina "
+"olmanız gerekir. "
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakboot--boot.xml:94
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
@@ -855,35 +1051,46 @@ msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
 "example: Mageia3."
-msgstr "<guilabel>Etiket</guilabel> alanı serbest biçimdedir. Buraya menüde görüntülenmesini istediğiniz şekilde yazın. Grub komutlarından \"title\" ile aynıdır. Örneğin: Mageia3"
+msgstr ""
+"<guilabel>Etiket</guilabel> alanı serbest biçimdedir. Buraya menüde "
+"görüntülenmesini istediğiniz şekilde yazın. Grub komutlarından \"title\" ile "
+"aynıdır. Örneğin: Mageia3"
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:102
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
-msgstr "<guilabel>Görüntü</guilabel> alanı çekirdek adını içerir. Grub komutu \"kernel\" ile eşleşmektedir. Örneğin /boot/vmlinuz."
+msgstr ""
+"<guilabel>Görüntü</guilabel> alanı çekirdek adını içerir. Grub komutu "
+"\"kernel\" ile eşleşmektedir. Örneğin /boot/vmlinuz."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:105
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
-msgstr "<guilabel>Kök</guilabel> alanı çekirdeğin depolandığı aygıt adını içerir. Grub komutu \"root\" ile eşleşmektedir. Örneğin (hd0,1)."
+msgstr ""
+"<guilabel>Kök</guilabel> alanı çekirdeğin depolandığı aygıt adını içerir. "
+"Grub komutu \"root\" ile eşleşmektedir. Örneğin (hd0,1)."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:109
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
-msgstr "<guilabel>Sonuna ekle</guilabel> alanı çekirdeğe önyükleme anında verilen seçenekleri içerir."
+msgstr ""
+"<guilabel>Sonuna ekle</guilabel> alanı çekirdeğe önyükleme anında verilen "
+"seçenekleri içerir."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:112
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
-msgstr "<guilabel>Öntanımlı</guilabel> kutucuğu işaretliyse, Grub öntanımlı olarak bu girdi ile önyükleme yapacaktır."
+msgstr ""
+"<guilabel>Öntanımlı</guilabel> kutucuğu işaretliyse, Grub öntanımlı olarak "
+"bu girdi ile önyükleme yapacaktır."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:115
@@ -891,7 +1098,10 @@ msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
 "file and a <xref linkend=\"draknetprofile\"></xref> in the drop-down lists."
-msgstr "<guilabel>Gelişmiş</guilabel> ekranında; açılır menüler yardımıyla <guilabel>Ekran kipi</guilabel>ni, bir <guilabel>initrd</guilabel> dosyasını ve bir <xref linkend=\"draknetprofile\"></xref> seçmek mümkündür."
+msgstr ""
+"<guilabel>Gelişmiş</guilabel> ekranında; açılır menüler yardımıyla "
+"<guilabel>Ekran kipi</guilabel>ni, bir <guilabel>initrd</guilabel> dosyasını "
+"ve bir <xref linkend=\"draknetprofile\"></xref> seçmek mümkündür."
 
 #. type: Content of: <section><info><title>
 #: en/drakboot.xml:3
@@ -903,8 +1113,7 @@ msgstr "Otomatik oturum açmayı ayarlayın"
 msgid "drakboot"
 msgstr "drakboot"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakboot.xml:11
 msgid "drakboot.png"
 msgstr "drakboot.png"
@@ -912,9 +1121,11 @@ msgstr "drakboot.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakboot.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakboot</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakboot</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakboot</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:15
@@ -923,14 +1134,20 @@ msgid ""
 "automatically login the same user, in her/his desktop environment, without "
 "asking for any password. It's called autologin.  This is generally a good "
 "idea when there is only one user like to be using the machine."
-msgstr "Bu aygıt<placeholder type=\"footnote\" id=\"0\"/>parola sormadan aynı kullanıcının kendi masaüstü ortamına kendiliğinden giriş yapmasını sağlar. Otomatik giriş olarak adlandırılır.   Makineyi kullanacak tek bir kullanıcı varsa bu genellikle iyi bir fikirdir."
+msgstr ""
+"Bu aygıt<placeholder type=\"footnote\" id=\"0\"/>parola sormadan aynı "
+"kullanıcının kendi masaüstü ortamına kendiliğinden giriş yapmasını sağlar. "
+"Otomatik giriş olarak adlandırılır.   Makineyi kullanacak tek bir kullanıcı "
+"varsa bu genellikle iyi bir fikirdir."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:22
 msgid ""
 "It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
 "Mageia Control Center labelled \"Set up autologin to automatically log in\"."
-msgstr "Mageia Denetim Merkezinde <emphasis role=\"bold\">Önyükleme</emphasis> sekmesi altında \"Otomatik oturum açmayı ayarlayın\" etiketi altında bulunur."
+msgstr ""
+"Mageia Denetim Merkezinde <emphasis role=\"bold\">Önyükleme</emphasis> "
+"sekmesi altında \"Otomatik oturum açmayı ayarlayın\" etiketi altında bulunur."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:26
@@ -940,23 +1157,35 @@ msgstr "Arayüz düğmeleri oldukça açıktır:"
 #. type: Content of: <section><para>
 #: en/drakboot.xml:28
 msgid ""
-"Check <guibutton>Launch the graphical environment when your system "
-"starts</guibutton>, if you want X Window System to be executed after the "
-"boot. If not, the system will start in text mode. Nevertheless, it will be "
-"possible to launch the graphic interface manually. This can be done by "
-"launching the command 'startx' or 'systemctl start dm'."
-msgstr "Eğer X Window System önyükleme sonrası çalıştırılacaksa <guibutton>Grafiksel ortam açılışta çalıştırılsın</guibutton> kutusunu işaretleyin. Aksi durumda sistem metin kipinde başlatılacaktır. Yine de grafik arayüzü elle başlatmak mümkün olacaktır. Bu ise 'startx' veya 'systemctl start dm' komutunu çalıştırarak yapılabilir."
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Eğer X Window System önyükleme sonrası çalıştırılacaksa <guibutton>Grafiksel "
+"ortam açılışta çalıştırılsın</guibutton> kutusunu işaretleyin. Aksi durumda "
+"sistem metin kipinde başlatılacaktır. Yine de grafik arayüzü elle başlatmak "
+"mümkün olacaktır. Bu ise 'startx' veya 'systemctl start dm' komutunu "
+"çalıştırarak yapılabilir."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:34
 msgid ""
 "If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to"
-" continue to ask for which user to connect (and password) or check "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
 "<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
 "needed. In this case, you also need to supply the <guilabel>Default "
 "username</guilabel> and the <guilabel>Default desktop</guilabel>."
-msgstr "Eğer ilk kutu işaretlenmiş ise, diğer iki seçeneğe erişilebilir, eğer sistemin hangi kullanıcının oturum açacağını (ve parola) sormaya devam etmesini istiyorsanız <guibutton>Hayır, otomatik oturum açma istemiyorum</guibutton> ya da  gerekliyse <guibutton>Evet, şununla (kullanıcı, masaüstü) otomatik oturum açmak istiyorum</guibutton> işaretleyin. Bu durumda ayrıca  <guilabel>Varsayılan kullanıcı adı</guilabel>nı ve <guilabel>Varsayılan masaüstü</guilabel>nü girmeniz gerekir. "
+msgstr ""
+"Eğer ilk kutu işaretlenmiş ise, diğer iki seçeneğe erişilebilir, eğer "
+"sistemin hangi kullanıcının oturum açacağını (ve parola) sormaya devam "
+"etmesini istiyorsanız <guibutton>Hayır, otomatik oturum açma istemiyorum</"
+"guibutton> ya da  gerekliyse <guibutton>Evet, şununla (kullanıcı, masaüstü) "
+"otomatik oturum açmak istiyorum</guibutton> işaretleyin. Bu durumda ayrıca  "
+"<guilabel>Varsayılan kullanıcı adı</guilabel>nı ve <guilabel>Varsayılan "
+"masaüstü</guilabel>nü girmeniz gerekir. "
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -971,32 +1200,42 @@ msgstr "drakbug_report"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakbug_report.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakbug_report</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakbug_report</emphasis> komutu ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakbug_report</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold"
+"\">drakbug_report</emphasis> komutu ile başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakbug_report.xml:15
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can only be started and "
 "used on the command line."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> sadece komut satırından başlatılabilir ve kullanılabilir."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> sadece komut satırından "
+"başlatılabilir ve kullanılabilir."
 
 #. type: Content of: <section><para>
 #: en/drakbug_report.xml:20
 msgid ""
-"It is advised to write the output of this command to a file, for instance by"
-" doing <emphasis role=\"bold\">drakbug_report > "
-"drakbugreport.txt</emphasis>, but make sure you have enough disk space "
-"first: the file can easily be several GBs large."
-msgstr "Bu komutun çıktısını bir dosyaya yazdırmanız tavsiye edilir, örneğin şöyle <emphasis role=\"bold\">drakbug_report > drakbugreport.txt</emphasis>, fakat yeterli disk boşluğunuzun bulunduğundan emin olun: bu dosya kolaylıkla GBlar boyutunda olabilir."
+"It is advised to write the output of this command to a file, for instance by "
+"doing <emphasis role=\"bold\">drakbug_report > drakbugreport.txt</emphasis>, "
+"but make sure you have enough disk space first: the file can easily be "
+"several GBs large."
+msgstr ""
+"Bu komutun çıktısını bir dosyaya yazdırmanız tavsiye edilir, örneğin şöyle "
+"<emphasis role=\"bold\">drakbug_report > drakbugreport.txt</emphasis>, fakat "
+"yeterli disk boşluğunuzun bulunduğundan emin olun: bu dosya kolaylıkla GBlar "
+"boyutunda olabilir."
 
 #. type: Content of: <section><note><para>
 #: en/drakbug_report.xml:24
 msgid ""
-"The output is far too large to attach to a bug report without first removing"
-" the unneeded parts."
-msgstr "Çıktı, gereksiz bölümleri silmeden hata raporuna eklemek için çok çok fazla büyük."
+"The output is far too large to attach to a bug report without first removing "
+"the unneeded parts."
+msgstr ""
+"Çıktı, gereksiz bölümleri silmeden hata raporuna eklemek için çok çok fazla "
+"büyük."
 
 #. type: Content of: <section><para>
 #: en/drakbug_report.xml:26
@@ -1173,12 +1412,18 @@ msgstr "df"
 msgid ""
 "At the time this help page was written, the \"syslog\" part of this "
 "command's output was empty, because this tool had not yet been adjusted to "
-"our switch to systemd. If it is still empty, you can retrieve the \"syslog\""
-" by doing (as root) <emphasis role=\"bold\"> journalctl -a > "
-"journalctl.txt</emphasis>. If you don't have a lot of diskspace, you can, "
-"for instance, take the last 5000 lines of the log instead with: <emphasis "
-"role=\"bold\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
-msgstr "Bu yardım sayfası yazıldığı sıralarda, bu komutun \"syslog\" bölümü boştu, çünkü bu araç systemd geçişine göre düzeltilmemişti. Eğer hala boşsa, \"syslog\" u <emphasis role=\"bold\"> journalctl -a > journalctl.txt</emphasis>'den alabilirsiniz (root ile). Eğer yeterince boş alanınız yoksa, bunun yerine örneğin baştan 5000 satır kayıtı alabilirsiniz: <emphasis role=\"bold\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
+"our switch to systemd. If it is still empty, you can retrieve the \"syslog\" "
+"by doing (as root) <emphasis role=\"bold\"> journalctl -a > journalctl.txt</"
+"emphasis>. If you don't have a lot of diskspace, you can, for instance, take "
+"the last 5000 lines of the log instead with: <emphasis role=\"bold"
+"\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
+msgstr ""
+"Bu yardım sayfası yazıldığı sıralarda, bu komutun \"syslog\" bölümü boştu, "
+"çünkü bu araç systemd geçişine göre düzeltilmemişti. Eğer hala boşsa, "
+"\"syslog\" u <emphasis role=\"bold\"> journalctl -a > journalctl.txt</"
+"emphasis>'den alabilirsiniz (root ile). Eğer yeterince boş alanınız yoksa, "
+"bunun yerine örneğin baştan 5000 satır kayıtı alabilirsiniz: <emphasis role="
+"\"bold\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug.xml:9
@@ -1190,8 +1435,7 @@ msgstr "Mageia Hata Bildirme Aracı"
 msgid "drakbug"
 msgstr "drakbug"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakbug.xml:15
 msgid "drakbug.png"
 msgstr "drakbug.png"
@@ -1199,29 +1443,37 @@ msgstr "drakbug.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakbug.xml:19
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakbug</emphasis>."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakbug</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakbug</emphasis>."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakbug</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakbug.xml:19
 msgid ""
 "Usually, this tool<placeholder type=\"footnote\" id=\"0\"/> starts "
-"automatically when a Mageia tool crashes. However, it is also possible that,"
-" after filing a bug report, you are asked to start this tool to check some "
-"of the information it gives, and then provide that in that existing bug "
-"report."
-msgstr "Genellikle bu araç<placeholder type=\"footnote\" id=\"0\"/> bir Mageia aracı çöktüğünde otomatik olarak başlar. Bununla birlikte, bir hata raporunu doldurduktan sonra sizden bu aracı çalıştırmanızın ve böylece bazı bilgileri sağlamanızın istenmesi de mümkündür. "
+"automatically when a Mageia tool crashes. However, it is also possible that, "
+"after filing a bug report, you are asked to start this tool to check some of "
+"the information it gives, and then provide that in that existing bug report."
+msgstr ""
+"Genellikle bu araç<placeholder type=\"footnote\" id=\"0\"/> bir Mageia aracı "
+"çöktüğünde otomatik olarak başlar. Bununla birlikte, bir hata raporunu "
+"doldurduktan sonra sizden bu aracı çalıştırmanızın ve böylece bazı bilgileri "
+"sağlamanızın istenmesi de mümkündür. "
 
 #. type: Content of: <section><para>
 #: en/drakbug.xml:21
 msgid ""
 "If a new bug report needs to be filed and you are not used to doing that, "
-"then please read <link "
-"xlink:href=\"https://wiki.mageia.org/en/How_to_report_a_bug_properly\">How "
-"to report a bug report properly</link> before clicking on the \"Report\" "
-"button."
-msgstr "Eğer yeni bir hata raporunun dosyalanması gerekiyorsa ve buna alışkın değilseniz, \"Raporla\" düğmesine tıklamadan önce lütfen <link xlink:href=\"https://wiki.mageia.org/en/How_to_report_a_bug_properly\"> Bir hata raporu Nasıl uygun bir şekilde raporlanır</link>."
+"then please read <link xlink:href=\"https://wiki.mageia.org/en/"
+"How_to_report_a_bug_properly\">How to report a bug report properly</link> "
+"before clicking on the \"Report\" button."
+msgstr ""
+"Eğer yeni bir hata raporunun dosyalanması gerekiyorsa ve buna alışkın "
+"değilseniz, \"Raporla\" düğmesine tıklamadan önce lütfen <link xlink:href="
+"\"https://wiki.mageia.org/en/How_to_report_a_bug_properly\"> Bir hata raporu "
+"Nasıl uygun bir şekilde raporlanır</link>."
 
 #. type: Content of: <section><para>
 #: en/drakbug.xml:23
@@ -1229,7 +1481,10 @@ msgid ""
 "In case the bug has already been filed by someone else (the error message "
 "that drakbug gave will be the same, then), it is useful to add a comment to "
 "that existing report that you saw the bug, too."
-msgstr "Hatanın başka bir kullanıcı tarafından daha önce raporlanması durumunda (öyleyse drakbug'ın verdiği hata mesajı aynıdır), ayrıca gördüğünüz hata raporuna ek yorumlar yapmanız faydalı olur."
+msgstr ""
+"Hatanın başka bir kullanıcı tarafından daha önce raporlanması durumunda "
+"(öyleyse drakbug'ın verdiği hata mesajı aynıdır), ayrıca gördüğünüz hata "
+"raporuna ek yorumlar yapmanız faydalı olur."
 
 #. type: Content of: <section><info><title>
 #: en/drakclock.xml:3
@@ -1241,8 +1496,7 @@ msgstr "Tarih ve saati yönet"
 msgid "drakclock"
 msgstr "drakclock"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakclock.xml:10
 msgid "drakclock.png"
 msgstr "drakclock.png"
@@ -1250,18 +1504,24 @@ msgstr "drakclock.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakclock.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakclock</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakclock</emphasis> komutu ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakclock</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakclock</"
+"emphasis> komutu ile başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the tab "
-"System in the Mageia Control Center labelled <guilabel>\"Manage date and "
-"time\"</guilabel>. In some desktop environments it is also available by a "
-"right click / Adjust date and Time ... on the clock in the system tray."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Kontrol Merkezi Sistem sekmesinde  <guilabel>\"Tarih ve saati yönet\"</guilabel> etiketi ile bulunur. Bazı masaüstü ortamlarında görev çubuğundaki saatin üstüne sağ tıklayıp / Tarih ve saati ayarla ... ile ayarlamak mümkündür."
+"System in the Mageia Control Center labelled <guilabel>\"Manage date and time"
+"\"</guilabel>. In some desktop environments it is also available by a right "
+"click / Adjust date and Time ... on the clock in the system tray."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Kontrol Merkezi "
+"Sistem sekmesinde  <guilabel>\"Tarih ve saati yönet\"</guilabel> etiketi ile "
+"bulunur. Bazı masaüstü ortamlarında görev çubuğundaki saatin üstüne sağ "
+"tıklayıp / Tarih ve saati ayarla ... ile ayarlamak mümkündür."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:21
@@ -1272,30 +1532,43 @@ msgstr "Bu çok kolay bir araçtır."
 #: en/drakclock.xml:23
 msgid ""
 "On the upper left part, is the <emphasis role=\"bold\">calendar</emphasis>. "
-"On the screenshot above, the date is September (on the upper left), 2012 (on"
-" the upper right), the 2nd (in blue)  and it is a Sunday. Select the month "
+"On the screenshot above, the date is September (on the upper left), 2012 (on "
+"the upper right), the 2nd (in blue)  and it is a Sunday. Select the month "
 "(or year) by clicking on the little arrows on each side of September (or "
 "2012). Select the day by clicking on its number."
-msgstr "Sol üst bölümde <emphasis role=\"bold\">takvim</emphasis> bulunur. Yukarıdaki ekran görüntüsünde Eylül (sol üstte),  (sağ üstte), 2 (mavi) ve Pazar. Ayı (ya da yılı) Eylül'ün (ya da 2012'nin) iki tarafında da bulunan küçük oka tıklayarak seçiniz. Günü rakamına tıklayarak seçiniz."
+msgstr ""
+"Sol üst bölümde <emphasis role=\"bold\">takvim</emphasis> bulunur. "
+"Yukarıdaki ekran görüntüsünde Eylül (sol üstte),  (sağ üstte), 2 (mavi) ve "
+"Pazar. Ayı (ya da yılı) Eylül'ün (ya da 2012'nin) iki tarafında da bulunan "
+"küçük oka tıklayarak seçiniz. Günü rakamına tıklayarak seçiniz."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:29
 msgid ""
-"On the bottom left is the <emphasis role=\"bold\">Network Time "
-"Protocol</emphasis> synchronising, it is possible to have a clock always on "
-"time by synchronising it with a server. Check <guilabel>Enable Network Time "
+"On the bottom left is the <emphasis role=\"bold\">Network Time Protocol</"
+"emphasis> synchronising, it is possible to have a clock always on time by "
+"synchronising it with a server. Check <guilabel>Enable Network Time "
 "Protocol</guilabel> and choose the closest server."
-msgstr "Sol altta <emphasis role=\"bold\">Ağ zaman Protokolü</emphasis> eşzamanlanıyor, bit sunucu ile eşzamanlanarak daima dakik bir saate sahip olmak mümkündür. <guilabel>Ağ Zaman Protokolünü Etkinleştir</guilabel>i işaretleyin ve en yakın sunucuyu seçin."
+msgstr ""
+"Sol altta <emphasis role=\"bold\">Ağ zaman Protokolü</emphasis> "
+"eşzamanlanıyor, bit sunucu ile eşzamanlanarak daima dakik bir saate sahip "
+"olmak mümkündür. <guilabel>Ağ Zaman Protokolünü Etkinleştir</guilabel>i "
+"işaretleyin ve en yakın sunucuyu seçin."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:34
 msgid ""
 "On the right part is the <emphasis role=\"bold\">clock</emphasis>. It's "
 "useless to set the clock if NTP is enabled. Three boxes display hours, "
-"minutes and seconds (15, 28 and 22 on the screenshot). Use the little arrows"
-" to set the clock to the correct time. The format can't be changed here, see"
-" your desktop environment settings for that."
-msgstr "Sağ tarafta <emphasis role=\"bold\">saat</emphasis> bulunur. Eğer NTP etkinleştirilmişse saati ayarlamak faydasızdır. Üç kutu saati, dakikayı ve saniyeyi (ekran görüntüsünde 15, 28 ve 22) gösterir. Saati doğru olarak ayarlamak için küçük okları kullanın. Burada biçim değiştirilemez, bunun için masaüstü ortamınızın ayarlarına bakınız."
+"minutes and seconds (15, 28 and 22 on the screenshot). Use the little arrows "
+"to set the clock to the correct time. The format can't be changed here, see "
+"your desktop environment settings for that."
+msgstr ""
+"Sağ tarafta <emphasis role=\"bold\">saat</emphasis> bulunur. Eğer NTP "
+"etkinleştirilmişse saati ayarlamak faydasızdır. Üç kutu saati, dakikayı ve "
+"saniyeyi (ekran görüntüsünde 15, 28 ve 22) gösterir. Saati doğru olarak "
+"ayarlamak için küçük okları kullanın. Burada biçim değiştirilemez, bunun "
+"için masaüstü ortamınızın ayarlarına bakınız."
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:40
@@ -1303,15 +1576,20 @@ msgid ""
 "At least, on the bottom right, select your time zone by clicking on the "
 "<guibutton>Change Time Zone</guibutton> button and choosing in the list the "
 "nearest town."
-msgstr "En azından, sağ altta, <guibutton>Saat Dilimini Değiştir</guibutton> düğmesine tıklayarak ve listeden en yakın yerleşim yerini seçerek zaman diliminizi seçin."
+msgstr ""
+"En azından, sağ altta, <guibutton>Saat Dilimini Değiştir</guibutton> "
+"düğmesine tıklayarak ve listeden en yakın yerleşim yerini seçerek zaman "
+"diliminizi seçin."
 
 #. type: Content of: <section><note><para>
 #: en/drakclock.xml:45
 msgid ""
-"Even if it isn't possible to choose a date or time format in this tool, they"
-" will be displayed on your desktop in accordance with the localisation "
+"Even if it isn't possible to choose a date or time format in this tool, they "
+"will be displayed on your desktop in accordance with the localisation "
 "settings."
-msgstr "Bu araçtan bir tarih ve saat biçimi seçemek mümkün olmasa bile, masaüstünüzde yerelleştirme ayarlarınızla uyumlu olarak gösterilecektir. "
+msgstr ""
+"Bu araçtan bir tarih ve saat biçimi seçemek mümkün olmasa bile, "
+"masaüstünüzde yerelleştirme ayarlarınızla uyumlu olarak gösterilecektir. "
 
 #. type: Content of: <section><info><title>
 #: en/drakconnect--del.xml:3
@@ -1323,8 +1601,7 @@ msgstr "Bir bağlantıyı kaldır"
 msgid "drakconnect --del"
 msgstr "drakconnect --del"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakconnect--del.xml:8
 msgid "drakconnect--del.png"
 msgstr "drakconnect--del.png"
@@ -1332,30 +1609,38 @@ msgstr "drakconnect--del.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakconnect--del.xml:12
 msgid ""
-"You can also start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconnect --del</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakconnect --del</emphasis> yazarak çalıştırabilirsiniz."
+"You can also start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconnect --del</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakconnect --"
+"del</emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakconnect--del.xml:12
 msgid ""
-"Here, you can delete a network interface<placeholder type=\"footnote\" "
-"id=\"0\"/>."
-msgstr "Burada, bir ağ arabirimini silebilirsiniz<placeholder type=\"footnote\" id=\"0\"/>."
+"Here, you can delete a network interface<placeholder type=\"footnote\" id="
+"\"0\"/>."
+msgstr ""
+"Burada, bir ağ arabirimini silebilirsiniz<placeholder type=\"footnote\" id="
+"\"0\"/>."
 
 #. type: Content of: <section><para>
 #: en/drakconnect--del.xml:14
 msgid ""
 "Click on the drop down menu, choose the one you want to remove and then "
 "click <emphasis>next</emphasis>."
-msgstr "Aşağı açılır menüye tıklayın, kaldırmak istediğinizi seçin ve <emphasis>sonraki</emphasis>ye tıklayın."
+msgstr ""
+"Aşağı açılır menüye tıklayın, kaldırmak istediğinizi seçin ve "
+"<emphasis>sonraki</emphasis>ye tıklayın."
 
 #. type: Content of: <section><para>
 #: en/drakconnect--del.xml:15
 msgid ""
 "You'll see a message that the network interface has been deleted "
 "successfully."
-msgstr "Ağ arayüzünün başarılı bir şekilde silindiğini söyleyen bir mesaj göreceksiniz."
+msgstr ""
+"Ağ arayüzünün başarılı bir şekilde silindiğini söyleyen bir mesaj "
+"göreceksiniz."
 
 #. type: Content of: <section><info><title>
 #: en/drakconnect.xml:3
@@ -1367,8 +1652,7 @@ msgstr "Yeni bir ağ arayüzü kur (LAN, ISDN, ADSL, ...)"
 msgid "drakconnect"
 msgstr "drakconnect"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:11
 msgid "drakconnect.png"
 msgstr "drakconnect.png"
@@ -1376,9 +1660,11 @@ msgstr "drakconnect.png"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakconnect.xml:19
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconnect</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakconnect</emphasis> komutu ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconnect</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakconnect</"
+"emphasis> komutu ile başlatabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/drakconnect.xml:18
@@ -1386,14 +1672,19 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> allows to configure much "
 "of local network or Internet access. You have to know some information from "
 "your access provider or your network administrator."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> yerel ağın ve İnternet erişiminin büyük kısmını yapılandırmanızı sağlar. Erişim sağlayıcınızdan veya ağ yöneticinizden bazı bilgileri almak zorundasınız."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> yerel ağın ve İnternet "
+"erişiminin büyük kısmını yapılandırmanızı sağlar. Erişim sağlayıcınızdan "
+"veya ağ yöneticinizden bazı bilgileri almak zorundasınız."
 
 #. type: Content of: <section><section><para>
 #: en/drakconnect.xml:25
 msgid ""
 "Select the type of connection you want to set, according to which hardware "
 "and provider you have."
-msgstr "Ayarlamak istediğiniz bağlantı türünü, hangi donanıma ve sağlayıcıya sahip olduğunuza bağlı olarak, seçiniz."
+msgstr ""
+"Ayarlamak istediğiniz bağlantı türünü, hangi donanıma ve sağlayıcıya sahip "
+"olduğunuza bağlı olarak, seçiniz."
 
 #. type: Content of: <section><section><title>
 #: en/drakconnect.xml:30
@@ -1405,133 +1696,150 @@ msgstr "Yeni bir kablolu bağlantı (Ethernet)"
 msgid ""
 "The first window lists the interfaces which are available.  Select the one "
 "to configure."
-msgstr "İlk pencere uygun olan arayüzleri listeler. Yapılandırmak istediğinizi seçiniz."
+msgstr ""
+"İlk pencere uygun olan arayüzleri listeler. Yapılandırmak istediğinizi "
+"seçiniz."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:39 en/drakconnect.xml:167
 msgid ""
 "At this point, the choice is given between an automatic or a manual IP "
 "address."
-msgstr "Bu adımda, seçenekler otomatik IP adresi veya elle IP adresi olmak üzere verilir. "
+msgstr ""
+"Bu adımda, seçenekler otomatik IP adresi veya elle IP adresi olmak üzere "
+"verilir. "
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:44 en/drakconnect.xml:187 en/drakconnect.xml:557
 msgid "Automatic IP"
 msgstr "Otomatik IP"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:48
 msgid ""
-"<emphasis>Ethernet/IP settings</emphasis>: you have to select if DNS servers"
-" are declared by the DHCP server or are manually specified, as explained "
+"<emphasis>Ethernet/IP settings</emphasis>: you have to select if DNS servers "
+"are declared by the DHCP server or are manually specified, as explained "
 "below. In the last case, the IP address of DNS servers has to be set. The "
-"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified,"
-" the name <literal>localhost.localdomain</literal> is attributed by default."
-"  The Hostname can also be provided by the DHCP server with the option "
-"<emphasis>Assign host name from DHCP server</emphasis>. Not all DHCP servers"
-" have such a function and if you're setting up your PC to get an IP address "
+"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, "
+"the name <literal>localhost.localdomain</literal> is attributed by default.  "
+"The Hostname can also be provided by the DHCP server with the option "
+"<emphasis>Assign host name from DHCP server</emphasis>. Not all DHCP servers "
+"have such a function and if you're setting up your PC to get an IP address "
 "from a domestic ADSL router, it is unlikely."
-msgstr "<emphasis>Ethernet/IP ayarları</emphasis>: DNS sunucuların DHCP sunucu tarafından mı yoksa elle mi belirtildiğini aşağıda açıklandığı gibi seçmeniz gerekir. İkincisi durumunda, DHCP sunucularının IP adresi ayarlanmalı. Bilgisayarın HOSTNAME i burada belirtilebilir. Eğer hiçbir HOSTNAME belirtilmemişse varsayılan olarak <literal>localhost.localdomain</literal> ismi verilir. Makine adı ayrıca DHCP sunucusundan <emphasis>Makine ismini DHCP sunucusundan ata</emphasis> seçeneği ile sağlanabilir. Tüm DHCP sunucuları böyle bir fonksiyonu yoktur ve eğer bilgisayarınızı evdeki ADSL yönelticiden IP adresi alacak şekilde ayarladıysanız, muhtemelen yoktur."
-
-#. type: Attribute 'fileref' of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
+msgstr ""
+"<emphasis>Ethernet/IP ayarları</emphasis>: DNS sunucuların DHCP sunucu "
+"tarafından mı yoksa elle mi belirtildiğini aşağıda açıklandığı gibi seçmeniz "
+"gerekir. İkincisi durumunda, DHCP sunucularının IP adresi ayarlanmalı. "
+"Bilgisayarın HOSTNAME i burada belirtilebilir. Eğer hiçbir HOSTNAME "
+"belirtilmemişse varsayılan olarak <literal>localhost.localdomain</literal> "
+"ismi verilir. Makine adı ayrıca DHCP sunucusundan <emphasis>Makine ismini "
+"DHCP sunucusundan ata</emphasis> seçeneği ile sağlanabilir. Tüm DHCP "
+"sunucuları böyle bir fonksiyonu yoktur ve eğer bilgisayarınızı evdeki ADSL "
+"yönelticiden IP adresi alacak şekilde ayarladıysanız, muhtemelen yoktur."
+
+#. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:62
 msgid "drakconnect5.png"
 msgstr "drakconnect5.png"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:68 en/drakconnect.xml:205 en/drakconnect.xml:572
 msgid "The advanced button give the opportunity to specify:"
 msgstr "Gelişmiş düğmesi, şunları belirtme fırsatı verir:"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:72 en/drakconnect.xml:209 en/drakconnect.xml:576
 msgid "Search domain (not accessible, as provided by the DHCP server)"
 msgstr "Alan tara (DHCP sunucu tarafından sağlandığından erişilebilir değil)"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:77 en/drakconnect.xml:214 en/drakconnect.xml:581
 msgid "the DHCP client"
 msgstr "DHCP istemci"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:81 en/drakconnect.xml:218 en/drakconnect.xml:585
 msgid "DHCP timeout"
 msgstr "DHCP zamanaşımı"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:85 en/drakconnect.xml:222
 msgid "Get YP server from DHCP (checked by default): specify the NIS server"
-msgstr "DHCP'den YP sunucuyu getir (varsayılan olarak işaretli): NIS sunucuyu belirt"
+msgstr ""
+"DHCP'den YP sunucuyu getir (varsayılan olarak işaretli): NIS sunucuyu belirt"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:90 en/drakconnect.xml:227 en/drakconnect.xml:594
 msgid "Get NTPD server from DHCP (synchronisation of clocks)"
 msgstr "DHCP'den NTPD sunucuyu getir (saat eşzamanlaması)"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:95 en/drakconnect.xml:232 en/drakconnect.xml:599
 msgid ""
 "the HOSTNAME required by DHCP. Only use this option if the DHCP server "
 "requires the client to specify a hostname before receiving an IP address. "
 "This option is not dealt by some DHCP servers."
-msgstr "DHCP taraından istenen HOSTNAME . Bu seçeneği sadece DHCP sunucunun istemcinin IP adresi almasından önce alanadına gereksinim duyması durumunda kullanınız. Bu seçenek bazı DHCP sunucular tarafından yerine getirilmez."
+msgstr ""
+"DHCP taraından istenen HOSTNAME . Bu seçeneği sadece DHCP sunucunun "
+"istemcinin IP adresi almasından önce alanadına gereksinim duyması durumunda "
+"kullanınız. Bu seçenek bazı DHCP sunucular tarafından yerine getirilmez."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:104 en/drakconnect.xml:241
 msgid ""
 "After accepting, the last steps which are common to all connection "
 "configurations are explained: <xref linkend=\"drakconnect-end\"/>"
-msgstr "Kabul ettikten sonra, tüm bağlantı yapaılandırmaları için ortak olan son adım açıklanmıştır: <xref linkend=\"drakconnect-end\"/>"
+msgstr ""
+"Kabul ettikten sonra, tüm bağlantı yapaılandırmaları için ortak olan son "
+"adım açıklanmıştır: <xref linkend=\"drakconnect-end\"/>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:111 en/drakconnect.xml:248 en/drakconnect.xml:615
 msgid "Manual configuration"
 msgstr "Elle yapılandırma"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:115
 msgid ""
 "<emphasis>Ethernet/IP settings</emphasis>: you need to declare what DNS "
 "servers to use. The HOSTNAME of the computer can be specified here. If no "
 "HOSTNAME is specified, the name <literal>localhost.localdomain</literal> is "
 "attributed by default."
-msgstr "<emphasis>Ethernet/IP ayarları</emphasis>: DNS sunucuyu bildirmek zorundasınız. Bilgisayarın HOSTNAME bilgisi burada belirtilebilir. Eğer hiçbir HOSTNAME belirtilmemişse,   <literal>localhost.localdomain</literal> ismi varsayılan olarak verilecektir."
+msgstr ""
+"<emphasis>Ethernet/IP ayarları</emphasis>: DNS sunucuyu bildirmek "
+"zorundasınız. Bilgisayarın HOSTNAME bilgisi burada belirtilebilir. Eğer "
+"hiçbir HOSTNAME belirtilmemişse,   <literal>localhost.localdomain</literal> "
+"ismi varsayılan olarak verilecektir."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:121 en/drakconnect.xml:258
 msgid ""
 "For a residential network, the IP address usually looks like "
-"<emphasis>192.168.x.x</emphasis>, Netmask is "
-"<emphasis>255.255.255.0</emphasis>, and the Gateway and DNS servers are "
-"available from your service provider's website."
-msgstr "Bir ev ağı için genellikle IP adresi <emphasis>192.168.x.x</emphasis>, Ağ maskesi <emphasis>255.255.255.0</emphasis>, gibidir ve Ağ geçidi ve DNS sunucular servis sunucunuzun web sayfasından alınabilir."
+"<emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</"
+"emphasis>, and the Gateway and DNS servers are available from your service "
+"provider's website."
+msgstr ""
+"Bir ev ağı için genellikle IP adresi <emphasis>192.168.x.x</emphasis>, Ağ "
+"maskesi <emphasis>255.255.255.0</emphasis>, gibidir ve Ağ geçidi ve DNS "
+"sunucular servis sunucunuzun web sayfasından alınabilir."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:126
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It would usually be your home domain, i.e. if your "
-"computer is called \"splash\", and it's full domain name is "
-"\"splash.boatanchor.net\", the Search Domain would be \"boatanchor.net\". "
-"Unless you specifically need it, it's ok not to define this setting. Again, "
-"domestic ADSL would not need this setting."
-msgstr "Gelişmiş ayarlarda, <emphasis>Arama alanı</emphasis> belirtebilirdiniz. Bu genellikle sizin ev alanınız olurdu, örn. bilgiayarınız \"splash\" olarak isimlendirilmişse, ve tam alan adı \"splash.boatanchor.net\" ise, Arama Alanı \"boatanchor.net\" olurdu. Özellikle ihtiyacınız yoksa, bu ayarı tanımlamamak normaldir. Yine evdeki ADSLiniz bu ayara ihtiyaç duymaz."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It would usually be your home domain, i.e. if your computer is "
+"called \"splash\", and it's full domain name is \"splash.boatanchor.net\", "
+"the Search Domain would be \"boatanchor.net\". Unless you specifically need "
+"it, it's ok not to define this setting. Again, domestic ADSL would not need "
+"this setting."
+msgstr ""
+"Gelişmiş ayarlarda, <emphasis>Arama alanı</emphasis> belirtebilirdiniz. Bu "
+"genellikle sizin ev alanınız olurdu, örn. bilgiayarınız \"splash\" olarak "
+"isimlendirilmişse, ve tam alan adı \"splash.boatanchor.net\" ise, Arama "
+"Alanı \"boatanchor.net\" olurdu. Özellikle ihtiyacınız yoksa, bu ayarı "
+"tanımlamamak normaldir. Yine evdeki ADSLiniz bu ayara ihtiyaç duymaz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:136
 msgid "drakconnect30.png"
 msgstr "drakconnect30.png"
@@ -1552,11 +1860,14 @@ msgstr "Yeni bir Uydu bağlantısı (DVB)"
 #: en/drakconnect.xml:152 en/drakconnect.xml:696 en/draknetcenter.xml:136
 #: en/draknetcenter.xml:142 en/draknetcenter.xml:203
 msgid ""
-"This section hasn't been written yet for lack of resources. If you think you"
-" can write this help, please contact <link "
-"ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the Doc "
-"team.</link> Thanking you in advance."
-msgstr "Bu bölüm kaynak yetersizliğinden henüz yazılmamıştır. Eğer bunun yazılmasına yardım edebileceğinizi düşünüyorsanız lütfen <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> Belgelendirme takımı.</link> ile iletişime geçiniz. Şimdiden teşekkürler."
+"This section hasn't been written yet for lack of resources. If you think you "
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
+msgstr ""
+"Bu bölüm kaynak yetersizliğinden henüz yazılmamıştır. Eğer bunun yazılmasına "
+"yardım edebileceğinizi düşünüyorsanız lütfen <link ns2:href=\"https://wiki."
+"mageia.org/en/Documentation_team\"> Belgelendirme takımı.</link> ile "
+"iletişime geçiniz. Şimdiden teşekkürler."
 
 #. type: Content of: <section><section><title>
 #: en/drakconnect.xml:158
@@ -1568,59 +1879,73 @@ msgstr "Yeni bir kablolu modem bağlantısı"
 msgid "You have to specify a authentication method:"
 msgstr "Kimlik kontrolü metodunu belirtmek zorundasınız:"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:176
 msgid "None"
 msgstr "Hiçbiri"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:180
 msgid ""
-"BPALogin (necessary for Telstra). In this case you have to provide User name"
-" and password."
-msgstr "BPALogin (Telstra için gerekli). Bu durumda Kullanıcı adını ve parolayı sağlamalısınız."
+"BPALogin (necessary for Telstra). In this case you have to provide User name "
+"and password."
+msgstr ""
+"BPALogin (Telstra için gerekli). Bu durumda Kullanıcı adını ve parolayı "
+"sağlamalısınız."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:191
 msgid ""
 "<emphasis>Cable/IP settings</emphasis>: you have to select if DNS servers "
 "are declared by the DHCP server or are manually specified, as explained "
 "below. In the last case, the IP address of DNS servers has to be set. The "
-"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified,"
-" the name <literal>localhost.localdomain</literal> is attributed by default."
-"  The Hostname can also be provided by the DHCP server with the option "
-"<emphasis>Assign host name from DHCP server</emphasis>. Not all DHCP servers"
-" have such a function and if you're setting up your PC to get an IP address "
+"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, "
+"the name <literal>localhost.localdomain</literal> is attributed by default.  "
+"The Hostname can also be provided by the DHCP server with the option "
+"<emphasis>Assign host name from DHCP server</emphasis>. Not all DHCP servers "
+"have such a function and if you're setting up your PC to get an IP address "
 "from a domestic ADSL router, it is unlikely."
-msgstr "<emphasis>Kablolu/IP ayarları</emphasis>: DNS sunucuların DHCP sunucu tarafından mı yoksa elle mi belirtildiğini aşağıda açıklandığı gibi seçmeniz gerekir. İkincisi durumunda, DHCP sunucularının IP adresi ayarlanmalı. Bilgisayarın HOSTNAME i burada belirtilebilir. Eğer hiçbir HOSTNAME belirtilmemişse varsayılan olarak <literal>localhost.localdomain</literal> ismi verilir. Makine adı ayrıca DHCP sunucusundan <emphasis>Makine ismini DHCP sunucusundan ata</emphasis> seçeneği ile sağlanabilir. Tüm DHCP sunucuları böyle bir fonksiyonu yoktur ve eğer bilgisayarınızı evdeki ADSL yönelticiden IP adresi alacak şekilde ayarladıysanız, muhtemelen yoktur."
-
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+msgstr ""
+"<emphasis>Kablolu/IP ayarları</emphasis>: DNS sunucuların DHCP sunucu "
+"tarafından mı yoksa elle mi belirtildiğini aşağıda açıklandığı gibi seçmeniz "
+"gerekir. İkincisi durumunda, DHCP sunucularının IP adresi ayarlanmalı. "
+"Bilgisayarın HOSTNAME i burada belirtilebilir. Eğer hiçbir HOSTNAME "
+"belirtilmemişse varsayılan olarak <literal>localhost.localdomain</literal> "
+"ismi verilir. Makine adı ayrıca DHCP sunucusundan <emphasis>Makine ismini "
+"DHCP sunucusundan ata</emphasis> seçeneği ile sağlanabilir. Tüm DHCP "
+"sunucuları böyle bir fonksiyonu yoktur ve eğer bilgisayarınızı evdeki ADSL "
+"yönelticiden IP adresi alacak şekilde ayarladıysanız, muhtemelen yoktur."
+
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:252
 msgid ""
-"<emphasis>Cable/IP settings</emphasis>: you need to declare what DNS servers"
-" to use. The HOSTNAME of the computer can be specified here. If no HOSTNAME "
+"<emphasis>Cable/IP settings</emphasis>: you need to declare what DNS servers "
+"to use. The HOSTNAME of the computer can be specified here. If no HOSTNAME "
 "is specified, the name <literal>localhost.localdomain</literal> is "
 "attributed by default."
-msgstr "<emphasis>Kablo/IP ayarları</emphasis>: DNS sunucuyu bildirmek zorundasınız. Bilgisayarın HOSTNAME bilgisi burada belirtilebilir. Eğer hiçbir HOSTNAME belirtilmemişse,   <literal>localhost.localdomain</literal> ismi varsayılan olarak verilecektir."
+msgstr ""
+"<emphasis>Kablo/IP ayarları</emphasis>: DNS sunucuyu bildirmek zorundasınız. "
+"Bilgisayarın HOSTNAME bilgisi burada belirtilebilir. Eğer hiçbir HOSTNAME "
+"belirtilmemişse,   <literal>localhost.localdomain</literal> ismi varsayılan "
+"olarak verilecektir."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:263
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It would usually be your home domain, i.e. if your "
-"computer is called \"splash\", and it's full domain name is "
-"\"splash.boatanchor.net\", the Search Domain would be \"boatanchor.net\". "
-"Unless you specifically need it, it's ok not to define this setting. Again, "
-"domestic connection would not need this setting."
-msgstr "Gelişmiş ayarlarda, <emphasis>Arama alanı</emphasis> belirtebilirdiniz. Bu genellikle sizin ev alanınız olurdu, örn. bilgiayarınız \"splash\" olarak isimlendirilmişse, ve tam alan adı \"splash.boatanchor.net\" ise, Arama Alanı \"boatanchor.net\" olurdu. Özellikle ihtiyacınız yoksa, bu ayarı tanımlamamak normaldir. Yine evdeki bağlantınız bu ayara ihtiyaç duymaz."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It would usually be your home domain, i.e. if your computer is "
+"called \"splash\", and it's full domain name is \"splash.boatanchor.net\", "
+"the Search Domain would be \"boatanchor.net\". Unless you specifically need "
+"it, it's ok not to define this setting. Again, domestic connection would not "
+"need this setting."
+msgstr ""
+"Gelişmiş ayarlarda, <emphasis>Arama alanı</emphasis> belirtebilirdiniz. Bu "
+"genellikle sizin ev alanınız olurdu, örn. bilgiayarınız \"splash\" olarak "
+"isimlendirilmişse, ve tam alan adı \"splash.boatanchor.net\" ise, Arama "
+"Alanı \"boatanchor.net\" olurdu. Özellikle ihtiyacınız yoksa, bu ayarı "
+"tanımlamamak normaldir. Yine evdeki bağlantınız bu ayara ihtiyaç duymaz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:273
 msgid "drakconnect32.png"
 msgstr "drakconnect32.png"
@@ -1635,47 +1960,47 @@ msgstr "Yeni bir DSL bağlantısı"
 msgid ""
 "If the tool detects network interfaces, it offers to select one and to "
 "configure it."
-msgstr "Eğer araç ağ aryüzleri tespit ederse, birini seçmenizi ve bunu yapılandırmanızı önerir."
+msgstr ""
+"Eğer araç ağ aryüzleri tespit ederse, birini seçmenizi ve bunu "
+"yapılandırmanızı önerir."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:296 en/drakconnect.xml:663
 msgid ""
 "A list of providers is proposed, classified by countries.  Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider gave."
-msgstr "Ülkelere göre sınıflandırılmış bir sağlayıcı listesi önerilmiştir. Sağlayıcınızı seçiniz. Eğer listelenmemiş ise <guilabel>Listelenmemiş</guilabel> seçeneğini seçiniz ve sağlayıcınızın verdiği seçenekleri giriniz."
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave."
+msgstr ""
+"Ülkelere göre sınıflandırılmış bir sağlayıcı listesi önerilmiştir. "
+"Sağlayıcınızı seçiniz. Eğer listelenmemiş ise <guilabel>Listelenmemiş</"
+"guilabel> seçeneğini seçiniz ve sağlayıcınızın verdiği seçenekleri giriniz."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:303 en/drakconnect.xml:380
 msgid "Select one of the protocols available:"
 msgstr "Mümkün olan protokollerden birini seçiniz:"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:307
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Değişen Makine Yapılandırma Protokolü (DHCP)"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:311
 msgid "Manual TCP/IP configuration"
 msgstr "Elle TCP/IP yapılandırması"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:315
 msgid "PPP over ADSL (PPPoA)"
 msgstr "ADSL üzerinden PPP (PPPoA)"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:319
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "Ethernet üzerinden PPP (PPPoE)"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:323
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Noktadan Noktaya Borulama Protokolü (PPTP)"
@@ -1685,26 +2010,22 @@ msgstr "Noktadan Noktaya Borulama Protokolü (PPTP)"
 msgid "Access settings"
 msgstr "Erişim ayarları"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:333 en/drakconnect.xml:678
 msgid "Account Login (user name)"
 msgstr "Oturum Hesabı (kullanıcı adı)"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:337 en/drakconnect.xml:414 en/drakconnect.xml:682
 msgid "Account password"
 msgstr "Hesap parolası"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:341
 msgid "(Advanced) Virtual Path ID (VPI)"
 msgstr "(Gelişmiş) Sanal Yol Kimliği (VPI)"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:345
 msgid "(Advanced) Virtual Circuit ID (VCI)"
 msgstr "(Gelişmiş) Sanal Şebeke Kimliği (VCI)"
@@ -1724,14 +2045,12 @@ msgstr "Yeni bir ISDN bağlantısı"
 msgid "The wizard asks which device to configure:"
 msgstr "Sihirbaz hangi cihazı yapılandıracağını sorar"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:365
 msgid "Manual choice (internal ISDN card)"
 msgstr "Elle seçim (dahili ISDN kartı)"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:369
 msgid "External ISDN modem"
 msgstr "Harici ISDN modem"
@@ -1741,16 +2060,16 @@ msgstr "Harici ISDN modem"
 msgid ""
 "A list of hardware is proposed, classified by category and manufacturer. "
 "Select your card."
-msgstr "Bir donanım listesi sunulmuş, kategori ve üreticisine göre sınıflandırılmış. Kartınızı seçiniz."
+msgstr ""
+"Bir donanım listesi sunulmuş, kategori ve üreticisine göre sınıflandırılmış. "
+"Kartınızı seçiniz."
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:384
 msgid "Protocol for the rest of the world, except Europe (DHCP)"
 msgstr "Avrupa hariç, dünyanın geri kalanı için protokol  (DHCP)"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:389
 msgid "Protocol for Europe (EDSS1)"
 msgstr "Avrupa için protokol (EDSS1)"
@@ -1759,31 +2078,31 @@ msgstr "Avrupa için protokol (EDSS1)"
 #: en/drakconnect.xml:395
 msgid ""
 "A list of providers is then offered, classified by countries.  Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider gave "
-"you. Then it is asked for parameters:"
-msgstr "Sonra ülkelere göre sınıflandırılmış bir sağlayıcı listesi önerilmiştir. Sağlayıcınızı seçiniz. Eğer listelenmemiş ise <guilabel>Listelenmemiş</guilabel> seçeneğini seçiniz ve sağlayıcınızın verdiği seçenekleri giriniz. Sonra parametreler için sorulcaktır:"
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave you. Then it is "
+"asked for parameters:"
+msgstr ""
+"Sonra ülkelere göre sınıflandırılmış bir sağlayıcı listesi önerilmiştir. "
+"Sağlayıcınızı seçiniz. Eğer listelenmemiş ise <guilabel>Listelenmemiş</"
+"guilabel> seçeneğini seçiniz ve sağlayıcınızın verdiği seçenekleri giriniz. "
+"Sonra parametreler için sorulcaktır:"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:402
 msgid "Connection name"
 msgstr "Bağlanrı ismi"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:406
 msgid "Phone number"
 msgstr "Telefon numarası"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:410
 msgid "Login ID"
 msgstr "Oturum ID"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:418
 msgid "Authentication method"
 msgstr "Kimlik Denetimi yöntemi"
@@ -1793,43 +2112,49 @@ msgstr "Kimlik Denetimi yöntemi"
 msgid ""
 "After that, you have to select if you get the IP address by automatic or "
 "manual method. In the last case, specify IP address and Subnet mask."
-msgstr "Bundan sonra IP adresinizi otomatik mi yoksa elle mi elde ettiğinizi seçmeniz gerekir. Eğer ikincisiyse IP adresi ve Altağ maskesini belirtin."
+msgstr ""
+"Bundan sonra IP adresinizi otomatik mi yoksa elle mi elde ettiğinizi "
+"seçmeniz gerekir. Eğer ikincisiyse IP adresi ve Altağ maskesini belirtin."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:430
 msgid ""
 "The next step is to choose how DNS servers address are obtained, by "
-"automatic or manual method. In the case of manual configuration, you have to"
-" put:"
-msgstr "Sonraki metod DNS sunucu adresinin nasıl elde edildiğini, otomatik veya elle, seçmeniz için. Elle yapılandırma durumunda şunları girmelisiniz:"
+"automatic or manual method. In the case of manual configuration, you have to "
+"put:"
+msgstr ""
+"Sonraki metod DNS sunucu adresinin nasıl elde edildiğini, otomatik veya "
+"elle, seçmeniz için. Elle yapılandırma durumunda şunları girmelisiniz:"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:436
 msgid "Domain name"
 msgstr "Alanadı ismi"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:440
 msgid "First and second DNS Server"
 msgstr "Birinci ve ikinci DNS Sunucu"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:444
 msgid ""
 "Select if the hostname is set from IP. This option is to select only if you "
 "are sure that your provider is configured to accept it."
-msgstr "Eğer makineadı IP ile ayarlanıp ayarlanmadığını seçiniz. Bunu sadece sağlayıcınızın bunu kabul edecek şekilde yapılandırıldığından eminseniz seçin."
+msgstr ""
+"Eğer makineadı IP ile ayarlanıp ayarlanmadığını seçiniz. Bunu sadece "
+"sağlayıcınızın bunu kabul edecek şekilde yapılandırıldığından eminseniz "
+"seçin."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:452
 msgid ""
-"The next step is to choose how the gateway address is obtained, by automatic"
-" or manual method. In the case of manual configuration, you have to enter "
-"the IP address."
-msgstr "Sonraki metod ağgeçidi adresinin nasıl elde edildiğini, otomatik veya elle, seçmeniz için. Elle yapılandırma durumunda IP adresini girmelisiniz:"
+"The next step is to choose how the gateway address is obtained, by automatic "
+"or manual method. In the case of manual configuration, you have to enter the "
+"IP address."
+msgstr ""
+"Sonraki metod ağgeçidi adresinin nasıl elde edildiğini, otomatik veya elle, "
+"seçmeniz için. Elle yapılandırma durumunda IP adresini girmelisiniz:"
 
 #. type: Content of: <section><section><title>
 #: en/drakconnect.xml:464
@@ -1842,103 +2167,92 @@ msgid ""
 "A first window lists the interfaces which are available and an entry for "
 "Windows driver (ndiswrapper). Select the one to configure.  Use ndiswrapper "
 "only if the other configuration methods did not work."
-msgstr "İlk pencere uygun olan arayüzleri ve Windows sürücüleri için bir girdi (ndiswrapper) listeler. Yapılandırmak istediğinizi seçiniz. ndiswrapper'ı sadece diğer yapılandırma metodları işe yaramadığında kullanın."
+msgstr ""
+"İlk pencere uygun olan arayüzleri ve Windows sürücüleri için bir girdi "
+"(ndiswrapper) listeler. Yapılandırmak istediğinizi seçiniz. ndiswrapper'ı "
+"sadece diğer yapılandırma metodları işe yaramadığında kullanın."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:475
 msgid ""
 "At this step, the choice is given between the different access points that "
 "the card has detected."
-msgstr "Bu adımda kartın algıladığı farklı erişim noktaları arasında seçim verilir."
+msgstr ""
+"Bu adımda kartın algıladığı farklı erişim noktaları arasında seçim verilir."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:480
 msgid "Specific parameter for the wireless card are to provide:"
 msgstr "Kablosuz kart için sağlanacak belirli parametreler:"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><orderedlist><listitem><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:484
 msgid "drakconnect31.png"
 msgstr "drakconnect31.png"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:490
 msgid "Operating mode:"
 msgstr "İşlem modu:"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
 #: en/drakconnect.xml:494
 msgid "Managed"
 msgstr "Yönetildi"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
 #: en/drakconnect.xml:497
 msgid "To access to an existing access point (the most frequent)."
 msgstr "Varolan bir erişim noktasına erişmek için (çoğunlukla)"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
 #: en/drakconnect.xml:503
 msgid "Ad-Hoc"
 msgstr "Ad-hoc"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
 #: en/drakconnect.xml:506
 msgid "To configure direct connection between computers."
 msgstr "Bilgisayarlar arasındaki doğrudan bağlantıyı yapılandırmak için."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:514
 msgid "Network Name (ESSID)"
 msgstr "Ağ İsmi (ESSID)"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:518
 msgid "Encryption mode: it depends of how the access point is configured."
 msgstr "Şifreleme modu: Erişim noktasının nasıl yapılandırıldığına bağlıdır."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
 #: en/drakconnect.xml:523
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
 #: en/drakconnect.xml:526
 msgid "This encryption mode is to prefer if your hardware allows it."
 msgstr "Eğer donanımınız izin veriyor ise şifreleme modu tercih edilir."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><term>
 #: en/drakconnect.xml:532
 msgid "WEP"
 msgstr "WEP"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><variablelist><varlistentry><listitem><para>
 #: en/drakconnect.xml:535
 msgid "Some old hardware deals only this encryption method."
 msgstr "Bazı eski donanımlar sadece bu şifreleme metodunu kullanır."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:543
 msgid "Encryption key"
 msgstr "Şifreleme anahtarı"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:545
-msgid ""
-"It is generally provided with the hardware which give the access point."
+msgid "It is generally provided with the hardware which give the access point."
 msgstr "Bu genellikle erişim noktasına verilen donanım ile sağlanır."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
@@ -1946,10 +2260,11 @@ msgstr "Bu genellikle erişim noktasına verilen donanım ile sağlanır."
 msgid ""
 "At this step, the choice is given between an automatic IP address or a "
 "manual IP address."
-msgstr "Bu adımda, seçenekler otomatik IP adresi veya elle IP adresi olmak üzere verilir. "
+msgstr ""
+"Bu adımda, seçenekler otomatik IP adresi veya elle IP adresi olmak üzere "
+"verilir. "
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:561
 msgid ""
 "<emphasis>IP settings</emphasis>: you have to select if DNS servers are "
@@ -1959,49 +2274,63 @@ msgid ""
 "localhost.localdomain is attributed by default. The Hostname can also be "
 "provided by the DHCP server with the option <emphasis>Assign host name from "
 "DHCP server</emphasis>"
-msgstr "<emphasis>IP ayarları</emphasis>: DNS sunucuların DHCP sunucu tarafından mı yoksa elle mi belirtildiğini aşağıda açıklandığı gibi seçmeniz gerekir. İkincisi durumunda, DHCP sunucularının IP adresi ayarlanmalı. Bilgisayarın HOSTNAME i burada belirtilebilir. Eğer hiçbir HOSTNAME belirtilmemişse varsayılan olarak localhost.localdomain ismi verilir. Makine adı ayrıca DHCP sunucusundan <emphasis>Makine ismini DHCP sunucusundan ata</emphasis> seçeneği ile sağlanabilir. "
-
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
+msgstr ""
+"<emphasis>IP ayarları</emphasis>: DNS sunucuların DHCP sunucu tarafından mı "
+"yoksa elle mi belirtildiğini aşağıda açıklandığı gibi seçmeniz gerekir. "
+"İkincisi durumunda, DHCP sunucularının IP adresi ayarlanmalı. Bilgisayarın "
+"HOSTNAME i burada belirtilebilir. Eğer hiçbir HOSTNAME belirtilmemişse "
+"varsayılan olarak localhost.localdomain ismi verilir. Makine adı ayrıca DHCP "
+"sunucusundan <emphasis>Makine ismini DHCP sunucusundan ata</emphasis> "
+"seçeneği ile sağlanabilir. "
+
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:589
 msgid "Get YP server from DHCP (checked by default): specify the NIS servers"
-msgstr "DHCP'den YP sunucuyu getir (varsayılan olarak işareli): NIS sunucuları belirt"
+msgstr ""
+"DHCP'den YP sunucuyu getir (varsayılan olarak işareli): NIS sunucuları belirt"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:608
 msgid ""
 "After accepting the configuration the step, which is common to all "
 "connection configurations, is explained: <xref linkend=\"drakconnect-end\"/>"
-msgstr "Yapılandırmayı kabul ettikten sonra, tüm bağlantılar için ortak olan adım açıklanmıştır: <xref linkend=\"drakconnect-end\"/>"
+msgstr ""
+"Yapılandırmayı kabul ettikten sonra, tüm bağlantılar için ortak olan adım "
+"açıklanmıştır: <xref linkend=\"drakconnect-end\"/>"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:619
 msgid ""
 "<emphasis>IP settings</emphasis>: you have to declare DNS servers. The "
-"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified,"
-" the name <literal>localhost.localdomain</literal> is attributed by default."
-msgstr "<emphasis>IP ayarları</emphasis>: DNS sunucuyu açıklamak zorundasınız. Bilgisayarın HOSTNAME bilgisi burada belirtilebilir. Eğer hiçbir HOSTNAME belirtilmemişse,   <literal>localhost.localdomain</literal> ismi varsayılan olarak verilecektir."
+"HOSTNAME of the computer can be specified here. If no HOSTNAME is specified, "
+"the name <literal>localhost.localdomain</literal> is attributed by default."
+msgstr ""
+"<emphasis>IP ayarları</emphasis>: DNS sunucuyu açıklamak zorundasınız. "
+"Bilgisayarın HOSTNAME bilgisi burada belirtilebilir. Eğer hiçbir HOSTNAME "
+"belirtilmemişse,   <literal>localhost.localdomain</literal> ismi varsayılan "
+"olarak verilecektir."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:625
 msgid ""
 "For a residential network, the IP address always looks like "
-"<emphasis>192.168.x.x</emphasis>, Netmask is "
-"<emphasis>255.255.255.0</emphasis>, and the Gateway and DNS servers are "
-"available from your providers website."
-msgstr "Bir ev ağı için genellikle IP adresi <emphasis>192.168.x.x</emphasis>, Ağ maskesi <emphasis>255.255.255.0</emphasis>, gibidir ve Ağ geçidi ve DNS sunucular servis sunucunuzun web sayfasından alınabilir."
+"<emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</"
+"emphasis>, and the Gateway and DNS servers are available from your providers "
+"website."
+msgstr ""
+"Bir ev ağı için genellikle IP adresi <emphasis>192.168.x.x</emphasis>, Ağ "
+"maskesi <emphasis>255.255.255.0</emphasis>, gibidir ve Ağ geçidi ve DNS "
+"sunucular servis sunucunuzun web sayfasından alınabilir."
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:630
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It must seem to your hostname without the first name, "
-"before the period."
-msgstr "Gelişmiş ayarlarda <emphasis>Arama alanı</emphasis> belirtebilirsiniz. Bu, makineadınıza ilk isim olmadan görünmelidir."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It must seem to your hostname without the first name, before the "
+"period."
+msgstr ""
+"Gelişmiş ayarlarda <emphasis>Arama alanı</emphasis> belirtebilirsiniz. Bu, "
+"makineadınıza ilk isim olmadan görünmelidir."
 
 #. type: Content of: <section><section><title>
 #: en/drakconnect.xml:644
@@ -2013,7 +2342,9 @@ msgstr "Yeni bir  GPRS/Edge/3G bağlantısı"
 msgid ""
 "If the tool detects wireless interfaces, it offers to select one and to "
 "configure it."
-msgstr "Eğer araç kablosuz ağ aryüzleri tespit ederse, birini seçmenizi ve bunu yapılandırmanızı önerir."
+msgstr ""
+"Eğer araç kablosuz ağ aryüzleri tespit ederse, birini seçmenizi ve bunu "
+"yapılandırmanızı önerir."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:653
@@ -2025,15 +2356,16 @@ msgstr "PIN numarası isteniyor. PIN numarası gerekmiyorsa devam edin."
 msgid ""
 "The wizard asks for network. If it is not detected, select the option "
 "<guilabel>Unlisted</guilabel>."
-msgstr "Sihirbaz ağı soruyor. Eğer bulunmamışsa <guilabel>Listelenmemiş</guilabel> seçeneğini seçin."
+msgstr ""
+"Sihirbaz ağı soruyor. Eğer bulunmamışsa <guilabel>Listelenmemiş</guilabel> "
+"seçeneğini seçin."
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:670
 msgid "Provide access settings"
 msgstr "Erişim ayarlarını sağlayın"
 
-#. type: Content of:
-#. <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:674
 msgid "Access Point Name"
 msgstr "Erişim Noktası İsmi"
@@ -2048,14 +2380,12 @@ msgstr "Yeni bir Blurtooth Çevirmeli Ağ bağlantısı"
 msgid "A new Analog telephone modem connection (POTS)"
 msgstr "Yeni bir Analog telefon modem bağlantısı (POTS)"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:710
 msgid "Manual choice"
 msgstr "Elle seçim"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:714
 msgid "Detected hardware, if any."
 msgstr "Donanım bulundu, eğer varsa."
@@ -2070,73 +2400,69 @@ msgstr "Bir port listesi sunuldu. Portunuzu seçiniz."
 msgid ""
 "If not yet installed, it will be suggested that you install the package "
 "<emphasis>kppp-provider</emphasis>."
-msgstr "Eğer hala kurulmadıysa,  <emphasis>kppp-provider</emphasis> paketini kurmanız önerilir"
+msgstr ""
+"Eğer hala kurulmadıysa,  <emphasis>kppp-provider</emphasis> paketini "
+"kurmanız önerilir"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/drakconnect.xml:729
 msgid ""
 "A list of providers is proposed, classified by countries. Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider gave."
-" Then it is asked for Dialup options:"
-msgstr "Ülkelere göre sınıflandırılmış bir sağlayıcı listesi önerilmiştir. Sağlayıcınızı seçiniz. Eğer listelenmemiş ise <guilabel>Listelenmemiş</guilabel> seçeneğini seçiniz ve sağlayıcınızın verdiği seçenekleri giriniz. Sonra Çevirmeli seçenekleri sorulcaktır:"
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave. Then it is asked "
+"for Dialup options:"
+msgstr ""
+"Ülkelere göre sınıflandırılmış bir sağlayıcı listesi önerilmiştir. "
+"Sağlayıcınızı seçiniz. Eğer listelenmemiş ise <guilabel>Listelenmemiş</"
+"guilabel> seçeneğini seçiniz ve sağlayıcınızın verdiği seçenekleri giriniz. "
+"Sonra Çevirmeli seçenekleri sorulcaktır:"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:736
 msgid "<emphasis>Connection name</emphasis>"
 msgstr "<emphasis>Bağlantı ismi</emphasis>"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:740
 msgid "<emphasis>Phone number</emphasis>"
 msgstr "<emphasis>Telefon numarası</emphasis>"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:744
 msgid "<emphasis>Login ID</emphasis>"
 msgstr "<emphasis>Oturum ID</emphasis>"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:748
 msgid "<emphasis>Password</emphasis>"
 msgstr "<emphasis>Parola</emphasis>"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:752
 msgid "<emphasis>Authentication</emphasis>, choose between:"
 msgstr "<emphasis>Kimlik Denetimi</emphasis>, seçiniz:"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:756
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:760
 msgid "Script-based"
 msgstr "Betik Tabanlı"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:764
 msgid "PAP"
 msgstr "PAP"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:768
 msgid "Terminal-based"
 msgstr "Uçbirim-tabanlı"
 
-#. type: Content of:
-#. <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakconnect.xml:772
 msgid "CHAP"
 msgstr "CHAP"
@@ -2170,7 +2496,8 @@ msgstr "<emphasis>Trafik muhasebesini etkinleştir</emphasis>"
 #: en/drakconnect.xml:804
 msgid ""
 "<emphasis>Allow interface to be controlled by Network Manager</emphasis>"
-msgstr "<emphasis>Arayüzün Ağ Yöneticisi tarafından yönetilmesine izin ver</emphasis>"
+msgstr ""
+"<emphasis>Arayüzün Ağ Yöneticisi tarafından yönetilmesine izin ver</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakconnect.xml:809
@@ -2178,7 +2505,10 @@ msgid ""
 "In the case of a wireless connection, a supplemental box is <emphasis>Allow "
 "access point roaming</emphasis> which give the possibility to switch "
 "automatically between access point according to the signal strength."
-msgstr "Kablosuz bağlantı durumunda, tamamlayıcı bir kutu, sinyal gücüne göre otomatik olarak erişim noktasını değiştiren <emphasis>Erişim noktası dolaşımına izin ver</emphasis> bulunur."
+msgstr ""
+"Kablosuz bağlantı durumunda, tamamlayıcı bir kutu, sinyal gücüne göre "
+"otomatik olarak erişim noktasını değiştiren <emphasis>Erişim noktası "
+"dolaşımına izin ver</emphasis> bulunur."
 
 #. type: Content of: <section><section><para>
 #: en/drakconnect.xml:816
@@ -2210,10 +2540,10 @@ msgstr "IPv6' dan IPv4 tünellemeyi etkinleştir"
 msgid ""
 "The last step allows you to specify if the connection is to start "
 "immediately or not."
-msgstr "Son adım bağlantının hemen başlatılıp başlatılmayacağını belirtmenizi sağlar."
+msgstr ""
+"Son adım bağlantının hemen başlatılıp başlatılmayacağını belirtmenizi sağlar."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/drakconnect.xml:841
 msgid "drakconnect9.png"
 msgstr "drakconnect9.png"
@@ -2228,8 +2558,7 @@ msgstr "Yönetici olarak bir komut satırı açın"
 msgid "drakconsole"
 msgstr "drakconsole"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakconsole.xml:10
 msgid "drakconsole.png"
 msgstr "drakconsole.png"
@@ -2237,17 +2566,22 @@ msgstr "drakconsole.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakconsole.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconsole</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakconsole</emphasis> komutu ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconsole</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakconsole</"
+"emphasis> komutu ile başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakconsole.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> gives you access to a "
-"console which is directly opened as root. We do not think that you need more"
-" information about that."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> doğrudan root olarak bir uç birim açmanızı sağlar. Bununla ilgili daha fazla bilgiye ihtiyacınız olmadığını düşünüyoruz. "
+"console which is directly opened as root. We do not think that you need more "
+"information about that."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> doğrudan root olarak bir uç "
+"birim açmanızı sağlar. Bununla ilgili daha fazla bilgiye ihtiyacınız "
+"olmadığını düşünüyoruz. "
 
 #. type: Content of: <section><info><title>
 #: en/drakdisk.xml:8
@@ -2259,8 +2593,7 @@ msgstr "Disk bölümlerini yönet"
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk veya diskdrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakdisk.xml:15
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
@@ -2268,10 +2601,13 @@ msgstr "drakdiskBackup.png"
 #. type: Content of: <section><warning><para><footnote><para>
 #: en/drakdisk.xml:21
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakdisk</emphasis> or <emphasis "
-"role=\"bold\">diskdrake</emphasis> as root."
-msgstr "Bu aracı komut satırında ve root olarak <emphasis role=\"bold\">drakdisk</emphasis> veya <emphasis role=\"bold\">diskdrake</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
+"as root."
+msgstr ""
+"Bu aracı komut satırında ve root olarak <emphasis role=\"bold\">drakdisk</"
+"emphasis> veya <emphasis role=\"bold\">diskdrake</emphasis> yazarak "
+"başlatabilirsiniz."
 
 #. type: Content of: <section><warning><para>
 #: en/drakdisk.xml:20
@@ -2279,19 +2615,25 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
 "partition or even to erasing the entire hard disk. For that reason, you'll "
-"see the screen above on top of the tool screen. Click on "
-"<emphasis>Exit</emphasis> if you're not sure you want to continue."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> çok kuvvetlidir, küçücük bir hata veya bir kedinin klavyenizin üzerinde dolaşması bir bölmümdeki tüm verileri kaybatmenize veya hatta tüm sabit diskin silinmesine yol açabilir. Bu yüzden araç ekranının en üstünde yukarıdaki ekranı göreceksiniz. Devam etmek istediğinize emin değilseniz <emphasis>Çıkış</emphasis>a tıklayınız."
+"see the screen above on top of the tool screen. Click on <emphasis>Exit</"
+"emphasis> if you're not sure you want to continue."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> çok kuvvetlidir, küçücük "
+"bir hata veya bir kedinin klavyenizin üzerinde dolaşması bir bölmümdeki tüm "
+"verileri kaybatmenize veya hatta tüm sabit diskin silinmesine yol açabilir. "
+"Bu yüzden araç ekranının en üstünde yukarıdaki ekranı göreceksiniz. Devam "
+"etmek istediğinize emin değilseniz <emphasis>Çıkış</emphasis>a tıklayınız."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:30
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
-msgstr "Eğer birden fazla sabit diskiniz varsa, doğru sekmeyi seçerek (sda, sdb, sdc vb.) üzerinde çalışmak istediğiniz sabit diske geçebilirsiniz."
+msgstr ""
+"Eğer birden fazla sabit diskiniz varsa, doğru sekmeyi seçerek (sda, sdb, sdc "
+"vb.) üzerinde çalışmak istediğiniz sabit diske geçebilirsiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakdisk.xml:35
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
@@ -2301,12 +2643,18 @@ msgstr "drakdisk.png"
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
-"resizing them or changing the filesystem, formatting or viewing what is in a"
-" partition: it is all possible. The <emphasis><guibutton>Clear "
-"all</guibutton></emphasis> button at the bottom is to erase the complete "
-"disk, the other buttons become visible on the right after you click on a "
-"partition."
-msgstr "Sabit diskinizi tercihlerinize göre ayarlamak için bir çok işlem arasından seçim yapabilirsiniz. Tüm sabit diski silme, bölme ya da birleştirme, yeniden boyutlandırma ya da dosya sistemini değiştirme, biçimlendirme ya da bir bölümde ne olduğunu görüntüleme: hepsi mümkün. En alttaki <emphasis><guibutton>Tümünü temizle</guibutton></emphasis> düğmesi tüm diski silmek içindir, sağ taraftaki diğer düğmeler bir bölüme tıkladığınızda görünür olur."
+"resizing them or changing the filesystem, formatting or viewing what is in a "
+"partition: it is all possible. The <emphasis><guibutton>Clear all</"
+"guibutton></emphasis> button at the bottom is to erase the complete disk, "
+"the other buttons become visible on the right after you click on a partition."
+msgstr ""
+"Sabit diskinizi tercihlerinize göre ayarlamak için bir çok işlem arasından "
+"seçim yapabilirsiniz. Tüm sabit diski silme, bölme ya da birleştirme, "
+"yeniden boyutlandırma ya da dosya sistemini değiştirme, biçimlendirme ya da "
+"bir bölümde ne olduğunu görüntüleme: hepsi mümkün. En alttaki "
+"<emphasis><guibutton>Tümünü temizle</guibutton></emphasis> düğmesi tüm diski "
+"silmek içindir, sağ taraftaki diğer düğmeler bir bölüme tıkladığınızda "
+"görünür olur."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:47
@@ -2314,7 +2662,10 @@ msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
-msgstr "Eğer seçilen bölüm bağlanmışsa, aşağıdaki örnekte olduğu gibi, yeniden boyutlandırmayı, biçimlendirmeyi veya silmeyi seçemezsiniz. Bunun için önce bölümün ayırılması gerekir."
+msgstr ""
+"Eğer seçilen bölüm bağlanmışsa, aşağıdaki örnekte olduğu gibi, yeniden "
+"boyutlandırmayı, biçimlendirmeyi veya silmeyi seçemezsiniz. Bunun için önce "
+"bölümün ayırılması gerekir."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:51
@@ -2328,15 +2679,17 @@ msgid ""
 "delete the partition and then re-create it with the new type. The button "
 "<guibutton role=\"bold\">Create</guibutton> appears when a disk empty part "
 "is selected"
-msgstr "Bölüm türünü değiştirmek için (örneğin ext3'den ext4'e) bölümü silmeli ve yeniden oluşturmalısınız. Boş bir bölüm seçildiğinde <guibutton role=\"bold\">Oluştur</guibutton> düğmesi görünecektir."
+msgstr ""
+"Bölüm türünü değiştirmek için (örneğin ext3'den ext4'e) bölümü silmeli ve "
+"yeniden oluşturmalısınız. Boş bir bölüm seçildiğinde <guibutton role=\"bold"
+"\">Oluştur</guibutton> düğmesi görünecektir."
 
 #. type: Content of: <section><para>
 #: en/drakdisk.xml:58
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Varolmayan bir bağlama noktaı seçebilirsiniz, oluşturulacaktır."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakdisk.xml:63
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
@@ -2347,10 +2700,12 @@ msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
 "gives some extra available actions, like labelling the partition, as can be "
 "seen in the screenshot below."
-msgstr "<emphasis><guibutton>Uzman moduna geç</guibutton></emphasis> seçilerek, aşağıdaki ekran görüntüsünde görüldüğü gibi, bölümü etiketleme gibi bazı ek işlemler gelir."
+msgstr ""
+"<emphasis><guibutton>Uzman moduna geç</guibutton></emphasis> seçilerek, "
+"aşağıdaki ekran görüntüsünde görüldüğü gibi, bölümü etiketleme gibi bazı ek "
+"işlemler gelir."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakdisk.xml:73
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
@@ -2365,8 +2720,7 @@ msgstr "Görüntü yöneticisini ayarla"
 msgid "drakedm"
 msgstr "drakedm"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakedm.xml:12
 msgid "drakedm.png"
 msgstr "drakedm.png"
@@ -2374,17 +2728,22 @@ msgstr "drakedm.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakedm.xml:17
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakedm</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakedm</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakedm</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakedm</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakedm.xml:16
 msgid ""
 "Here<placeholder type=\"footnote\" id=\"0\"/> you can choose which display "
-"manager to use to log into your desktop environment. Only the ones available"
-" on your system will be shown."
-msgstr "Burada<placeholder type=\"footnote\" id=\"0\"/> masaüstü ortamınızda oturum açmak için hangi görüntü yöneticisini kullanacağınızı seçebilirsiniz. Sadece sisteminize uygun olanlar gösterilecektir. "
+"manager to use to log into your desktop environment. Only the ones available "
+"on your system will be shown."
+msgstr ""
+"Burada<placeholder type=\"footnote\" id=\"0\"/> masaüstü ortamınızda oturum "
+"açmak için hangi görüntü yöneticisini kullanacağınızı seçebilirsiniz. Sadece "
+"sisteminize uygun olanlar gösterilecektir. "
 
 #. type: Content of: <section><para>
 #: en/drakedm.xml:24
@@ -2392,7 +2751,11 @@ msgid ""
 "Most users will only notice that the provided login screens look different. "
 "However, there are differences in supported features, too. LXDM is a "
 "lightweight display manager, KDM and GDM have more extras."
-msgstr "Çoğu kullanıcı sadece sağlanan oturum açma ekranının farklı olduğuna dikkat eder. Bununla birlikte, sağlanan özelliklerde de farklılıklar bulunur. LZDM düşük yoğunluklu bir görüntü yöneticisidir, KDM ve GDM daha fazla ek özelliğe sahiptir."
+msgstr ""
+"Çoğu kullanıcı sadece sağlanan oturum açma ekranının farklı olduğuna dikkat "
+"eder. Bununla birlikte, sağlanan özelliklerde de farklılıklar bulunur. LZDM "
+"düşük yoğunluklu bir görüntü yöneticisidir, KDM ve GDM daha fazla ek "
+"özelliğe sahiptir."
 
 #. type: Content of: <section><info><title>
 #: en/drakfirewall.xml:3
@@ -2404,8 +2767,7 @@ msgstr "Kişisel güvenlik duvarınızı ayarlayın"
 msgid "drakfirewall"
 msgstr "drakfirewall"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakfirewall.xml:10
 msgid "drakfirewall.png"
 msgstr "drakfirewall.png"
@@ -2413,9 +2775,11 @@ msgstr "drakfirewall.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakfirewall.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakfirewall</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakfirewall</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakfirewall</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakfirewall</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:14
@@ -2424,18 +2788,28 @@ msgid ""
 "Security tab in the Mageia Control Center labelled \"Set up your personal "
 "firewall\". It is the same tool in the first tab of \"Configure system "
 "security, permissions and audit\"."
-msgstr "Bu araç <placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezindeki Güvenlik sekmesinde \"Kişisel güvenlik duvarınızı ayarlayın\" etiketiyle bulunur. \"Sistem güvenliğini, yetkileri ve denetimi yapılandır\" kısmının ilk sekmesindekiyle aynı araçtır."
+msgstr ""
+"Bu araç <placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim "
+"Merkezindeki Güvenlik sekmesinde \"Kişisel güvenlik duvarınızı ayarlayın\" "
+"etiketiyle bulunur. \"Sistem güvenliğini, yetkileri ve denetimi yapılandır\" "
+"kısmının ilk sekmesindekiyle aynı araçtır."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:20
 msgid ""
 "A basic firewall is installed by default with Mageia. All the incoming "
 "connections from the outside are blocked if they aren't authorised. In the "
-"first screen above, you can select the services for which outside connection"
-" attempts are accepted. For your security, uncheck the first box - "
+"first screen above, you can select the services for which outside connection "
+"attempts are accepted. For your security, uncheck the first box - "
 "<guilabel>Everything (no firewall)</guilabel> - unless you want to disable "
 "the firewall, and only check the needed services."
-msgstr "Temel bir güvenlik duvarı Mageia tarafından kurulmuştur. Dışarıdan gelen tüm bağlantılar eğer yetkilendirilmemişse bloklanır. Yukarıdaki ilk ekranda dış bağlantı girişimlerinin kabul edildiği servisleri seçebilirsiniz. Güvenliğiniz için, eğer güvenlik duvarını devre dışı bırakmak istemiyorsanız, ilk kutunun - <guilabel>Herşey (güvenlik duvarı yok)</guilabel> - işaretini kaldırın, ve gerekli servisleri işaretleyin."
+msgstr ""
+"Temel bir güvenlik duvarı Mageia tarafından kurulmuştur. Dışarıdan gelen tüm "
+"bağlantılar eğer yetkilendirilmemişse bloklanır. Yukarıdaki ilk ekranda dış "
+"bağlantı girişimlerinin kabul edildiği servisleri seçebilirsiniz. "
+"Güvenliğiniz için, eğer güvenlik duvarını devre dışı bırakmak "
+"istemiyorsanız, ilk kutunun - <guilabel>Herşey (güvenlik duvarı yok)</"
+"guilabel> - işaretini kaldırın, ve gerekli servisleri işaretleyin."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:27
@@ -2444,7 +2818,11 @@ msgid ""
 "<guibutton>Advanced</guibutton> and a new window is opened. In the field "
 "<guilabel>Other ports</guilabel>, enter the needed ports following these "
 "examples :"
-msgstr "Açılacak port numaralarını elle girmek mümkündür. <guibutton>Gelişmiş</guibutton> düğmesine tıklayınca yeni bir pencere açılır. <guilabel>Diğer portlar</guilabel> alanında gerekli portları aşağıdaki örnekte olduğu gibi giriniz:"
+msgstr ""
+"Açılacak port numaralarını elle girmek mümkündür. <guibutton>Gelişmiş</"
+"guibutton> düğmesine tıklayınca yeni bir pencere açılır. <guilabel>Diğer "
+"portlar</guilabel> alanında gerekli portları aşağıdaki örnekte olduğu gibi "
+"giriniz:"
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:32
@@ -2454,7 +2832,8 @@ msgstr "80/tcp : port 80 tcp protokolünü aç"
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:34
 msgid "24000:24010/udp : open all the ports from 24000 to 24010 udp protocol"
-msgstr "24000:24010/udp : 24000'den 24010'e kadar tüm udp protokolü portlarını aç"
+msgstr ""
+"24000:24010/udp : 24000'den 24010'e kadar tüm udp protokolü portlarını aç"
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:37
@@ -2466,10 +2845,12 @@ msgstr "Listelenen portlar boşlukla ayırılmış olmalı."
 msgid ""
 "If the box <guilabel>Log firewall messages in system logs</guilabel> is "
 "checked, the firewall messages will be saved in system logs"
-msgstr "Eğer <guilabel>Güvenlik duvarı mesajlarını sistem günlüklerine kaydet</guilabel> kutusu işaretlenmişse, güvenlik duvar mesajı sistem günlüklerine kaydedilir."
+msgstr ""
+"Eğer <guilabel>Güvenlik duvarı mesajlarını sistem günlüklerine kaydet</"
+"guilabel> kutusu işaretlenmişse, güvenlik duvar mesajı sistem günlüklerine "
+"kaydedilir."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakfirewall.xml:44
 msgid "drakfirewall2.png"
 msgstr "drakfirewall2.png"
@@ -2480,7 +2861,10 @@ msgid ""
 "If you don't host specific services (web or mail server, file sharing, ...) "
 "it is completely possible to have nothing checked at all, it is even "
 "recommended, it won't prevent you from connecting to the internet."
-msgstr "Konağa özel servisleriniz yoksa (web veya e-posta, sunucu, dosya paylaşımı, ...) hiçbirini işaretlememiz mümkündür, hatta tavsiye edilir. Bu sizin İnternete bağlanmanızı engellemez."
+msgstr ""
+"Konağa özel servisleriniz yoksa (web veya e-posta, sunucu, dosya "
+"paylaşımı, ...) hiçbirini işaretlememiz mümkündür, hatta tavsiye edilir. Bu "
+"sizin İnternete bağlanmanızı engellemez."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:55
@@ -2490,24 +2874,30 @@ msgid ""
 "<guilabel>Use Interactive Firewall </guilabel>is checked. Check the second "
 "box to be warned if the ports are scanned (in order to find a failure "
 "somewhere and enter your machine). Each box from the third one onwards "
-"corresponds to a port you opened in the two first screens; in the screenshot"
-" below, there are two such boxes: SSH server and 80:150/tcp. Check them to "
-"be warned each time a connection is attempted on those ports."
-msgstr "Bir sonraki ekran Etkileşimli güvenlik duvarı seçeneklerini halleder. Bu özellik, eğer en azından ilk kutu<guilabel>Etkileşimli güvenlik duvarı kullan </guilabel> işaretlenmişse, bağlantı girişimleri ile ilgili uyarı almanızı sağlar. Eğer portlar taranacaksa (bazı yerlerdeki hataları bulmak için ve makineyi girmek için) ikinci kutuyu işaretleyin. Üçüncüden itibaren her kutu ilk ekranda açtığınız bir porta karşılık gelir; aşağıdaki ekran görüntüsünde, böyle iki kutu bulunur: SSH sunucu ve 80:150/tcp. Bu portlara her bağlantı girişimide uyarı almak için bunları işaretleyin."
+"corresponds to a port you opened in the two first screens; in the screenshot "
+"below, there are two such boxes: SSH server and 80:150/tcp. Check them to be "
+"warned each time a connection is attempted on those ports."
+msgstr ""
+"Bir sonraki ekran Etkileşimli güvenlik duvarı seçeneklerini halleder. Bu "
+"özellik, eğer en azından ilk kutu<guilabel>Etkileşimli güvenlik duvarı "
+"kullan </guilabel> işaretlenmişse, bağlantı girişimleri ile ilgili uyarı "
+"almanızı sağlar. Eğer portlar taranacaksa (bazı yerlerdeki hataları bulmak "
+"için ve makineyi girmek için) ikinci kutuyu işaretleyin. Üçüncüden itibaren "
+"her kutu ilk ekranda açtığınız bir porta karşılık gelir; aşağıdaki ekran "
+"görüntüsünde, böyle iki kutu bulunur: SSH sunucu ve 80:150/tcp. Bu portlara "
+"her bağlantı girişimide uyarı almak için bunları işaretleyin."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:64
 msgid "These warning are given by alert popups through the network applet."
 msgstr "Bu uyarılar ağ applet'i tarafından açılan pencere ile verilir."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakfirewall.xml:69
 msgid "drakfirewall3.png"
 msgstr "drakfirewall3.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakfirewall.xml:75
 msgid "drakfirewall4.png"
 msgstr "drakfirewall4.png"
@@ -2516,16 +2906,21 @@ msgstr "drakfirewall4.png"
 #: en/drakfirewall.xml:79
 msgid ""
 "In the last screen, choose which network interfaces are connected to the "
-"Internet and must be protected. Once the OK button is clicked, the necessary"
-" packages are downloaded."
-msgstr "Son ekranda, hangi ağ arayüzlerinin İnternete bağlanacağını ve korumalı olması gerektiğini. Bir kez TAMAM düğmesi tıklandığında gerekli paketler indirilir."
+"Internet and must be protected. Once the OK button is clicked, the necessary "
+"packages are downloaded."
+msgstr ""
+"Son ekranda, hangi ağ arayüzlerinin İnternete bağlanacağını ve korumalı "
+"olması gerektiğini. Bir kez TAMAM düğmesi tıklandığında gerekli paketler "
+"indirilir."
 
 #. type: Content of: <section><tip><para>
 #: en/drakfirewall.xml:84
 msgid ""
 "If you don't know what to choose, have a look in MCC tab Network &amp; "
 "Internet, icon Set up a new network interface."
-msgstr "Hangisini seçeceğinizi bilmiyorsanız, MCC sekmesinde Ağ &amp; İnternet bakınız, Yeni bir Ağ arayüzü kur'u seçiniz."
+msgstr ""
+"Hangisini seçeceğinizi bilmiyorsanız, MCC sekmesinde Ağ &amp; İnternet "
+"bakınız, Yeni bir Ağ arayüzü kur'u seçiniz."
 
 #. type: Content of: <section><info><title>
 #: en/drakfont.xml:3
@@ -2537,8 +2932,7 @@ msgstr "Fontları yönet, ekle ve sil. Windows(TM) fontlarını içe aktar."
 msgid "drakfont"
 msgstr "drakfont"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakfont.xml:11
 msgid "drakfont.png"
 msgstr "drakfont.png"
@@ -2546,9 +2940,11 @@ msgstr "drakfont.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakfont.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakfont</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak<emphasis role=\"bold\">drakfont</emphasis> ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakfont</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak<emphasis role=\"bold\">drakfont</"
+"emphasis> ile başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:15
@@ -2557,7 +2953,11 @@ msgid ""
 "Control Center under the <emphasis role=\"bold\">System</emphasis> tab. It "
 "allows you to manage the fonts available on the computer. The main screen "
 "above shows:"
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde  <emphasis role=\"bold\">Sistem</emphasis> sekmesinde bulunur. Bilgisayarınızda bulunan fontları yönetmenize izin verir. Ana ekran aşağıda gösteriliyor:"
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde  "
+"<emphasis role=\"bold\">Sistem</emphasis> sekmesinde bulunur. "
+"Bilgisayarınızda bulunan fontları yönetmenize izin verir. Ana ekran aşağıda "
+"gösteriliyor:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/drakfont.xml:22
@@ -2577,14 +2977,17 @@ msgstr "bazı düğmeler burada daha sonra açıklanmıştır."
 #. type: Content of: <section><para>
 #: en/drakfont.xml:36
 msgid "<emphasis role=\"bold\">Get Windows Fonts: <emphasis/></emphasis>"
-msgstr "<emphasis role=\"bold\">Windows Fontlarını Getir: <emphasis/></emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Windows Fontlarını Getir: <emphasis/></emphasis>"
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:38
 msgid ""
-"This button automatically adds the fonts found on the Windows partition. You"
-" must have Microsoft Windows installed."
-msgstr "Bu düğme otomatik olarak Windows bölümünde bulunan fontları ekler. Kurulu Microsoft Windows olmalıdır."
+"This button automatically adds the fonts found on the Windows partition. You "
+"must have Microsoft Windows installed."
+msgstr ""
+"Bu düğme otomatik olarak Windows bölümünde bulunan fontları ekler. Kurulu "
+"Microsoft Windows olmalıdır."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:41
@@ -2594,9 +2997,11 @@ msgstr "<emphasis role=\"bold\">Seçenekler:</emphasis>"
 #. type: Content of: <section><para>
 #: en/drakfont.xml:43
 msgid ""
-"It allows you to specify the applications or devices (printers mostly)  able"
-" to use the fonts."
-msgstr "Bu sizin uygulamaların veya aygıtların (çoğunlukla yazıcılar) fontları kullanabileceklerini belirtmenizi sağlar."
+"It allows you to specify the applications or devices (printers mostly)  able "
+"to use the fonts."
+msgstr ""
+"Bu sizin uygulamaların veya aygıtların (çoğunlukla yazıcılar) fontları "
+"kullanabileceklerini belirtmenizi sağlar."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:46
@@ -2609,7 +3014,10 @@ msgid ""
 "This button is to remove installed fonts and possibly save some place.  Be "
 "careful when removing fonts because it may have serious consequences on the "
 "documents that use them."
-msgstr "Bu düğme kurulu fontların kaldırılması ve muhtemelen yer kazanılması içindir. Fontları kaldırıken dikkatli olun çünkü onları kullanan belgelere ciddi sonuçlar doğurabilir."
+msgstr ""
+"Bu düğme kurulu fontların kaldırılması ve muhtemelen yer kazanılması "
+"içindir. Fontları kaldırıken dikkatli olun çünkü onları kullanan belgelere "
+"ciddi sonuçlar doğurabilir."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:52
@@ -2621,18 +3029,26 @@ msgstr "<emphasis role=\"bold\">İçe aktar:</emphasis>"
 msgid ""
 "Allows you to add fonts from a third party (CD, internet, ...). The "
 "supported formats are ttf, pfa, pfb, pcf, pfm and gsf. Click on the "
-"<emphasis role=\"bold\">Import</emphasis> button and then on <emphasis "
-"role=\"bold\">Add</emphasis>, a file manager pops up where you can select "
-"the fonts to install, click on <emphasis role=\"bold\">Install</emphasis> "
-"when done. They are installed in the folder /usr/share/fonts."
-msgstr "Üçüncü partiden (CD, internet, ...) fontları eklemenizi sağlar. Desteklenen biçimler ttf, pfa, pfb, pcf, pfm ve gsf'dir. <emphasis role=\"bold\">İçe aktar</emphasis> düğmesine ve sonra <emphasis role=\"bold\">Ekle</emphasis>ye tıklayın, kurulacak fontları seçebileceğiniz bir dosya yöneticisi açılır, bitince <emphasis role=\"bold\">Kur</emphasis>a tıklayın. /usr/share/fonts altına kurulurlar."
+"<emphasis role=\"bold\">Import</emphasis> button and then on <emphasis role="
+"\"bold\">Add</emphasis>, a file manager pops up where you can select the "
+"fonts to install, click on <emphasis role=\"bold\">Install</emphasis> when "
+"done. They are installed in the folder /usr/share/fonts."
+msgstr ""
+"Üçüncü partiden (CD, internet, ...) fontları eklemenizi sağlar. Desteklenen "
+"biçimler ttf, pfa, pfb, pcf, pfm ve gsf'dir. <emphasis role=\"bold\">İçe "
+"aktar</emphasis> düğmesine ve sonra <emphasis role=\"bold\">Ekle</"
+"emphasis>ye tıklayın, kurulacak fontları seçebileceğiniz bir dosya "
+"yöneticisi açılır, bitince <emphasis role=\"bold\">Kur</emphasis>a "
+"tıklayın. /usr/share/fonts altına kurulurlar."
 
 #. type: Content of: <section><para>
 #: en/drakfont.xml:60
 msgid ""
 "If the newly installed (or removed) fonts doesn't appear in the Drakfont "
 "main screen, close and re open it to see the modifications."
-msgstr "Eğer yeni kurulmuş (ya da kaldırılmış) fontlarDrakfon ana ekranında görünmüyorsa, değişiklikleri görmek için kapatıp yeniden açın."
+msgstr ""
+"Eğer yeni kurulmuş (ya da kaldırılmış) fontlarDrakfon ana ekranında "
+"görünmüyorsa, değişiklikleri görmek için kapatıp yeniden açın."
 
 #. type: Content of: <section><info><title>
 #: en/drakguard.xml:3
@@ -2644,8 +3060,7 @@ msgstr "Ebeveyn Denetimi"
 msgid "drakguard"
 msgstr "drakguard"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakguard.xml:10
 msgid "drakguard.png"
 msgstr "drakguard.png"
@@ -2653,18 +3068,23 @@ msgstr "drakguard.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakguard.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakguard</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakguard</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakguard</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakguard</"
+"emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakguard.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
-"Control Center, under the Security tab, labelled <guilabel>Parental "
-"Control</guilabel>. If you don't see this label, you have to install the "
-"drakguard package (not installed by default)."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde <guilabel>Ebeveyn Denetimi</guilabel> sekmesinde bulunur. Bu etiketi görmüyor iseniz drakguard paketini kurmalısınız (varsayılan olarak kurulmaz)."
+"Control Center, under the Security tab, labelled <guilabel>Parental Control</"
+"guilabel>. If you don't see this label, you have to install the drakguard "
+"package (not installed by default)."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
+"<guilabel>Ebeveyn Denetimi</guilabel> sekmesinde bulunur. Bu etiketi "
+"görmüyor iseniz drakguard paketini kurmalısınız (varsayılan olarak kurulmaz)."
 
 #. type: Content of: <section><section><title>
 #: en/drakguard.xml:21 en/msecgui.xml:19
@@ -2677,30 +3097,41 @@ msgid ""
 "Drakguard is an easy way to set up parental controls on your computer to "
 "restrict who can do what, and at which times of day. Drakguard has three "
 "useful capabilities:"
-msgstr "Drakguard bilgisayarınızda kimin neyi günün hangi saatinde yapabileceğini sınırlandıran ebeveyn denetimini yapılandırmak için kolay bir yoldur. Drakguard'ın üç kullanışlı özelliği vardır:"
+msgstr ""
+"Drakguard bilgisayarınızda kimin neyi günün hangi saatinde yapabileceğini "
+"sınırlandıran ebeveyn denetimini yapılandırmak için kolay bir yoldur. "
+"Drakguard'ın üç kullanışlı özelliği vardır:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakguard.xml:29
 msgid ""
 "It restricts web access to named users to set times of day. It does this by "
 "controlling the shorewall firewall built into Mageia."
-msgstr "Web erişimini belirli kullanıcılar için günün belirli zamanlarında sınırlar. Bunu Mageia içinde kurulu shorewall güvenlik duvarını kontrol ederek yapar."
+msgstr ""
+"Web erişimini belirli kullanıcılar için günün belirli zamanlarında sınırlar. "
+"Bunu Mageia içinde kurulu shorewall güvenlik duvarını kontrol ederek yapar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakguard.xml:35
 msgid ""
-"It blocks execution of particular commands by named users so these users can"
-" only execute what you accept them to execute."
-msgstr "Belirli komutların belirli kullanıcılar tarafından çalıştırılmasını engeller, bu sayede sadece izin verdiklerinizi çalıştırabilir."
+"It blocks execution of particular commands by named users so these users can "
+"only execute what you accept them to execute."
+msgstr ""
+"Belirli komutların belirli kullanıcılar tarafından çalıştırılmasını "
+"engeller, bu sayede sadece izin verdiklerinizi çalıştırabilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakguard.xml:40
 msgid ""
-"It restricts access to websites, both manually defined through "
-"blacklists/whitelists, but also dynamically based on the content of the "
-"website. To achieve this Drakguard uses the leading opensource parental "
-"control blocker DansGuardian."
-msgstr "Web sayfalarına erişimi hem elle tanımlanmış karaliste/beyazliste yoluyla, hem de web site içerğine dayalı bir şekilde dinamik olarak sınırlar. Drakkguard bunu yapmak için lider açık kaynaklı ebeveyn denetimi engelleyici DansGuardian kullanır."
+"It restricts access to websites, both manually defined through blacklists/"
+"whitelists, but also dynamically based on the content of the website. To "
+"achieve this Drakguard uses the leading opensource parental control blocker "
+"DansGuardian."
+msgstr ""
+"Web sayfalarına erişimi hem elle tanımlanmış karaliste/beyazliste yoluyla, "
+"hem de web site içerğine dayalı bir şekilde dinamik olarak sınırlar. "
+"Drakkguard bunu yapmak için lider açık kaynaklı ebeveyn denetimi engelleyici "
+"DansGuardian kullanır."
 
 #. type: Content of: <section><section><title>
 #: en/drakguard.xml:49
@@ -2714,19 +3145,30 @@ msgid ""
 "Ext3, or ReiserFS format you will see a pop up offering to configure ACL on "
 "your partitions. ACL stands for Access Control Lists, and is a Linux kernel "
 "feature that allows access to individual files to be restricted to named "
-"users. ACL is built into Ext4 and Btrfs file systems, but must be enabled by"
-" an option in Ext2, Ext3, or Reiserfs partitions. If you select 'Yes' to "
-"this prompt drakguard will configure all your partitions to support ACL, and"
-" will then suggest you reboot."
-msgstr "Eğer bilgisayarınızda Ext2, Ext3 veya ReiserFS biçiminde biçimlendirilmiş bir sabit disk bölümü varsa, bölünleriniz üzerinde ACL'i yapılandırmayı öneren bir açılır pencere göreceksiniz. ACL'in açılımı Erişim Kontrol Listeleridir, ve Linux çekirdeğinin tekil dosyaların erişimini belirli kullanıcılarla sınırlandıran bir özelliidir. ACL Ext4 ve Btrfs içine inşa edilmiştir fakat Ext2, Ext3 veya ReiserFS'de bir seçenek ile etkinleştirilmelidir. Eğer 'Evet'i seçerseniz drakguard tüm bölümleri ACL destekli yapılandıracaktır ve size yeniden başlatmayı önerecektir."
+"users. ACL is built into Ext4 and Btrfs file systems, but must be enabled by "
+"an option in Ext2, Ext3, or Reiserfs partitions. If you select 'Yes' to this "
+"prompt drakguard will configure all your partitions to support ACL, and will "
+"then suggest you reboot."
+msgstr ""
+"Eğer bilgisayarınızda Ext2, Ext3 veya ReiserFS biçiminde biçimlendirilmiş "
+"bir sabit disk bölümü varsa, bölünleriniz üzerinde ACL'i yapılandırmayı "
+"öneren bir açılır pencere göreceksiniz. ACL'in açılımı Erişim Kontrol "
+"Listeleridir, ve Linux çekirdeğinin tekil dosyaların erişimini belirli "
+"kullanıcılarla sınırlandıran bir özelliidir. ACL Ext4 ve Btrfs içine inşa "
+"edilmiştir fakat Ext2, Ext3 veya ReiserFS'de bir seçenek ile "
+"etkinleştirilmelidir. Eğer 'Evet'i seçerseniz drakguard tüm bölümleri ACL "
+"destekli yapılandıracaktır ve size yeniden başlatmayı önerecektir."
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:61
 msgid ""
 "<guibutton>Enable parental control</guibutton>: If checked, the parental "
-"control is enabled and the access to <guilabel>Block programs</guilabel> tab"
-" is opened."
-msgstr "<guibutton>Ebeveyn kontrolünü etkinleştir</guibutton>: İşaretlenmişse, ebeveyn kontrolü etkiinleştirilir ve <guilabel>Programları engelle</guilabel> sekmesi açılır."
+"control is enabled and the access to <guilabel>Block programs</guilabel> tab "
+"is opened."
+msgstr ""
+"<guibutton>Ebeveyn kontrolünü etkinleştir</guibutton>: İşaretlenmişse, "
+"ebeveyn kontrolü etkiinleştirilir ve <guilabel>Programları engelle</"
+"guilabel> sekmesi açılır."
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:65
@@ -2734,7 +3176,10 @@ msgid ""
 "<guibutton>Block all network traffic</guibutton>: If checked, all the "
 "websites are blocked, except the ones in the whitelist tab. Otherwise, all "
 "the websites are allowed, except the ones in the blacklist tab."
-msgstr "<guibutton>Tüm ağ trafiğini engelle</guibutton>: Eğer işaretlenmişse, tüm web sayfaları engellenir. Aksi durumda karalistede sekmesindekiler hariç tüm web sayfalarına izin verilir."
+msgstr ""
+"<guibutton>Tüm ağ trafiğini engelle</guibutton>: Eğer işaretlenmişse, tüm "
+"web sayfaları engellenir. Aksi durumda karalistede sekmesindekiler hariç tüm "
+"web sayfalarına izin verilir."
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:69
@@ -2746,7 +3191,15 @@ msgid ""
 "<guibutton>Add</guibutton> to add him/her as an allowed user.  Select an "
 "user in the right hand side and click on <guibutton>Remove</guibutton> to "
 "remove him/her from the allowed users."
-msgstr "<guibutton>Kullanıcı erişimi</guibutton>: Sol taraftaki kullanıcılar tanımladığınız kurallara bağlı olarak erişim sınırlandırmalarına sahip olacaktır. Sağ taraftaki kullanıcılar sınırlandırılmamış erişime sahip olacaktır, böylece yetişkin kullanıcılar güçlük yaşamayacaktır. Sol taraftan bir kullanıcı seçiniz ve onu izin verilen kullanıcılara eklemek için  <guibutton>Ekle</guibutton> düğmesine tıklayınız. Sağ taraftan bir kullanıcı seçiniz ve onu izin verilmiş kullanıcılardan çıkartmak için <guibutton>Kaldır</guibutton> düğmesine tıklayınız."
+msgstr ""
+"<guibutton>Kullanıcı erişimi</guibutton>: Sol taraftaki kullanıcılar "
+"tanımladığınız kurallara bağlı olarak erişim sınırlandırmalarına sahip "
+"olacaktır. Sağ taraftaki kullanıcılar sınırlandırılmamış erişime sahip "
+"olacaktır, böylece yetişkin kullanıcılar güçlük yaşamayacaktır. Sol taraftan "
+"bir kullanıcı seçiniz ve onu izin verilen kullanıcılara eklemek için  "
+"<guibutton>Ekle</guibutton> düğmesine tıklayınız. Sağ taraftan bir kullanıcı "
+"seçiniz ve onu izin verilmiş kullanıcılardan çıkartmak için "
+"<guibutton>Kaldır</guibutton> düğmesine tıklayınız."
 
 #. type: Content of: <section><section><para>
 #: en/drakguard.xml:77
@@ -2755,7 +3208,11 @@ msgid ""
 "with restrictions between the <guilabel>Start</guilabel> time and "
 "<guilabel>End</guilabel> time. It is totally blocked outside these time "
 "window."
-msgstr "<guibutton>Zaman denetimi:</guibutton> Eğer işaretlenmişse, internet erişimine  <guilabel>Başlangıç</guilabel> zamanı ve <guilabel>Bitiş</guilabel> zamanı arasında izin verilir. It is totally blocked outside these time window. Bu zamandilimi dışında tamamen engellenir."
+msgstr ""
+"<guibutton>Zaman denetimi:</guibutton> Eğer işaretlenmişse, internet "
+"erişimine  <guilabel>Başlangıç</guilabel> zamanı ve <guilabel>Bitiş</"
+"guilabel> zamanı arasında izin verilir. It is totally blocked outside these "
+"time window. Bu zamandilimi dışında tamamen engellenir."
 
 #. type: Content of: <section><section><section><title>
 #: en/drakguard.xml:83
@@ -2767,7 +3224,9 @@ msgstr "Karaliste/Beyazliste sekmesi"
 msgid ""
 "Enter the website URL in the first field at the top and click on the "
 "<guibutton>Add</guibutton> button."
-msgstr "En üstte ilk alanda web sayfası URL'sini girin ve  <guibutton>Ekle</guibutton> düğmesine tıklayın."
+msgstr ""
+"En üstte ilk alanda web sayfası URL'sini girin ve  <guibutton>Ekle</"
+"guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><section><section><title>
 #: en/drakguard.xml:90
@@ -2777,17 +3236,22 @@ msgstr "Programları Engelle Sekmesi"
 #. type: Content of: <section><section><section><para>
 #: en/drakguard.xml:92
 msgid ""
-"<guibutton>Block Defined Applications</guibutton>: Enables the use of ACL to"
-" restrict access to specific applications. Insert the path to the "
+"<guibutton>Block Defined Applications</guibutton>: Enables the use of ACL to "
+"restrict access to specific applications. Insert the path to the "
 "applications you wish to block."
-msgstr "<guibutton>Tanımlanan Uygulamaları Engelle</guibutton>: Belirli uygulamaların erişimini sınırlandırmak için ACL kullanımını etkinleştirir. Engellemek istediğiniz uygulamaların yolunu ekleyin."
+msgstr ""
+"<guibutton>Tanımlanan Uygulamaları Engelle</guibutton>: Belirli "
+"uygulamaların erişimini sınırlandırmak için ACL kullanımını etkinleştirir. "
+"Engellemek istediğiniz uygulamaların yolunu ekleyin."
 
 #. type: Content of: <section><section><section><para>
 #: en/drakguard.xml:96
 msgid ""
 "<guibutton>Unblock Users list</guibutton>: Users listed on the right hand "
 "side will not be subject to acl blocking."
-msgstr "<guibutton>Engelsiz Kullanıcılar listesi</guibutton>: Sağ tarafta listelenen kullanıcılar acl engellemesine tabi değildir."
+msgstr ""
+"<guibutton>Engelsiz Kullanıcılar listesi</guibutton>: Sağ tarafta listelenen "
+"kullanıcılar acl engellemesine tabi değildir."
 
 #. type: Content of: <section><info><title>
 #: en/drakgw.xml:9
@@ -2799,8 +3263,7 @@ msgstr "İnternet bağlantısını diğer yerel makinelerle paylaşın"
 msgid "drakgw"
 msgstr "drakgw"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakgw.xml:17
 msgid "drakgw.png"
 msgstr "drakgw.png"
@@ -2810,8 +3273,7 @@ msgstr "drakgw.png"
 msgid "Principles"
 msgstr "Prensipler"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
 #: en/drakgw.xml:29
 msgid "drakgw-net.png"
 msgstr "drakgw-net.png"
@@ -2826,14 +3288,22 @@ msgid ""
 "gateway must have two interfaces; the first one such as an ethernet card "
 "must be connected to the local network, and the second one (4) connected to "
 "the Internet (2)."
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Bu Internet (2) erişimi olan ve ayrıca yerel bir ağa (1)  bağlı bir bilgisayarınız (3) olduğunda kullanışlıdır. Bilgisayarı (3) erişimi yerel ağdaki (1) diğer iş istasyonlarına (5) ve (6) vermek için ağ geçidi olarak kullanabilirsiniz. Bunun için, ağ geçidinin iki arayüzü olmalıdır; birincisi ethernet kartı gibi, yerel ağa bağlı olmalı, ve ikincisi (4) İnternete (2) bağlı olmalı."
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Bu Internet (2) erişimi olan ve "
+"ayrıca yerel bir ağa (1)  bağlı bir bilgisayarınız (3) olduğunda "
+"kullanışlıdır. Bilgisayarı (3) erişimi yerel ağdaki (1) diğer iş "
+"istasyonlarına (5) ve (6) vermek için ağ geçidi olarak kullanabilirsiniz. "
+"Bunun için, ağ geçidinin iki arayüzü olmalıdır; birincisi ethernet kartı "
+"gibi, yerel ağa bağlı olmalı, ve ikincisi (4) İnternete (2) bağlı olmalı."
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:39
 msgid ""
 "The first step is to verify that the network and the access to Internet are "
 "set up, as documented in <xref linkend=\"draknetcenter\"/>."
-msgstr "İlk adım ağ ve İnternete erişimin <xref linkend=\"draknetcenter\"/> belgesinde anlatıldığı gibi ayarlandığını doğrulamaktır."
+msgstr ""
+"İlk adım ağ ve İnternete erişimin <xref linkend=\"draknetcenter\"/> "
+"belgesinde anlatıldığı gibi ayarlandığını doğrulamaktır."
 
 #. type: Content of: <section><section><title>
 #: en/drakgw.xml:45
@@ -2843,23 +3313,29 @@ msgstr "Ağ geçidi sihirbazı"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakgw.xml:48
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakgw</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakgw</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakgw</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakgw</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:47
 msgid ""
 "The wizard<placeholder type=\"footnote\" id=\"0\"/> offers successive steps "
 "which are shown below:"
-msgstr "Sihirbaz<placeholder type=\"footnote\" id=\"0\"/> aşağıda gösterilen ardıl adımları önerir:"
+msgstr ""
+"Sihirbaz<placeholder type=\"footnote\" id=\"0\"/> aşağıda gösterilen ardıl "
+"adımları önerir:"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:54
 msgid ""
 "If the wizard does not detect at least two interfaces, it warns about this "
 "and asks to stop the network and configure the hardware."
-msgstr "Eğer sihirbaz en azında iki arayüz algılamazsa, bunun hakkında uyarır ve ağ ve donanım yapılandırmasını durdurmayı ister."
+msgstr ""
+"Eğer sihirbaz en azında iki arayüz algılamazsa, bunun hakkında uyarır ve ağ "
+"ve donanım yapılandırmasını durdurmayı ister."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:60
@@ -2867,22 +3343,30 @@ msgid ""
 "specify the interface used for the Internet connection. The wizard "
 "automatically suggests one of the interfaces, but you should verify that "
 "what is proposed is correct."
-msgstr "İnternet bağlantısı için kullanılan arayüzü belirtin. Sihirbaz otomatik olarak arayüzlerden birini önerir, fakat önerilenin doğru olduğunu kontrol etmeniz gerekir."
+msgstr ""
+"İnternet bağlantısı için kullanılan arayüzü belirtin. Sihirbaz otomatik "
+"olarak arayüzlerden birini önerir, fakat önerilenin doğru olduğunu kontrol "
+"etmeniz gerekir."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:66
 msgid ""
-"specify which interface is used for the Lan access. The wizard also proposes"
-" one, check that this is correct."
-msgstr "Lan erişimi için hangi arayüzün kullanılacağını belirtin. Sihirbaz ayrıca bir tane önerir, doğru olduğunu kontrol edin."
+"specify which interface is used for the Lan access. The wizard also proposes "
+"one, check that this is correct."
+msgstr ""
+"Lan erişimi için hangi arayüzün kullanılacağını belirtin. Sihirbaz ayrıca "
+"bir tane önerir, doğru olduğunu kontrol edin."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:71
 msgid ""
-"The wizard proposes parameters for the Lan network, such as IP address, mask"
-" and domain name. Check that these parameters are compatible with the actual"
-" configuration. It is recommended that you accept these values."
-msgstr "Sihirbaz, IP adresi, ağ maskesi ve alan adı gibi, yerel ağ için parametreler önerir. Bu parametrenin yapılandırmanızla uygun olduğunu kontrol edin. Bu değerleri kabul etmeniz tavsiye edilir:"
+"The wizard proposes parameters for the Lan network, such as IP address, mask "
+"and domain name. Check that these parameters are compatible with the actual "
+"configuration. It is recommended that you accept these values."
+msgstr ""
+"Sihirbaz, IP adresi, ağ maskesi ve alan adı gibi, yerel ağ için parametreler "
+"önerir. Bu parametrenin yapılandırmanızla uygun olduğunu kontrol edin. Bu "
+"değerleri kabul etmeniz tavsiye edilir:"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:78
@@ -2890,15 +3374,21 @@ msgid ""
 "specify if the computer has to be used as a DNS server. If yes, the wizard "
 "will check that <code>bind</code> is installed.  Otherwise, you have to "
 "specify the address of a DNS server."
-msgstr "bilgisayarın bir DNS sunucu olarak kullanılmak zorunda olup olmadığını belirtin. Eğer evetse, sihirbaz <code>bind</code>'ın kurulu olduğunu kontrol eder. Aksi durumda, DNS sunucunun adresini belirtmeniz gerekir."
+msgstr ""
+"bilgisayarın bir DNS sunucu olarak kullanılmak zorunda olup olmadığını "
+"belirtin. Eğer evetse, sihirbaz <code>bind</code>'ın kurulu olduğunu kontrol "
+"eder. Aksi durumda, DNS sunucunun adresini belirtmeniz gerekir."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:84
 msgid ""
 "specify if the computer is to be used as a DHCP server. If yes, the wizard "
-"will check that <code>dhcp-server</code> is installed and offer to configure"
-" it, with start and end addresses in the DHCP range."
-msgstr "bilgisayarın bir DHCP sunucu olarak kullanılıp kullanılmayacağını belirtin. Evet ise, sihirbaz <code>dhcp-server</code>'ın kurulu olduğunu kontrol eder ve DHCP aralığındaki başlangıç ve bitiş adresleri ile yapılandırmayı önerir."
+"will check that <code>dhcp-server</code> is installed and offer to configure "
+"it, with start and end addresses in the DHCP range."
+msgstr ""
+"bilgisayarın bir DHCP sunucu olarak kullanılıp kullanılmayacağını belirtin. "
+"Evet ise, sihirbaz <code>dhcp-server</code>'ın kurulu olduğunu kontrol eder "
+"ve DHCP aralığındaki başlangıç ve bitiş adresleri ile yapılandırmayı önerir."
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:91
@@ -2907,20 +3397,29 @@ msgid ""
 "will check that <code>squid</code> is installed and offer to configure it, "
 "with the address of the administrator (admin@mydomain.com), name of the "
 "proxy (myfirewall@mydomaincom), the port (3128) and the cache size (100 Mb)."
-msgstr "bilgisayarın vekil sunucu olarak kullanılıp kullanılmayacağını belirtin. Eğer evetse, sihirbaz <code>squid</code>in kurulu olduğunu kontrol eder ve, yönetici adresi (admin@mydomain.com), vekil sunucu ismi  (myfirewall@mydomaincom), port (3128) ve önbellek boyutu (100 Mb) ile yapılandırmayı önerir. "
+msgstr ""
+"bilgisayarın vekil sunucu olarak kullanılıp kullanılmayacağını belirtin. "
+"Eğer evetse, sihirbaz <code>squid</code>in kurulu olduğunu kontrol eder ve, "
+"yönetici adresi (admin@mydomain.com), vekil sunucu ismi  "
+"(myfirewall@mydomaincom), port (3128) ve önbellek boyutu (100 Mb) ile "
+"yapılandırmayı önerir. "
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakgw.xml:99
 msgid ""
 "The last step allows you to check if the gateway machine is connected to "
 "printers and to share them."
-msgstr "Son adım ağ geçidi olan makinanın yazıcılara bağlı olup olmadığını ve onları paylaşıp paylaşmayacağını işaretlemenizi sağlar."
+msgstr ""
+"Son adım ağ geçidi olan makinanın yazıcılara bağlı olup olmadığını ve onları "
+"paylaşıp paylaşmayacağını işaretlemenizi sağlar."
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:104
 msgid ""
 "You will be warned about the need to check the firewall if it is active."
-msgstr "Güvenlik duvarının aktif olup olmadığını kontrol etmeniz gerektiği hakkında uyarılacaksınız."
+msgstr ""
+"Güvenlik duvarının aktif olup olmadığını kontrol etmeniz gerektiği hakkında "
+"uyarılacaksınız."
 
 #. type: Content of: <section><section><title>
 #: en/drakgw.xml:109
@@ -2933,9 +3432,12 @@ msgid ""
 "If you have configured the gateway machine with DHCP, you only need to "
 "specify in the network configuration tool that you get an address "
 "automatically (using DHCP). The parameters will be obtained when connecting "
-"to the network. This method is valid whatever operating system the client is"
-" using."
-msgstr "Ağ geçidi makinasını DHCP ile yapılandırdıysanız, tek gerekli olan ağ yapılandırma aracında adresi otomatik olarak aldığınızı (DHCP kullanarak) belirtmenizdir. "
+"to the network. This method is valid whatever operating system the client is "
+"using."
+msgstr ""
+"Ağ geçidi makinasını DHCP ile yapılandırdıysanız, tek gerekli olan ağ "
+"yapılandırma aracında adresi otomatik olarak aldığınızı (DHCP kullanarak) "
+"belirtmenizdir. "
 
 #. type: Content of: <section><section><para>
 #: en/drakgw.xml:117
@@ -2943,7 +3445,9 @@ msgid ""
 "If you must manually specify the network parameters, you must in particular "
 "specify the gateway by entering the IP-address of the machine acting as the "
 "gateway."
-msgstr "Eğer ağ parametrelerini elle belirtmeliyseniz, özellikle ağ geçidi olarak görev yapan makinanın IĞ-adresini ağ geçidi olarak girmelisiniz."
+msgstr ""
+"Eğer ağ parametrelerini elle belirtmeliyseniz, özellikle ağ geçidi olarak "
+"görev yapan makinanın IĞ-adresini ağ geçidi olarak girmelisiniz."
 
 #. type: Content of: <section><section><title>
 #: en/drakgw.xml:123
@@ -2954,9 +3458,10 @@ msgstr "Bağlantıyı paylaşmayı durdur"
 #: en/drakgw.xml:125
 msgid ""
 "If you want to stop sharing the connection on the Mageia computer, launch "
-"the tool. It will offer to reconfigure the connection or to stop the "
-"sharing."
-msgstr "Mageia bilgisayarında paylaşımı durdurmak isterseniz, aracı çalıştırın. Bağlantıyı yeniden yapılandırmanızı veya ppaylaşımı durdurmayı önerecektir."
+"the tool. It will offer to reconfigure the connection or to stop the sharing."
+msgstr ""
+"Mageia bilgisayarında paylaşımı durdurmak isterseniz, aracı çalıştırın. "
+"Bağlantıyı yeniden yapılandırmanızı veya ppaylaşımı durdurmayı önerecektir."
 
 #. type: Content of: <section><info><title>
 #: en/drakhosts.xml:3
@@ -2968,8 +3473,7 @@ msgstr "Konakların tanımlaması"
 msgid "drakhosts"
 msgstr "drakhosts"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakhosts.xml:10
 msgid "drakhosts.png"
 msgstr "drakhosts.png"
@@ -2977,9 +3481,11 @@ msgstr "drakhosts.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakhosts.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakhosts</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakhosts</emphasis> ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakhosts</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakhosts</"
+"emphasis> ile başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:14
@@ -2988,7 +3494,11 @@ msgid ""
 "addresses, this tool<placeholder type=\"footnote\" id=\"0\"/> allows to "
 "specify a name to access them more easily. Then you can use that name "
 "instead of the IP-address."
-msgstr "Eğer ağınızdaki bazı sistemlerde size hizmet veriyorsa, ve sabit IP-adresleri varsa, bu araç<placeholder type=\"footnote\" id=\"0\"/> onlara kolaylıkla ulaşmak için isim vermenizi sağlar. Sonra IP-adresleri yerine isimleri kullanabilirsiniz."
+msgstr ""
+"Eğer ağınızdaki bazı sistemlerde size hizmet veriyorsa, ve sabit IP-"
+"adresleri varsa, bu araç<placeholder type=\"footnote\" id=\"0\"/> onlara "
+"kolaylıkla ulaşmak için isim vermenizi sağlar. Sonra IP-adresleri yerine "
+"isimleri kullanabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:20
@@ -3001,7 +3511,10 @@ msgid ""
 "With this button, you add the name for a new system. You will get a window "
 "to specify the IP-address, the host name for the system, and optionally an "
 "alias which can be used in the same way that the name is."
-msgstr "Bu düğme ile, sisteminiz için bir isim eklersiniz. IP-adresini, sistem için makina adını, ve seçimlik olarak makina adı ile benzer şekilde kullanılan bir mahlas belirteceğiniz bir pencere çıkacak."
+msgstr ""
+"Bu düğme ile, sisteminiz için bir isim eklersiniz. IP-adresini, sistem için "
+"makina adını, ve seçimlik olarak makina adı ile benzer şekilde kullanılan "
+"bir mahlas belirteceğiniz bir pencere çıkacak."
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:27
@@ -3013,7 +3526,9 @@ msgstr "<guibutton>Değiştir</guibutton>"
 msgid ""
 "You can access the parameters of an entry previously defined. You get the "
 "same window."
-msgstr "Daha önce tanımlanan bir girdinin parametrelerine erişebilirsiniz. Aynı pencere karşınıza çıkacak."
+msgstr ""
+"Daha önce tanımlanan bir girdinin parametrelerine erişebilirsiniz. Aynı "
+"pencere karşınıza çıkacak."
 
 #. type: Content of: <section><info><title>
 #: en/drakinvictus.xml:3
@@ -3025,8 +3540,7 @@ msgstr "Ağ arayüzleri ve güvenlik duvarı için gelişmiş kurulum"
 msgid "drakinvictus"
 msgstr "drakinvictus"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakinvictus.xml:8
 msgid "drakinvictus.png"
 msgstr "drakinvictus.png"
@@ -3036,17 +3550,22 @@ msgstr "drakinvictus.png"
 #: en/drakups.xml:12 en/drakwizard_bind.xml:12 en/drakxservices.xml:12
 msgid ""
 "This page hasn't been written yet for lack of resources. If you think you "
-"can write this help, please contact <link "
-"ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the Doc "
-"team.</link> Thanking you in advance."
-msgstr "Bu bölüm kaynak yetersizliğinden henüz yazılmamıştır. Eğer bunun yazılmasına yardım edebileceğinizi düşünüyorsanız lütfen <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> Belgelendirme takımı.</link> ile iletişime geçiniz. Şimdiden teşekkürler."
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
+msgstr ""
+"Bu bölüm kaynak yetersizliğinden henüz yazılmamıştır. Eğer bunun yazılmasına "
+"yardım edebileceğinizi düşünüyorsanız lütfen <link ns2:href=\"https://wiki."
+"mageia.org/en/Documentation_team\"> Belgelendirme takımı.</link> ile "
+"iletişime geçiniz. Şimdiden teşekkürler."
 
 #. type: Content of: <section><para>
 #: en/drakinvictus.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakinvictus</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakinvictus</emphasis> ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakinvictus</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakinvictus</"
+"emphasis> ile başlatabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/draknetcenter.xml:10
@@ -3058,8 +3577,7 @@ msgstr "Ağ Merkezi"
 msgid "draknetcenter"
 msgstr "draknetcenter"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:17
 msgid "draknetcenter.png"
 msgstr "draknetcenter.png"
@@ -3067,9 +3585,11 @@ msgstr "draknetcenter.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/draknetcenter.xml:22
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknetcenter</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">draknetcenter</emphasis> komutu ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknetcenter</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">draknetcenter</"
+"emphasis> komutu ile başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/draknetcenter.xml:21
@@ -3077,40 +3597,45 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "Network &amp; Internet tab in the Mageia Control Center labelled \"Network "
 "Center\""
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde Ağ &amp; İnternet sekmesinde bulunur."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
+"Ağ &amp; İnternet sekmesinde bulunur."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:31
 msgid ""
 "When this tool is launched, a window opens listing all the networks "
-"configured on the computer, whatever their type (wired, wireless, satellite,"
-" etc.). When clicking on one of them, three or four buttons appear, "
-"depending on the network type, to allow you to look after the network, "
-"change its settings or connect/disconnect. This tool isn't intended to "
-"create a network, for this see <guilabel>Set up a new network interface "
-"(LAN, ISDN, ADSL, ...)</guilabel> in the same MCC tab."
-msgstr "Bu araç çalıştırıldığında bir pencere açılır, bilgisayardaki yapılandırılmış tüm ağları türlerine bağlı olmaksızın (kablolu, kablosuz, uydu, vb.) listeler.Birine tıkladığınızda, ağ türüne bağlı olarak, ağı gözlemek, ayarlarını değiştirmek, bağlanmak/bağlantıyı kesmek için üç ya da dört düğme ortaya çıkar.Bu araç ağ oluşturmak için değildir, bunun için aynı MDM sekmesinde <guilabel>Yeni bir ağ arayüzü kur (LAN, ISDN, ADSL, ...)</guilabel> e bakınız."
-
-#. type: Attribute 'fileref' of:
-#. <section><section><para><inlinemediaobject><imageobject><imagedata>
+"configured on the computer, whatever their type (wired, wireless, satellite, "
+"etc.). When clicking on one of them, three or four buttons appear, depending "
+"on the network type, to allow you to look after the network, change its "
+"settings or connect/disconnect. This tool isn't intended to create a "
+"network, for this see <guilabel>Set up a new network interface (LAN, ISDN, "
+"ADSL, ...)</guilabel> in the same MCC tab."
+msgstr ""
+"Bu araç çalıştırıldığında bir pencere açılır, bilgisayardaki yapılandırılmış "
+"tüm ağları türlerine bağlı olmaksızın (kablolu, kablosuz, uydu, vb.) "
+"listeler.Birine tıkladığınızda, ağ türüne bağlı olarak, ağı gözlemek, "
+"ayarlarını değiştirmek, bağlanmak/bağlantıyı kesmek için üç ya da dört düğme "
+"ortaya çıkar.Bu araç ağ oluşturmak için değildir, bunun için aynı MDM "
+"sekmesinde <guilabel>Yeni bir ağ arayüzü kur (LAN, ISDN, ADSL, ...)</"
+"guilabel> e bakınız."
+
+#. type: Attribute 'fileref' of: <section><section><para><inlinemediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:43
 msgid "draknetcenterEthernet-on.png"
 msgstr "draknetcenterEthernet-on.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><inlinemediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:47
 msgid "draknetcenterEthernet-off.png"
 msgstr "draknetcenterEthernet-off.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><inlinemediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:52
 msgid "draknetcenterWireless-off.png"
 msgstr "draknetcenterWireless-off.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><inlinemediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:56
 msgid "draknetcenterWireless-on.png"
 msgstr "draknetcenterWireless-on.png"
@@ -3120,36 +3645,51 @@ msgstr "draknetcenterWireless-on.png"
 msgid ""
 "In the screenshot below, given as example, we can see two networks, the "
 "first one is wired and connected, recognizable by this icon <placeholder "
-"type=\"inlinemediaobject\" id=\"0\"/> (this one is not connected<placeholder"
-" type=\"inlinemediaobject\" id=\"1\"/> ) and the second section shows "
-"wireless networks, not connected recognizable by this icon <placeholder "
-"type=\"inlinemediaobject\" id=\"2\"/> and this one <placeholder "
-"type=\"inlinemediaobject\" id=\"3\"/>if connected. For the other network "
-"types, the colour code is always the same, green if connected and red if not"
-" connected."
-msgstr "Aşağıda örnek olarak verilen ekran görüntüsünde, iki ağ görüyoruz, ilki kablolu ve bağlı, <placeholder type=\"inlinemediaobject\" id=\"0\"/> simgesinden anlaşılabilir ( bu bağlanmamış <placeholder type=\"inlinemediaobject\" id=\"1\"/>) ve ikinci bölüm kablosuz ağı gösterir, bağlanmamış olduğu <placeholder type=\"inlinemediaobject\" id=\"2\"/> simgesinden anlaşılabilir ve eğer bağlanmışsa bu <placeholder type=\"inlinemediaobject\" id=\"3\"/>. Diğer ağ türleri için, renk kodu daima aynıdır, bağlıysa yeşil, bağlı değilse kırmızı."
+"type=\"inlinemediaobject\" id=\"0\"/> (this one is not connected<placeholder "
+"type=\"inlinemediaobject\" id=\"1\"/> ) and the second section shows "
+"wireless networks, not connected recognizable by this icon <placeholder type="
+"\"inlinemediaobject\" id=\"2\"/> and this one <placeholder type="
+"\"inlinemediaobject\" id=\"3\"/>if connected. For the other network types, "
+"the colour code is always the same, green if connected and red if not "
+"connected."
+msgstr ""
+"Aşağıda örnek olarak verilen ekran görüntüsünde, iki ağ görüyoruz, ilki "
+"kablolu ve bağlı, <placeholder type=\"inlinemediaobject\" id=\"0\"/> "
+"simgesinden anlaşılabilir ( bu bağlanmamış <placeholder type="
+"\"inlinemediaobject\" id=\"1\"/>) ve ikinci bölüm kablosuz ağı gösterir, "
+"bağlanmamış olduğu <placeholder type=\"inlinemediaobject\" id=\"2\"/> "
+"simgesinden anlaşılabilir ve eğer bağlanmışsa bu <placeholder type="
+"\"inlinemediaobject\" id=\"3\"/>. Diğer ağ türleri için, renk kodu daima "
+"aynıdır, bağlıysa yeşil, bağlı değilse kırmızı."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:62
 msgid ""
 "In the wireless part of the screen, you can also see all the detected "
-"networks, with the <guilabel>SSID</guilabel>, the <guilabel>Signal "
-"strengh</guilabel>, if they are encrypted (in red) or not (in green), and "
-"the <guilabel>Operating mode</guilabel>. Click on the chosen one and then "
-"either on <guibutton>Monitor</guibutton>, <guibutton>Configure</guibutton> "
-"or <guibutton>Connect</guibutton>. It is possible here to go from a network "
-"to another one. If a private network is selected, the Network Settings "
-"window (see below) will open and ask you for extra settings ( an encryption "
-"key in particular)."
-msgstr "Ekranın kablosuz tarafında, tüm algılanan aygıtları, <guilabel>SSID</guilabel>, <guilabel>Sinyal gücü</guilabel>, şifrelenmişlerse (kırmızı) veya değilse (yeşil), ve <guilabel>İşlem modu</guilabel> ile görebileceksiniz. Seçilmiş olana tıklayın ve sonra ya <guibutton>Ekran</guibutton>, ya <guibutton>Yapılandır</guibutton> veya <guibutton>Bağlan</guibutton>a tıklayın. Burada bir ağdan diğerine gitmek mümkündür. Eğer özel bir ağ seçilmişse, Ağ Ayarları penceresi (aşağıya bakınız) açılacak ve ek ayarları soracaktır ( özellikle bir şifreleme anahtarı)."
+"networks, with the <guilabel>SSID</guilabel>, the <guilabel>Signal strengh</"
+"guilabel>, if they are encrypted (in red) or not (in green), and the "
+"<guilabel>Operating mode</guilabel>. Click on the chosen one and then either "
+"on <guibutton>Monitor</guibutton>, <guibutton>Configure</guibutton> or "
+"<guibutton>Connect</guibutton>. It is possible here to go from a network to "
+"another one. If a private network is selected, the Network Settings window "
+"(see below) will open and ask you for extra settings ( an encryption key in "
+"particular)."
+msgstr ""
+"Ekranın kablosuz tarafında, tüm algılanan aygıtları, <guilabel>SSID</"
+"guilabel>, <guilabel>Sinyal gücü</guilabel>, şifrelenmişlerse (kırmızı) veya "
+"değilse (yeşil), ve <guilabel>İşlem modu</guilabel> ile görebileceksiniz. "
+"Seçilmiş olana tıklayın ve sonra ya <guibutton>Ekran</guibutton>, ya "
+"<guibutton>Yapılandır</guibutton> veya <guibutton>Bağlan</guibutton>a "
+"tıklayın. Burada bir ağdan diğerine gitmek mümkündür. Eğer özel bir ağ "
+"seçilmişse, Ağ Ayarları penceresi (aşağıya bakınız) açılacak ve ek ayarları "
+"soracaktır ( özellikle bir şifreleme anahtarı)."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:72
 msgid "Click on <guibutton>Refresh</guibutton> to update the screen."
 msgstr "Ekranı yenilemek için <guibutton>Yenileye</guibutton> tıklayınız."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:76
 msgid "draknetcenter1.png"
 msgstr "draknetcenter1.png"
@@ -3159,8 +3699,7 @@ msgstr "draknetcenter1.png"
 msgid "The Monitor button"
 msgstr "The Monitor button"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:88
 msgid "draknetcenter4.png"
 msgstr "draknetcenter4.png"
@@ -3170,9 +3709,13 @@ msgstr "draknetcenter4.png"
 msgid ""
 "This button allows you to watch the network activity, downloads (toward the "
 "PC, in red) and uploads (toward the Internet, in green). The same screen is "
-"available by right clicking on the <guimenu>Internet icon in the system tray"
-" -> Monitor Network</guimenu>."
-msgstr "Bu düğme ağ etkinliğini, indirmeleri (PC'ye gelen, kırmızı ile) ve yüklemeleri (İnternet'e doğru, yeşille) izlemenizi sağlar. Aynı ekrana <guimenu>Görev çubuğu İnternet simgesi -> Ağı Görüntüle</guimenu> ile de erişilebilir. "
+"available by right clicking on the <guimenu>Internet icon in the system tray "
+"-> Monitor Network</guimenu>."
+msgstr ""
+"Bu düğme ağ etkinliğini, indirmeleri (PC'ye gelen, kırmızı ile) ve "
+"yüklemeleri (İnternet'e doğru, yeşille) izlemenizi sağlar. Aynı ekrana "
+"<guimenu>Görev çubuğu İnternet simgesi -> Ağı Görüntüle</guimenu> ile de "
+"erişilebilir. "
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:97
@@ -3180,14 +3723,19 @@ msgid ""
 "There is a tab for each network (here eth0 is the wired network, lo the "
 "local loopback and wlan0 the wireless network) and a tab connection which "
 "gives details about connection status."
-msgstr "Her bir ağ (burada eth0 kablolu ağ, lo yerel loopback ve wlan0 kablosuz ağdır) için bir sekme ve bağlantı durumunun detaylarını veren bir sekme bulunur. "
+msgstr ""
+"Her bir ağ (burada eth0 kablolu ağ, lo yerel loopback ve wlan0 kablosuz "
+"ağdır) için bir sekme ve bağlantı durumunun detaylarını veren bir sekme "
+"bulunur. "
 
 #. type: Content of: <section><section><note><para>
 #: en/draknetcenter.xml:102
 msgid ""
-"At the bottom of the window is a title <guilabel>Traffic "
-"accounting</guilabel>, we will look at that in the next section."
-msgstr "Pencerenin altında <guilabel>Trafik muhasebesi</guilabel> başlığı var, buna bir sonraki bölümde bakacağız."
+"At the bottom of the window is a title <guilabel>Traffic accounting</"
+"guilabel>, we will look at that in the next section."
+msgstr ""
+"Pencerenin altında <guilabel>Trafik muhasebesi</guilabel> başlığı var, buna "
+"bir sonraki bölümde bakacağız."
 
 #. type: Content of: <section><section><title>
 #: en/draknetcenter.xml:108
@@ -3199,8 +3747,7 @@ msgstr "Yapılandırma düğmesi"
 msgid "<emphasis role=\"bold\">A - For a wired network</emphasis>"
 msgstr "<emphasis role=\"bold\">A - Kablolu bir bağlantı için</emphasis>"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:114
 msgid "draknetcenter2.png"
 msgstr "draknetcenter2.png"
@@ -3210,9 +3757,13 @@ msgstr "draknetcenter2.png"
 msgid ""
 "It is possible to change all the settings given during network creation. "
 "Most of the time, checking <guibutton>Automatic IP</guibutton> "
-"<guibutton>(BOOTP/DHCP)</guibutton> will do, but in case of problems, manual"
-" configuration may give better results."
-msgstr "Ağ oluşturma sürecinde verilen tüm ayarları değiştirmek mümkündür. Çoğu zaman, <guibutton>Otomatik IP</guibutton> <guibutton>(BOOTP/DHCP)</guibutton>yi işaretlemek bunu yapar, fakat problem durumunda, elle yapılandırma daha iyi sonuçlar verir."
+"<guibutton>(BOOTP/DHCP)</guibutton> will do, but in case of problems, manual "
+"configuration may give better results."
+msgstr ""
+"Ağ oluşturma sürecinde verilen tüm ayarları değiştirmek mümkündür. Çoğu "
+"zaman, <guibutton>Otomatik IP</guibutton> <guibutton>(BOOTP/DHCP)</"
+"guibutton>yi işaretlemek bunu yapar, fakat problem durumunda, elle "
+"yapılandırma daha iyi sonuçlar verir."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:123
@@ -3221,7 +3772,11 @@ msgid ""
 "like 192.168.0.x, <guilabel>Netmask</guilabel> is 255.255.255.0, and the "
 "<guilabel>Gateway</guilabel> and <guilabel>DNS servers</guilabel> are "
 "available from your providers website."
-msgstr "Bir ev ağı için <guilabel>IP adresi</guilabel> genellikle 92.168.0.x, <guilabel>Ağ maskesi</guilabel> 255.255.255.0, ve <guilabel>Ağ Geçidi</guilabel> gibidir ve  <guilabel>DNS sunucular</guilabel> sağlayıcınızın web sayfasından elde edilir."
+msgstr ""
+"Bir ev ağı için <guilabel>IP adresi</guilabel> genellikle 92.168.0.x, "
+"<guilabel>Ağ maskesi</guilabel> 255.255.255.0, ve <guilabel>Ağ Geçidi</"
+"guilabel> gibidir ve  <guilabel>DNS sunucular</guilabel> sağlayıcınızın web "
+"sayfasından elde edilir."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:128
@@ -3230,22 +3785,27 @@ msgid ""
 "the traffic on a hourly, daily or monthly basis. The results are visible in "
 "the Network monitor detailed in the previous section. Once enabled, you may "
 "have to reconnect to the network."
-msgstr "<guibutton>Trafik muhasebesini etkinleştir</guibutton> işaretlenmiş ise bu trafiği saatlik, günlük ve aylık olarak tutar. Sonuç önceki bölümde anlatılan Ağ ekranında görünür. Etkinleştirildiğinde ağa tekrar bağlanmanız gerekir."
+msgstr ""
+"<guibutton>Trafik muhasebesini etkinleştir</guibutton> işaretlenmiş ise bu "
+"trafiği saatlik, günlük ve aylık olarak tutar. Sonuç önceki bölümde "
+"anlatılan Ağ ekranında görünür. Etkinleştirildiğinde ağa tekrar bağlanmanız "
+"gerekir."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:133
 msgid ""
-"<emphasis role=\"bold\">Allow interface to be controlled by Network "
-"Manager:</emphasis>"
-msgstr "<emphasis role=\"bold\">Arayüzün Ağ Yöneticisi tarafından yönetilmesine izin ver:</emphasis>"
+"<emphasis role=\"bold\">Allow interface to be controlled by Network Manager:"
+"</emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Arayüzün Ağ Yöneticisi tarafından yönetilmesine izin "
+"ver:</emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:140 en/draknetcenter.xml:185
 msgid "<guibutton>The button Advanced:</guibutton>"
 msgstr "<guibutton>Gelişmiş Düğmesi:</guibutton>"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:148
 msgid "draknetcenter5.png"
 msgstr "draknetcenter5.png"
@@ -3260,8 +3820,7 @@ msgstr "<emphasis role=\"bold\">B - Kablosuz bir bağlantı için</emphasis>"
 msgid "Only the items not already seen above are explained."
 msgstr "Sadece henüz yukarıda görünmeyen öğeler açıklanmıştır."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:158
 msgid "draknetcenter3.png"
 msgstr "draknetcenter3.png"
@@ -3279,12 +3838,19 @@ msgid ""
 "Select <guilabel>Ad-hoc</guilabel> if it is a peer to peer network. Select "
 "<emphasis role=\"bold\">Master</emphasis> if your network card is used as "
 "the access point, your network card needs to support this mode."
-msgstr "Eğer bağlantı erişim noktası vasıtası ileyse <guilabel>Yönetilmiş</guilabel>i eçiniz, algılanmış bir <emphasis role=\"bold\">ESSID</emphasis> bulunur. Eğer eşler arası bir ağ ise <guilabel>Ad-hoc</guilabel>u seçiniz. Eğer ağ kartınız erişim noktası olarak kullanılıyorsa <emphasis role=\"bold\">Asıl</emphasis>ı seçiniz, ağ kartınızın bu modu desteklemesi gerekmektedir."
+msgstr ""
+"Eğer bağlantı erişim noktası vasıtası ileyse <guilabel>Yönetilmiş</"
+"guilabel>i eçiniz, algılanmış bir <emphasis role=\"bold\">ESSID</emphasis> "
+"bulunur. Eğer eşler arası bir ağ ise <guilabel>Ad-hoc</guilabel>u seçiniz. "
+"Eğer ağ kartınız erişim noktası olarak kullanılıyorsa <emphasis role=\"bold"
+"\">Asıl</emphasis>ı seçiniz, ağ kartınızın bu modu desteklemesi "
+"gerekmektedir."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:170
 msgid "<emphasis role=\"bold\">Encryption mode and Encryption key:</emphasis>"
-msgstr "<emphasis role=\"bold\">Şifreleme modu ve Şifreleme anahtarı</emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Şifreleme modu ve Şifreleme anahtarı</emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:173
@@ -3294,11 +3860,15 @@ msgstr "Bu özel bir ağ ise, bu ayarları bilmelisiniz."
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:175
 msgid ""
-"<guilabel>WEP</guilabel> uses a password and is weaker than WPA which uses a"
-" passphrase. <guilabel>WPA Pre-Shared Key</guilabel> is also called WPA "
+"<guilabel>WEP</guilabel> uses a password and is weaker than WPA which uses a "
+"passphrase. <guilabel>WPA Pre-Shared Key</guilabel> is also called WPA "
 "personal or WPA home. <guilabel>WPA Enterprise</guilabel> is not often used "
 "in private networks."
-msgstr "<guilabel>WEP</guilabel> parola kullanır ve parola-cümleciği kullanan WPA'dan daha zayıftır. <guilabel>WPA Ön-paylaşımlı anahtar</guilabel> ayrıca kişisel WPA ya da WPA ev olarak adlandırılır. <guilabel>WPA Kurum</guilabel> özel ağlarda genellikle kullanılmaz."
+msgstr ""
+"<guilabel>WEP</guilabel> parola kullanır ve parola-cümleciği kullanan "
+"WPA'dan daha zayıftır. <guilabel>WPA Ön-paylaşımlı anahtar</guilabel> ayrıca "
+"kişisel WPA ya da WPA ev olarak adlandırılır. <guilabel>WPA Kurum</guilabel> "
+"özel ağlarda genellikle kullanılmaz."
 
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:180
@@ -3310,10 +3880,11 @@ msgstr "<emphasis role=\"bold\">Erişim noktası dolaşımına izin ver</emphasi
 msgid ""
 "Roaming is a technology which enables allows computer to change its access "
 "point while remaining connected to the network."
-msgstr "Dolaşım, bilgisayarın İnternet bağlantısı devam ederken erişim noktasını değiştirmesini sağlayan bir teknolojidir."
+msgstr ""
+"Dolaşım, bilgisayarın İnternet bağlantısı devam ederken erişim noktasını "
+"değiştirmesini sağlayan bir teknolojidir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:193
 msgid "draknetcenter6.png"
 msgstr "draknetcenter6.png"
@@ -3323,8 +3894,7 @@ msgstr "draknetcenter6.png"
 msgid "The Advanced Settings button"
 msgstr "Gelişmiş Ayarlar düğmesi"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknetcenter.xml:209
 msgid "draknetcenter7.png"
 msgstr "draknetcenter7.png"
@@ -3339,8 +3909,7 @@ msgstr "Farklı Ağ profillerini yönet."
 msgid "draknetprofile"
 msgstr "draknetprofile"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draknetprofile.xml:8
 msgid "draknetprofile.png"
 msgstr "draknetprofile.png"
@@ -3348,9 +3917,11 @@ msgstr "draknetprofile.png"
 #. type: Content of: <section><para>
 #: en/draknetprofile.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknetprofile</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">draknetprofile</emphasis> komutu ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknetprofile</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold"
+"\">draknetprofile</emphasis> komutu ile başlatabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/draknfs.xml:9
@@ -3362,8 +3933,7 @@ msgstr "Sürücü ve dizinleri NFS kullanarak paylaşın"
 msgid "draknfs"
 msgstr "draknfs"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draknfs.xml:16
 msgid "draknfs.png"
 msgstr "draknfs.png"
@@ -3376,28 +3946,32 @@ msgstr "Ön gereksinimler"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/draknfs.xml:27
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknfs</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">draknfs</emphasis> ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknfs</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">draknfs</"
+"emphasis> ile başlatabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/draknfs.xml:26
 msgid ""
-"When the wizard<placeholder type=\"footnote\" id=\"0\"/> is launched for the"
-" first time, it may display the following message:"
-msgstr "Sihirbaz<placeholder type=\"footnote\" id=\"0\"/> ilk kez çalıştırıldığında şu mesajı gösterir:"
+"When the wizard<placeholder type=\"footnote\" id=\"0\"/> is launched for the "
+"first time, it may display the following message:"
+msgstr ""
+"Sihirbaz<placeholder type=\"footnote\" id=\"0\"/> ilk kez çalıştırıldığında "
+"şu mesajı gösterir:"
 
 #. type: Content of: <section><section><blockquote><para>
 #: en/draknfs.xml:33
-msgid ""
-"The package nfs-utils needs to be installed. Do you want to install it?"
+msgid "The package nfs-utils needs to be installed. Do you want to install it?"
 msgstr "nfs-utils paketinin kurulması gerekiyor. Kurulmasını ister misiniz?"
 
 #. type: Content of: <section><section><para>
 #: en/draknfs.xml:37
 msgid ""
 "After completing the installation, a window with an empty list is displayed."
-msgstr "Kurulum tamamlandıktan sonra boş bir liste içeren bir pencere gösterilir."
+msgstr ""
+"Kurulum tamamlandıktan sonra boş bir liste içeren bir pencere gösterilir."
 
 #. type: Content of: <section><section><title>
 #: en/draknfs.xml:42
@@ -3410,7 +3984,9 @@ msgid ""
 "A list of directories which are shared is displayed. At this step, the list "
 "is empty. The <guibutton>Add</guibutton> button gives access to a "
 "configuration tool."
-msgstr "Paylaşılan dizinler listesi gösterilir. Bu adımda, liste boştur. <guibutton>Ekle</guibutton> düğmesi bir yapılandırma aracına erişim verir."
+msgstr ""
+"Paylaşılan dizinler listesi gösterilir. Bu adımda, liste boştur. "
+"<guibutton>Ekle</guibutton> düğmesi bir yapılandırma aracına erişim verir."
 
 #. type: Content of: <section><section><title>
 #: en/draknfs.xml:50
@@ -3423,10 +3999,12 @@ msgid ""
 "The configuration tool is labeled \"Modify entry\". It may be also launched "
 "with the <guibutton>Modify</guibutton> button. The following parameters are "
 "available."
-msgstr "Yapılandırma aracı \"Girdiyi değiştir\" ile etiketlenmiştir. Bu ayrıca <guibutton>Değiştir</guibutton> düğmesiyle de çalıştırılabilir. Takip eden parametreler kullanılabilir."
+msgstr ""
+"Yapılandırma aracı \"Girdiyi değiştir\" ile etiketlenmiştir. Bu ayrıca "
+"<guibutton>Değiştir</guibutton> düğmesiyle de çalıştırılabilir. Takip eden "
+"parametreler kullanılabilir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknfs.xml:58
 msgid "draknfs4.png"
 msgstr "draknfs4.png"
@@ -3442,7 +4020,9 @@ msgid ""
 "Here you can specify which directory is to be shared. The "
 "<guibutton>Directory</guibutton> button gives access to a browser to choose "
 "it."
-msgstr "Burada hangi dizinin paylaşılacağını belirtebilirsiniz. <guibutton>Dizin</guibutton> düğmesi gözatmanızı ve seçmenizi sağlar."
+msgstr ""
+"Burada hangi dizinin paylaşılacağını belirtebilirsiniz. <guibutton>Dizin</"
+"guibutton> düğmesi gözatmanızı ve seçmenizi sağlar."
 
 #. type: Content of: <section><section><section><title>
 #: en/draknfs.xml:72
@@ -3454,7 +4034,9 @@ msgstr "Konak erişimi"
 msgid ""
 "Here you can specify the hosts that are authorized to access the shared "
 "directory."
-msgstr "Burada paylaşılan dizinlere erişim yetkisine sahip konakları belirtebilirsiniz."
+msgstr ""
+"Burada paylaşılan dizinlere erişim yetkisine sahip konakları "
+"belirtebilirsiniz."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:77
@@ -3466,12 +4048,16 @@ msgstr "NFS istemciler çeşitli şekillerde belirtilebilir:"
 msgid ""
 "<emphasis>single host</emphasis>: a host either by an abbreviated name "
 "recognized be the resolver, fully qualified domain name, or an IP address"
-msgstr "<emphasis>tekil makina</emphasis>: ya çözücü tarafından algılanan bir kısaltılmış isim ya da tam sınıflandırılmış alan adı veya bir IP adresi olan bir makinadır."
+msgstr ""
+"<emphasis>tekil makina</emphasis>: ya çözücü tarafından algılanan bir "
+"kısaltılmış isim ya da tam sınıflandırılmış alan adı veya bir IP adresi olan "
+"bir makinadır."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:83
 msgid "<emphasis>netgroups</emphasis>: NIS netgroups may be given as @group."
-msgstr "<emphasis>netgrupları</emphasis>: NIS netgrupları @group olarak verilebilir."
+msgstr ""
+"<emphasis>netgrupları</emphasis>: NIS netgrupları @group olarak verilebilir."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:86
@@ -3479,7 +4065,10 @@ msgid ""
 "<emphasis>wildcards</emphasis>: machine names may contain the wildcard "
 "characters * and ?. For instance: *.cs.foo.edu matches all hosts in the "
 "domain cs.foo.edu."
-msgstr "<emphasis>joker karakterler</emphasis>: makina ismi * ve ? joker karakterleri içerebilir. Örnek: *.cs.foo.edu cs.foo.edu alanındaki tüm makinalarla eşleşir."
+msgstr ""
+"<emphasis>joker karakterler</emphasis>: makina ismi * ve ? joker "
+"karakterleri içerebilir. Örnek: *.cs.foo.edu cs.foo.edu alanındaki tüm "
+"makinalarla eşleşir."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:90
@@ -3487,7 +4076,10 @@ msgid ""
 "<emphasis>IP networks</emphasis>: you can also export directories to all "
 "hosts on an IP (sub-)network simultaneously. For example, either "
 "`/255.255.252.0' or `/22' appended to the network base address."
-msgstr "<emphasis>IP ağları</emphasis>: ayrıca dizinleri tüm makinalara IP (alt-)ağları üzerinden sırasıyla dışa aktarabilirsiniz. Örneğin, ya `/255.255.252.0' ya da `/22' ağ temel adresine eklenir."
+msgstr ""
+"<emphasis>IP ağları</emphasis>: ayrıca dizinleri tüm makinalara IP "
+"(alt-)ağları üzerinden sırasıyla dışa aktarabilirsiniz. Örneğin, ya "
+"`/255.255.252.0' ya da `/22' ağ temel adresine eklenir."
 
 #. type: Content of: <section><section><section><title>
 #: en/draknfs.xml:96
@@ -3499,32 +4091,46 @@ msgstr "Kullanıcı Kimlik Haritalaması"
 msgid ""
 "<emphasis>map root user as anonymous</emphasis>: maps requests from uid/gid "
 "0 to the anonymous uid/gid (root_squash). The root user from the client "
-"cannot read or write to the files on the server which are created by root on"
-" the server itself."
-msgstr "<emphasis>root kullanıcısını anonim olarak haritala</emphasis>: uid/gid 0'dan gelen istekleri  anonymous uid/gid (root_squash)'e haritalar. istemciden root kullanıcısı sunucudaki root tarafından oluştuulmuş dosyalara yazamaz ve okuyamaz."
+"cannot read or write to the files on the server which are created by root on "
+"the server itself."
+msgstr ""
+"<emphasis>root kullanıcısını anonim olarak haritala</emphasis>: uid/gid "
+"0'dan gelen istekleri  anonymous uid/gid (root_squash)'e haritalar. "
+"istemciden root kullanıcısı sunucudaki root tarafından oluştuulmuş dosyalara "
+"yazamaz ve okuyamaz."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:103
 msgid ""
-"<emphasis>allow real remote root access</emphasis>: turn off root squashing."
-" This option is mainly useful for diskless clients (no_root_squash)."
-msgstr "<emphasis>uzaktan gerçek root erişimine izin ver</emphasis>: kök sıkıştırmayı kaldırır. Bu seçenek temel olarak disksiz istemcilerde (no_root_squash) uygundur."
+"<emphasis>allow real remote root access</emphasis>: turn off root squashing. "
+"This option is mainly useful for diskless clients (no_root_squash)."
+msgstr ""
+"<emphasis>uzaktan gerçek root erişimine izin ver</emphasis>: kök "
+"sıkıştırmayı kaldırır. Bu seçenek temel olarak disksiz istemcilerde "
+"(no_root_squash) uygundur."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:107
 msgid ""
-"<emphasis>map all users to anonymous user</emphasis>: maps all uids and gids"
-" to the anonymous user (all_squash). Useful for NFS-exported public FTP "
-"directories, news spool directories, etc. The opposite option is no user UID"
-" mapping (no_all_squash), which is the default setting."
-msgstr "<emphasis>tüm kullanıcıları anonim olarak haritala</emphasis>: tüm uidleri ve gidleri anonim kullanıcı (all_squash) olarak haritalar. NFS-dışa aktarılmış umumi FTP dizinleri, haber spool dizinleri, vb. için kullanışlıdır. Karşıt seçenek, hiçbir UID haritalama (no_all_squash) varsayılan ayardır."
+"<emphasis>map all users to anonymous user</emphasis>: maps all uids and gids "
+"to the anonymous user (all_squash). Useful for NFS-exported public FTP "
+"directories, news spool directories, etc. The opposite option is no user UID "
+"mapping (no_all_squash), which is the default setting."
+msgstr ""
+"<emphasis>tüm kullanıcıları anonim olarak haritala</emphasis>: tüm uidleri "
+"ve gidleri anonim kullanıcı (all_squash) olarak haritalar. NFS-dışa "
+"aktarılmış umumi FTP dizinleri, haber spool dizinleri, vb. için "
+"kullanışlıdır. Karşıt seçenek, hiçbir UID haritalama (no_all_squash) "
+"varsayılan ayardır."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:113
 msgid ""
 "<emphasis>anonuid and anongid</emphasis>: explicitly set the uid and gid of "
 "the anonymous account."
-msgstr "<emphasis>anonuid ve anongid</emphasis>: anonim hesabın uid ve gid'sini kesin bir şekilde aayrlar."
+msgstr ""
+"<emphasis>anonuid ve anongid</emphasis>: anonim hesabın uid ve gid'sini "
+"kesin bir şekilde aayrlar."
 
 #. type: Content of: <section><section><section><title>
 #: en/draknfs.xml:118
@@ -3535,9 +4141,12 @@ msgstr "Gelişmiş seçenekler"
 #: en/draknfs.xml:120
 msgid ""
 "<emphasis>Secured Connection</emphasis>: this option requires that requests "
-"originate on an internet port less than IPPORT_RESERVED (1024).  This option"
-" is on by default."
-msgstr "<emphasis>Güvenli Bağlantı</emphasis>: bu seçenek IPPORT_RESERVED (1024)'den daha düşük bir internet portu kökenli istekleri gerektirir. Bu seçenek ön tanımlı olarak etkindir."
+"originate on an internet port less than IPPORT_RESERVED (1024).  This option "
+"is on by default."
+msgstr ""
+"<emphasis>Güvenli Bağlantı</emphasis>: bu seçenek IPPORT_RESERVED (1024)'den "
+"daha düşük bir internet portu kökenli istekleri gerektirir. Bu seçenek ön "
+"tanımlı olarak etkindir."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:124
@@ -3546,7 +4155,11 @@ msgid ""
 "and write requests on this NFS volume. The default is to disallow any "
 "request which changes the filesystem. This can also be made explicit by "
 "using this option."
-msgstr "<emphasis>Sadece-okunabilir paylaşım</emphasis>: Bu NFS bölümünde ya sadece okuma veya hem okuma hem de yazma isteklerine izin ver. Ön tanımlı davranış, dosya sisteminde değişiklik yapan istekleri engellemektir. Bu ayrıac bu seçenek kullanılarak kesinleştirilebilir."
+msgstr ""
+"<emphasis>Sadece-okunabilir paylaşım</emphasis>: Bu NFS bölümünde ya sadece "
+"okuma veya hem okuma hem de yazma isteklerine izin ver. Ön tanımlı davranış, "
+"dosya sisteminde değişiklik yapan istekleri engellemektir. Bu ayrıac bu "
+"seçenek kullanılarak kesinleştirilebilir."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:129
@@ -3554,7 +4167,11 @@ msgid ""
 "<emphasis>Synchronous access</emphasis>: prevents the NFS server from "
 "violating the NFS protocol and to reply to requests before any changes made "
 "by these requests have been committed to stable storage (e.g. disc drive)."
-msgstr "<emphasis>Eşzamanlı erişim</emphasis>:  NFS sunucunun NFS protokolü tarafından zarar görmesini, ve istekleri bu istekler tarafından yapılan herhangi bir değişikliğin kalıcı depoya (örn. disk sürücüleri) yapılmasından önce engeller."
+msgstr ""
+"<emphasis>Eşzamanlı erişim</emphasis>:  NFS sunucunun NFS protokolü "
+"tarafından zarar görmesini, ve istekleri bu istekler tarafından yapılan "
+"herhangi bir değişikliğin kalıcı depoya (örn. disk sürücüleri) yapılmasından "
+"önce engeller."
 
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:134
@@ -3562,7 +4179,10 @@ msgid ""
 "<emphasis>Subtree checking</emphasis>: enable subtree checking which can "
 "help improve security in some cases, but can decrease reliability. See "
 "exports(5) man page for more details."
-msgstr "<emphasis>Alt ağaç denetimi</emphasis>: güvenliği arttıran ama işlevselliği azaltan alt ağaç denetlemesini etkinleştir. Ayrıntılı bilgi için exports(5) el kitabına bakın."
+msgstr ""
+"<emphasis>Alt ağaç denetimi</emphasis>: güvenliği arttıran ama işlevselliği "
+"azaltan alt ağaç denetlemesini etkinleştir. Ayrıntılı bilgi için exports(5) "
+"el kitabına bakın."
 
 #. type: Content of: <section><section><title>
 #: en/draknfs.xml:141 en/draksambashare.xml:201
@@ -3574,8 +4194,7 @@ msgstr "Menü girdileri"
 msgid "So far the list has at least one entry."
 msgstr "Şu ana kadar listede en azından bir girdi var"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draknfs.xml:147
 msgid "draknfs5.png"
 msgstr "draknfs5.png"
@@ -3599,7 +4218,8 @@ msgstr "NFS Sunucu|Yeniden başlat"
 #: en/draknfs.xml:161 en/draksambashare.xml:222
 msgid ""
 "The server is stopped and restarted with the current configuration files."
-msgstr "Sunucu aktif yapılandırma dosyaları ile durduruldu ve yeniden başlatıldı."
+msgstr ""
+"Sunucu aktif yapılandırma dosyaları ile durduruldu ve yeniden başlatıldı."
 
 #. type: Content of: <section><section><section><title>
 #: en/draknfs.xml:166
@@ -3609,9 +4229,9 @@ msgstr "NFS Sunucu|Yeniden yükle"
 #. type: Content of: <section><section><formalpara><para>
 #: en/draknfs.xml:168 en/draksambashare.xml:229
 msgid ""
-"The configuration displayed is reloaded from the current configuration "
-"files."
-msgstr "Gösterilen yapılandırma aktif yapılandırma dosyaları ile yeniden yüklendi."
+"The configuration displayed is reloaded from the current configuration files."
+msgstr ""
+"Gösterilen yapılandırma aktif yapılandırma dosyaları ile yeniden yüklendi."
 
 #. type: Content of: <section><info><title>
 #: en/drakproxy.xml:10
@@ -3623,8 +4243,7 @@ msgstr "Vekil"
 msgid "drakproxy"
 msgstr "drakproxy"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakproxy.xml:17
 msgid "drakproxy.png"
 msgstr "drakproxy.png"
@@ -3632,30 +4251,44 @@ msgstr "drakproxy.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakproxy.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakproxy</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakproxy</emphasis> ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakproxy</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">drakproxy</"
+"emphasis> ile başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakproxy.xml:22
 msgid ""
 "If you have to use a proxy server to access to the internet, you can use "
-"this tool<placeholder type=\"footnote\" id=\"0\"/> to configure it. Your net"
-" administrator will give you the information you need. You can also specify "
+"this tool<placeholder type=\"footnote\" id=\"0\"/> to configure it. Your net "
+"administrator will give you the information you need. You can also specify "
 "some services which can be accessed without the proxy by exception."
-msgstr "Internete erişim için vekil sunucu kullanmak zorundaysanız, bunu yapılandırmak için bu aracı <placeholder type=\"footnote\" id=\"0\"/> kullanabilirsiniz. Ağ yöneticiniz ihtiyacınız olan bilgiyi verecektir. Ayrıca istinai olarak vekil olmadan erişebilen servisleri de belirtebilirsiniz."
+msgstr ""
+"Internete erişim için vekil sunucu kullanmak zorundaysanız, bunu "
+"yapılandırmak için bu aracı <placeholder type=\"footnote\" id=\"0\"/> "
+"kullanabilirsiniz. Ağ yöneticiniz ihtiyacınız olan bilgiyi verecektir. "
+"Ayrıca istinai olarak vekil olmadan erişebilen servisleri de "
+"belirtebilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakproxy.xml:30
 msgid ""
-"From Wikipedia, on 2012-09-24, article Proxy server: In computer networks, a"
-" proxy server is a server (a computer system or an application)  that acts "
-"as an intermediary for requests from clients seeking resources from other "
+"From Wikipedia, on 2012-09-24, article Proxy server: In computer networks, a "
+"proxy server is a server (a computer system or an application)  that acts as "
+"an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
 "different server. The proxy server evaluates the request as a way to "
 "simplify and control their complexity."
-msgstr "Wikipedia'dan, 24.09.2012'de Vekil sunucu makalesi: Bilgisayar ağlarında, bir vekil sunucu istemcilerden gelen ve diğer sunuculardan kaynak arayan istekler için aracı olarak davranan bir sunucudur (bir bilgisayar sistemi ya da uygulama). Bir istemci vekil  sunucuya dosya bağlantısı, web sayfası ya da farklı bir sunucudan diğer erişilebilir kaynaklar gibi bazı hizmet istekleriyle bağlanır. Vekil sunucu isteği basitleştirecek ve karmaşıklığını kontrol edecek şekilde değerlendirir. "
+msgstr ""
+"Wikipedia'dan, 24.09.2012'de Vekil sunucu makalesi: Bilgisayar ağlarında, "
+"bir vekil sunucu istemcilerden gelen ve diğer sunuculardan kaynak arayan "
+"istekler için aracı olarak davranan bir sunucudur (bir bilgisayar sistemi ya "
+"da uygulama). Bir istemci vekil  sunucuya dosya bağlantısı, web sayfası ya "
+"da farklı bir sunucudan diğer erişilebilir kaynaklar gibi bazı hizmet "
+"istekleriyle bağlanır. Vekil sunucu isteği basitleştirecek ve karmaşıklığını "
+"kontrol edecek şekilde değerlendirir. "
 
 #. type: Content of: <section><info><title>
 #: en/drakrpm-edit-media.xml:3
@@ -3667,8 +4300,7 @@ msgstr "Ortamı Yapılandır"
 msgid "drakrpm-edit-media"
 msgstr "drakrpm-edit-media"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakrpm-edit-media.xml:16
 msgid "drakrpm-edit-media.png"
 msgstr "drakrpm-edit-media.png"
@@ -3676,11 +4308,15 @@ msgstr "drakrpm-edit-media.png"
 #. type: Content of: <section><para><important><para>
 #: en/drakrpm-edit-media.xml:21
 msgid ""
-"First thing to do after an install is to add software sources (also known as"
-" repositories, media, mirrors). That means you must select the media sources"
-" to be used to install and update packages and applications. (see Add button"
-" below)."
-msgstr "Bir kurulumdan sonra yapılması gereken ilk şey yazılım kaynakları eklemektir (depo, ortam ya da yansı olarak da bilinir). Bu, kurulumda ve paket ve uygulamaların güncellenmesinde kullanılacak yazılım kaynağını seçemeniz gerektiği anlamına gelir. (aşağıdaki Ekle düğmesine bakınız)."
+"First thing to do after an install is to add software sources (also known as "
+"repositories, media, mirrors). That means you must select the media sources "
+"to be used to install and update packages and applications. (see Add button "
+"below)."
+msgstr ""
+"Bir kurulumdan sonra yapılması gereken ilk şey yazılım kaynakları eklemektir "
+"(depo, ortam ya da yansı olarak da bilinir). Bu, kurulumda ve paket ve "
+"uygulamaların güncellenmesinde kullanılacak yazılım kaynağını seçemeniz "
+"gerektiği anlamına gelir. (aşağıdaki Ekle düğmesine bakınız)."
 
 #. type: Content of: <section><para><note><para>
 #: en/drakrpm-edit-media.xml:26
@@ -3690,14 +4326,21 @@ msgid ""
 "your system is 32-bit or 64-bit; these are called noarch packages. They "
 "don't have their own noarch directories on the mirrors, but are all in both "
 "the i586 and the x86_64 media."
-msgstr "Sisteminiz 32-bit (i586 denen) veya 64-bit (x86_64 denen) bir mimari üzerinde çalışıyor olabilir. Bazı paketler, ki bunlar noarch olarak isimlendirilir- sisteminizin 32-bit mi yoksa 64-bit mi olduğundan bağımsızdır. Yansılarda kendi noarch dizinlerine sahip değildirler, fakat hem i586 hem de x86_64 ortamları bulunur."
+msgstr ""
+"Sisteminiz 32-bit (i586 denen) veya 64-bit (x86_64 denen) bir mimari "
+"üzerinde çalışıyor olabilir. Bazı paketler, ki bunlar noarch olarak "
+"isimlendirilir- sisteminizin 32-bit mi yoksa 64-bit mi olduğundan "
+"bağımsızdır. Yansılarda kendi noarch dizinlerine sahip değildirler, fakat "
+"hem i586 hem de x86_64 ortamları bulunur."
 
 #. type: Content of: <section><para><footnote><para>
 #: en/drakrpm-edit-media.xml:35
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakrpm-edit-media</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakrpm-edit-media</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakrpm-edit-media</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakrpm-edit-"
+"media</emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakrpm-edit-media.xml:33
@@ -3705,7 +4348,10 @@ msgid ""
 "This tool is present in the Mageia Control Center under the tab <emphasis "
 "role=\"bold\">Software management.</emphasis><placeholder type=\"footnote\" "
 "id=\"0\"/>"
-msgstr "Bu araç Mageia Denetim Merkezi altında <emphasis role=\"bold\">Yazılım Yönetimi</emphasis><placeholder type=\"footnote\" id=\"0\"/> sekmesinde bulunur."
+msgstr ""
+"Bu araç Mageia Denetim Merkezi altında <emphasis role=\"bold\">Yazılım "
+"Yönetimi</emphasis><placeholder type=\"footnote\" id=\"0\"/> sekmesinde "
+"bulunur."
 
 #. type: Content of: <section><section><title>
 #: en/drakrpm-edit-media.xml:39
@@ -3722,7 +4368,10 @@ msgstr "Sütun Etkinleştir:"
 msgid ""
 "The checked media will be used to install new packages. Be cautious with "
 "some media such as Testing and Debug, they could make your system unusable."
-msgstr "İşaretlenmiş yazılım kaynağı yeni paketlerin kurulmasında kullanılacaktır. Testing ve Debug gibi bazı yazılım kaynaklarında dikkatli olun çünkü sisteminizi kullanılmaz yapabilir."
+msgstr ""
+"İşaretlenmiş yazılım kaynağı yeni paketlerin kurulmasında kullanılacaktır. "
+"Testing ve Debug gibi bazı yazılım kaynaklarında dikkatli olun çünkü "
+"sisteminizi kullanılmaz yapabilir."
 
 #. type: Content of: <section><section><bridgehead>
 #: en/drakrpm-edit-media.xml:47
@@ -3736,7 +4385,12 @@ msgid ""
 "media with \"Update\" in its name should be selected. For security reasons, "
 "this column isn't modifiable in this tool, you must open a console as root "
 "and type <emphasis role=\"bold\">drakrpm-edit-media --expert.</emphasis>"
-msgstr "İşaretlenmiş ortam paketleri güncellemede kullanılır, bu etkinleştirilmelidir. Sadece ismi içinde \"Update\" olan ortamlar seçilmelidir. Güvenlik sebeplerinden, bu sütun bu araç içinden değiştirilebilir değildir, root olarak uç birim açıp <emphasis role=\"bold\">drakrpm-edit-media --expert.</emphasis> yazmalısınız. "
+msgstr ""
+"İşaretlenmiş ortam paketleri güncellemede kullanılır, bu "
+"etkinleştirilmelidir. Sadece ismi içinde \"Update\" olan ortamlar "
+"seçilmelidir. Güvenlik sebeplerinden, bu sütun bu araç içinden "
+"değiştirilebilir değildir, root olarak uç birim açıp <emphasis role=\"bold"
+"\">drakrpm-edit-media --expert.</emphasis> yazmalısınız. "
 
 #. type: Content of: <section><section><bridgehead>
 #: en/drakrpm-edit-media.xml:55
@@ -3748,28 +4402,36 @@ msgstr "Ortam sütunu:"
 msgid ""
 "Display the medium name. Mageia official repositories for final release "
 "versions contain at least:"
-msgstr "Ortam ismini göster. Mageia son yayımı sürümlerinin  resmi depoları en azından şunları içerir:"
+msgstr ""
+"Ortam ismini göster. Mageia son yayımı sürümlerinin  resmi depoları en "
+"azından şunları içerir:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:62
 msgid ""
 "<emphasis role=\"bold\">Core</emphasis> which contains most programs "
 "available supported by Mageia."
-msgstr "<emphasis role=\"bold\">Core</emphasis> Mageia tarafından sağlanan çoğu programı içerir."
+msgstr ""
+"<emphasis role=\"bold\">Core</emphasis> Mageia tarafından sağlanan çoğu "
+"programı içerir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:67
 msgid ""
 "<emphasis role=\"bold\">Nonfree</emphasis> which contains some programs "
 "which are not free"
-msgstr "<emphasis role=\"bold\">Nonfree</emphasis> bazı özgür olmayan programları içerir"
+msgstr ""
+"<emphasis role=\"bold\">Nonfree</emphasis> bazı özgür olmayan programları "
+"içerir"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:72
 msgid ""
 "<emphasis role=\"bold\">Tainted</emphasis> free software for which there "
 "might be patent claims in some countries."
-msgstr "<emphasis role=\"bold\">Tainted</emphasis> bazı ülkelerde patent hakları olabilecek özgür yazılımlar"
+msgstr ""
+"<emphasis role=\"bold\">Tainted</emphasis> bazı ülkelerde patent hakları "
+"olabilecek özgür yazılımlar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:75
@@ -3781,7 +4443,9 @@ msgstr "Her ortam 4 alt-dizine sahiptir:"
 msgid ""
 "<emphasis role=\"bold\">Release</emphasis> the packages as of the day the "
 "this version of Mageia was released."
-msgstr "<emphasis role=\"bold\">Yayım</emphasis> Mageia'nın bu sürümü yayımlandığı tarihteki paketlerdir."
+msgstr ""
+"<emphasis role=\"bold\">Yayım</emphasis> Mageia'nın bu sürümü yayımlandığı "
+"tarihteki paketlerdir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:84
@@ -3789,22 +4453,30 @@ msgid ""
 "<emphasis role=\"bold\">Updates</emphasis> the packages updated since "
 "release due to security or bug concerns. Everyone should have this medium "
 "enabled, even with a very slow internet connection."
-msgstr "<emphasis role=\"bold\">Güncellemeler</emphasis> yayımdan beri güvenlik ve hata ile ilgili güncellemelerdir. Herkes bu yazılım kaynağını çok yavaş bir İnternet bağlantısı olsa bile etkinleştirmelidir."
+msgstr ""
+"<emphasis role=\"bold\">Güncellemeler</emphasis> yayımdan beri güvenlik ve "
+"hata ile ilgili güncellemelerdir. Herkes bu yazılım kaynağını çok yavaş bir "
+"İnternet bağlantısı olsa bile etkinleştirmelidir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:90
 msgid ""
 "<emphasis role=\"bold\">Backports</emphasis> some packages of new versions "
 "backported from Cauldron (the next version under development)."
-msgstr "<emphasis role=\"bold\">Backports</emphasis> yeni sürümün bazı paketleri Cauldron'dan alınmıştır (yeni sürümü geliştirme aşamasındadır)."
+msgstr ""
+"<emphasis role=\"bold\">Backports</emphasis> yeni sürümün bazı paketleri "
+"Cauldron'dan alınmıştır (yeni sürümü geliştirme aşamasındadır)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakrpm-edit-media.xml:96
 msgid ""
-"<emphasis role=\"bold\">Testing</emphasis> which is used for temporary tests"
-" of new updates, to allow the bug reporters and the QA team to validate the "
+"<emphasis role=\"bold\">Testing</emphasis> which is used for temporary tests "
+"of new updates, to allow the bug reporters and the QA team to validate the "
 "corrections."
-msgstr "<emphasis role=\"bold\">Testing</emphasis> yeni güncellemelerin hata raporlamasını ve QA takımının düzeltmeleri onaylamasını sağlayan geçici testler için kullanılır."
+msgstr ""
+"<emphasis role=\"bold\">Testing</emphasis> yeni güncellemelerin hata "
+"raporlamasını ve QA takımının düzeltmeleri onaylamasını sağlayan geçici "
+"testler için kullanılır."
 
 #. type: Content of: <section><section><title>
 #: en/drakrpm-edit-media.xml:104
@@ -3822,7 +4494,10 @@ msgid ""
 "To remove a medium, click on it and then on this button. It is wise to "
 "remove the medium used for the installation (CD or DVD for example)  since "
 "all the packages it contains are in the official Core release medium."
-msgstr "Ortamı çıkarmak için üzerine ve sonra bu düğmeye tıklayın. Kurulum için kullanılan ortamı (örneğin CD veya DVD) çıkarmayı, içerdiği tüm paketlerin resmi Core yayım ortamında bulunduğu için bilir."
+msgstr ""
+"Ortamı çıkarmak için üzerine ve sonra bu düğmeye tıklayın. Kurulum için "
+"kullanılan ortamı (örneğin CD veya DVD) çıkarmayı, içerdiği tüm paketlerin "
+"resmi Core yayım ortamında bulunduğu için bilir."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:114
@@ -3834,7 +4509,8 @@ msgstr "<guibutton>Düzenle:</guibutton>"
 msgid ""
 "Allows you to modify the selected medium settings, (URL, downloader and "
 "proxy)."
-msgstr "Seçilen ortam ayarlarını değiştirmenizi sağlar (URL, indirici ve vekil)."
+msgstr ""
+"Seçilen ortam ayarlarını değiştirmenizi sağlar (URL, indirici ve vekil)."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:119
@@ -3847,10 +4523,16 @@ msgid ""
 "Add the official repositories available on the Internet. These repositories "
 "contain only safe and well tested software. Clicking on the \"Add\" button "
 "adds the mirrorlist to your configuration, it is designed to make sure that "
-"you install and update from a mirror close to you. If you prefer to choose a"
-" specific mirror, then add it by choosing \"Add a specific media mirror\" "
+"you install and update from a mirror close to you. If you prefer to choose a "
+"specific mirror, then add it by choosing \"Add a specific media mirror\" "
 "from the drop-down \"File\" menu."
-msgstr "İnternet üzerindeki resmi depoları ekleyin. Bu depolar sadece güvenli ve iyice test edilmiş yazılımları içerir. \"Ekle\" düğmesine tıklayarak yapılandırmanıza yansı listesi eklersiniz, bu size yakın bir yansıdan kurulum ve güncelleme yaptığınızdan emin olmak için tasarlanmıştır. Belirli bir yansıyı seçmek isterseniz, \"Dosya\" açılır menüsünden \"Belirli bir ortam yansısı ekle\"yi seçerek eklersiniz."
+msgstr ""
+"İnternet üzerindeki resmi depoları ekleyin. Bu depolar sadece güvenli ve "
+"iyice test edilmiş yazılımları içerir. \"Ekle\" düğmesine tıklayarak "
+"yapılandırmanıza yansı listesi eklersiniz, bu size yakın bir yansıdan "
+"kurulum ve güncelleme yaptığınızdan emin olmak için tasarlanmıştır. Belirli "
+"bir yansıyı seçmek isterseniz, \"Dosya\" açılır menüsünden \"Belirli bir "
+"ortam yansısı ekle\"yi seçerek eklersiniz."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:128
@@ -3861,10 +4543,14 @@ msgstr "<guibutton>Yukarı ve aşağı oklar:</guibutton>"
 #: en/drakrpm-edit-media.xml:130
 msgid ""
 "Change the list order. When Drakrpm looks for a package, it reads the list "
-"in the displayed order and will install the first package found for the same"
-" release number - in the event of a version mismatch, the latest release "
-"will be installed. So if possible, put the fastest repositories at the top."
-msgstr "Liste sırasını değiştir. Drakrpm bir paket aradığında, listeyi gösterilen sırada okur ve aynı sürüm numarası ile bulduğu ilk paketi kurar -sürüm eşleşmemesinde son yayım kurulur. Bu yüzden eğer mümkünse, en hızlı depoyu en üste koyun."
+"in the displayed order and will install the first package found for the same "
+"release number - in the event of a version mismatch, the latest release will "
+"be installed. So if possible, put the fastest repositories at the top."
+msgstr ""
+"Liste sırasını değiştir. Drakrpm bir paket aradığında, listeyi gösterilen "
+"sırada okur ve aynı sürüm numarası ile bulduğu ilk paketi kurar -sürüm "
+"eşleşmemesinde son yayım kurulur. Bu yüzden eğer mümkünse, en hızlı depoyu "
+"en üste koyun."
 
 #. type: Content of: <section><section><title>
 #: en/drakrpm-edit-media.xml:138 en/harddrake2.xml:64
@@ -3879,9 +4565,11 @@ msgstr "<guimenu>Dosya -> Güncelle:</guimenu>"
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:142
 msgid ""
-"A window pops up with the media list. Select the ones you want to update and"
-" click on the <guibutton>Update</guibutton> button."
-msgstr "Ortam listesi penceresi ortaya çıkar. Güncellemek istediklerinize tıklayın ve <guibutton>Güncelle</guibutton> düğmesine tıklayın."
+"A window pops up with the media list. Select the ones you want to update and "
+"click on the <guibutton>Update</guibutton> button."
+msgstr ""
+"Ortam listesi penceresi ortaya çıkar. Güncellemek istediklerinize tıklayın "
+"ve <guibutton>Güncelle</guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:145
@@ -3892,16 +4580,23 @@ msgstr "<guimenu>Dosya -> Belirli bir ortam yansısı ekle:</guimenu>"
 #: en/drakrpm-edit-media.xml:147
 msgid ""
 "Suppose you aren't happy with the actual mirror, because for example it's "
-"too slow or often unavailable, you can choose another mirror. Select all the"
-" actual media and click on <guibutton>Remove</guibutton> to take them out. "
+"too slow or often unavailable, you can choose another mirror. Select all the "
+"actual media and click on <guibutton>Remove</guibutton> to take them out. "
 "Click on <guimenu>File -> Add a specific media mirror</guimenu>, choose "
 "between update only or the full set (if you do not know, choose the "
 "<guibutton>Full set of sources</guibutton>) and accept the contact by "
 "clicking on <guibutton>Yes</guibutton>. This window opens:"
-msgstr "Farzedelim şu anki yansıdan memnun deeğilsiniz, çünkü örneğin çok yavaş ya da çoğu zaman erişilebilir değil, başka bir yansı seçebilirsiniz. Aktif tüm ortamları seçiniz ve devre dışı bırakmak için <guibutton>Kaldır</guibutton> düğmesine tıklayın, <guimenu>Dosya-> Belirli bir ortam yansısı ekle</guimenu>ye tıklayın, sadece güncelleyi veya tam seti (bilmiyorsanız <guibutton>Kaynakları tam kümesi</guibutton>ni seçiniz) seçiniz ve  <guibutton>Evet</guibutton> düğmesine tıklayarak iletişimi kabul edin. Bu pencere açılır:"
-
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+msgstr ""
+"Farzedelim şu anki yansıdan memnun deeğilsiniz, çünkü örneğin çok yavaş ya "
+"da çoğu zaman erişilebilir değil, başka bir yansı seçebilirsiniz. Aktif tüm "
+"ortamları seçiniz ve devre dışı bırakmak için <guibutton>Kaldır</guibutton> "
+"düğmesine tıklayın, <guimenu>Dosya-> Belirli bir ortam yansısı ekle</"
+"guimenu>ye tıklayın, sadece güncelleyi veya tam seti (bilmiyorsanız "
+"<guibutton>Kaynakları tam kümesi</guibutton>ni seçiniz) seçiniz ve  "
+"<guibutton>Evet</guibutton> düğmesine tıklayarak iletişimi kabul edin. Bu "
+"pencere açılır:"
+
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/drakrpm-edit-media.xml:158
 msgid "drakrpmEditMedia2.png"
 msgstr "drakrpmEditMedia2.png"
@@ -3912,7 +4607,10 @@ msgid ""
 "You can see, on the left, a list of countries, choose yours or one very "
 "close by clicking on the > symbol, this will display all the available "
 "mirrors in that country. Select one and click on <guibutton>OK</guibutton>."
-msgstr "Sol tarafta ülkeler listesini görebilirsiniz, kendinizinkini veya > düğmesine tıklayarak bu ülkedeki en yakını yansıyı seçin. Birini seçin ve <guibutton>TAMAM</guibutton> düğmesine tıklayın."
+msgstr ""
+"Sol tarafta ülkeler listesini görebilirsiniz, kendinizinkini veya > "
+"düğmesine tıklayarak bu ülkedeki en yakını yansıyı seçin. Birini seçin ve "
+"<guibutton>TAMAM</guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:167
@@ -3924,10 +4622,11 @@ msgstr "<guimenu>Dosya -> Özel bir ortam ekle:</guimenu>"
 msgid ""
 "It is possible to install a new media (from a third party for example) that "
 "isn't supported by Mageia. A new window appears:"
-msgstr "Mageia tarafından desteklenmeyen yeni bir ortam kurmak mümkündür (örneğin üçüncü parti). Yeni bir pencere çıkar:"
+msgstr ""
+"Mageia tarafından desteklenmeyen yeni bir ortam kurmak mümkündür (örneğin "
+"üçüncü parti). Yeni bir pencere çıkar:"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
 #: en/drakrpm-edit-media.xml:174
 msgid "rpmdrakeEditMedia1.png"
 msgstr "rpmdrakeEditMedia1.png"
@@ -3938,7 +4637,10 @@ msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>Select the medium type, find a "
 "smart name that well define the medium and give the URL (or the path, "
 "according to the medium type)"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Ortam türünü seçin, ortamı iyi bir şekilde tanımlayan akıllıca bir isim bulun ve URL (veya ortam türüne göre yol) girin"
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Ortam türünü seçin, ortamı iyi "
+"bir şekilde tanımlayan akıllıca bir isim bulun ve URL (veya ortam türüne "
+"göre yol) girin"
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:180
@@ -3948,11 +4650,15 @@ msgstr "<guimenu>Seçenekler -> Global seçenekler:</guimenu>"
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:182
 msgid ""
-"This item allows you to choose when to \"Verify RPMs to be installed\" "
-"(always or never), the download program (curl, wget or aria2) and to define "
-"the download policy for information about the packages (on demand -by "
+"This item allows you to choose when to \"Verify RPMs to be installed"
+"\" (always or never), the download program (curl, wget or aria2) and to "
+"define the download policy for information about the packages (on demand -by "
 "default-, update only, always or never)."
-msgstr "Bu öğe \"Kurulacak RPMleri doğrulayın\" (daima veya asla) zamanını, indirme programını (curl, wget veya aria2) ve paketler hakkındaki bilgiler için indirme politikasını (instendiğinde -varsayılan-; sadece güncelle veya asla) seçmenizi sağlar."
+msgstr ""
+"Bu öğe \"Kurulacak RPMleri doğrulayın\" (daima veya asla) zamanını, indirme "
+"programını (curl, wget veya aria2) ve paketler hakkındaki bilgiler için "
+"indirme politikasını (instendiğinde -varsayılan-; sadece güncelle veya asla) "
+"seçmenizi sağlar."
 
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:187
@@ -3962,12 +4668,17 @@ msgstr "<guimenu>Seçenekler -> Anahtarları yönet:</guimenu>"
 #. type: Content of: <section><section><para>
 #: en/drakrpm-edit-media.xml:189
 msgid ""
-"To guarantee a high level of security, digital keys are used to authenticate"
-" the media. It is possible for each medium to allow or disallow a key. In "
-"the window that appear, select a medium and then click on "
-"<guibutton>Add</guibutton> to allow a new key or to select a key and click "
-"on <guibutton>Remove</guibutton> to disallow that key."
-msgstr "Yüksek seviye güvenliği garanti etmek için, sayısal anahtarlar ortam kimlik denetimi için kullanılır. Her bir ortam için anahtarı kabul etmek veya reddetmek mümkündür. Çıkan pencerede, bir ortam seçin ve yeni bir anahtarı kabul etmek için <guibutton>Ekle</guibutton> düğmesine veya anahtarı reddetmek için <guibutton>Kaldır</guibutton> düğmesine tıklayın. "
+"To guarantee a high level of security, digital keys are used to authenticate "
+"the media. It is possible for each medium to allow or disallow a key. In the "
+"window that appear, select a medium and then click on <guibutton>Add</"
+"guibutton> to allow a new key or to select a key and click on "
+"<guibutton>Remove</guibutton> to disallow that key."
+msgstr ""
+"Yüksek seviye güvenliği garanti etmek için, sayısal anahtarlar ortam kimlik "
+"denetimi için kullanılır. Her bir ortam için anahtarı kabul etmek veya "
+"reddetmek mümkündür. Çıkan pencerede, bir ortam seçin ve yeni bir anahtarı "
+"kabul etmek için <guibutton>Ekle</guibutton> düğmesine veya anahtarı "
+"reddetmek için <guibutton>Kaldır</guibutton> düğmesine tıklayın. "
 
 #. type: Content of: <section><section><para><warning><para>
 #: en/drakrpm-edit-media.xml:196
@@ -3983,10 +4694,13 @@ msgstr "<guimenu>Seçenekler -> Vekil:</guimenu>"
 #: en/drakrpm-edit-media.xml:199
 msgid ""
 "If you need to use a proxy server for internet access, you can configure it "
-"here. You only need to give the <guibutton>Proxy hostname</guibutton> and if"
-" necessary a <guilabel>Username</guilabel> and "
-"<guilabel>Password</guilabel>."
-msgstr "İnternet erişimi için vekil sunucu kullanmanız gerekiyorsa, bunu burada yapılandırabilirsiniz. Gerekli olan sadece <guibutton>Vekil sunucuadı</guibutton>nı ve gerekliyse <guilabel>Kullanıcı adı</guilabel> ve <guilabel>Parolayı</guilabel> girmenizdir."
+"here. You only need to give the <guibutton>Proxy hostname</guibutton> and if "
+"necessary a <guilabel>Username</guilabel> and <guilabel>Password</guilabel>."
+msgstr ""
+"İnternet erişimi için vekil sunucu kullanmanız gerekiyorsa, bunu burada "
+"yapılandırabilirsiniz. Gerekli olan sadece <guibutton>Vekil sunucuadı</"
+"guibutton>nı ve gerekliyse <guilabel>Kullanıcı adı</guilabel> ve "
+"<guilabel>Parolayı</guilabel> girmenizdir."
 
 #. type: Content of: <section><info><title>
 #: en/draksambashare.xml:10
@@ -3998,8 +4712,7 @@ msgstr "Sürücü ve dizinleri Samba ile paylaşın"
 msgid "draksambashare"
 msgstr "draksambashare"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:18
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
@@ -4012,7 +4725,12 @@ msgid ""
 "the machine as a Samba server using the protocol SMB/CIFS. This protocol is "
 "also used by Windows(R) and workstations with this OS can access the "
 "resources of the Samba server."
-msgstr "Samba farklı işletim sistemlerinde dizinler veya yazıcılar gibi bazı kaynakları paylaşmak için kullanılan bir protokoldür. Bu araç makinayı SMB/CIFS protokolü kullanarak Samba sunucu olarak yapılandırmanızı sağlar. Bu protokol ayrıca Windows(R) ve işistasyonları tarafından, bu işletim sisteminin Samba sunucudaki kaynaklara erişebilmesi için kullanılır. "
+msgstr ""
+"Samba farklı işletim sistemlerinde dizinler veya yazıcılar gibi bazı "
+"kaynakları paylaşmak için kullanılan bir protokoldür. Bu araç makinayı SMB/"
+"CIFS protokolü kullanarak Samba sunucu olarak yapılandırmanızı sağlar. Bu "
+"protokol ayrıca Windows(R) ve işistasyonları tarafından, bu işletim "
+"sisteminin Samba sunucudaki kaynaklara erişebilmesi için kullanılır. "
 
 #. type: Content of: <section><section><title>
 #: en/draksambashare.xml:37
@@ -4028,7 +4746,12 @@ msgid ""
 "identifies the station with its MAC-address and give it always the same "
 "address. The firewall has also to allow the incoming requests to the Samba "
 "server."
-msgstr "Diğer iş istasyonlarından erişilebilmesi için, sunucunun sabit IP adresi olmalıdır. Bu doğrudan sunucu üzerinde yapılabilir, örneğin <xref linkend=\"draknetcenter-ti1\"/> ile, veya DHCP sunucuda istasyonu MAC-adresi ile belirterek ve daima aynı adresi vererek yapılabilir. Güvenlik duvarı da ayrıca Samba sunucuya gelen isteklere izin vermelidir."
+msgstr ""
+"Diğer iş istasyonlarından erişilebilmesi için, sunucunun sabit IP adresi "
+"olmalıdır. Bu doğrudan sunucu üzerinde yapılabilir, örneğin <xref linkend="
+"\"draknetcenter-ti1\"/> ile, veya DHCP sunucuda istasyonu MAC-adresi ile "
+"belirterek ve daima aynı adresi vererek yapılabilir. Güvenlik duvarı da "
+"ayrıca Samba sunucuya gelen isteklere izin vermelidir."
 
 #. type: Content of: <section><section><title>
 #: en/draksambashare.xml:50
@@ -4038,20 +4761,24 @@ msgstr "Sihirbaz - Tekbaşına sunucu"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/draksambashare.xml:53
 msgid ""
-"You can start this tool from the command line, by typing<emphasis "
-"role=\"bold\"> draksambashare</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\"> draksambashare</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing<emphasis role=\"bold"
+"\"> draksambashare</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\"> "
+"draksambashare</emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:52
 msgid ""
-"At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks"
-" if needed packages are installed and proposes to install them if they are "
+"At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
+"if needed packages are installed and proposes to install them if they are "
 "not yet present. Then the wizard to configure the Samba server is launched."
-msgstr "İlk çalıştırmada, araçlar <placeholder type=\"footnote\" id=\"0\"/> gerekli paketlerin kurulu olup olmadığını denetler ve yoklarsa onları kurmayı önerir. Sonra Samba sunucuyu yapılandıran sihirbaz başlatılır. "
+msgstr ""
+"İlk çalıştırmada, araçlar <placeholder type=\"footnote\" id=\"0\"/> gerekli "
+"paketlerin kurulu olup olmadığını denetler ve yoklarsa onları kurmayı "
+"önerir. Sonra Samba sunucuyu yapılandıran sihirbaz başlatılır. "
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:61
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
@@ -4063,8 +4790,7 @@ msgid ""
 "selected."
 msgstr "Bir sonraki pencerede Tekbaşına sunucu yapılandırması zaten seçili."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:71
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
@@ -4072,9 +4798,11 @@ msgstr "draksambashare1.png"
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:77
 msgid ""
-"Then specify the name of the workgroup. This name should be the same for the"
-" access to the shared resources."
-msgstr "Sonra çalışmagrubunun ismini belirtin. Bu isim paylaşılan kaynaklara erişim için olanla aynı olmalı."
+"Then specify the name of the workgroup. This name should be the same for the "
+"access to the shared resources."
+msgstr ""
+"Sonra çalışmagrubunun ismini belirtin. Bu isim paylaşılan kaynaklara erişim "
+"için olanla aynı olmalı."
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:80
@@ -4083,8 +4811,7 @@ msgid ""
 "the network."
 msgstr "netbios ismi ağdaki sunucuyu tasarlamada kullanılan bir isimdir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:85
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
@@ -4099,24 +4826,29 @@ msgstr "Güvenlik modunu seçiniz:"
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
-msgstr "<guilabel>kullanıcı</guilabel>: istemci kaynağa erişim için yetkilendirilmiş olamlı"
+msgstr ""
+"<guilabel>kullanıcı</guilabel>: istemci kaynağa erişim için yetkilendirilmiş "
+"olamlı"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/draksambashare.xml:100
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
-msgstr "<guilabel>paylaş</guilabel>: istemci kendini her bir paylaşım için ayrı ayrı yetkilendirir"
+msgstr ""
+"<guilabel>paylaş</guilabel>: istemci kendini her bir paylaşım için ayrı ayrı "
+"yetkilendirir"
 
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:105
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
-msgstr "Burada, hangi konakların kaynaklara erişim izni olduğunu, IP adresi veya konak ismi ile belirtebilirsiniz."
+msgstr ""
+"Burada, hangi konakların kaynaklara erişim izni olduğunu, IP adresi veya "
+"konak ismi ile belirtebilirsiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:110
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
@@ -4126,10 +4858,11 @@ msgstr "draksambashare3.png"
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
-msgstr "Sunucu afişini belirtin. Afiş bu sunucunun Windows iş istasyonlarında tanımlanacağı biçimdir."
+msgstr ""
+"Sunucu afişini belirtin. Afiş bu sunucunun Windows iş istasyonlarında "
+"tanımlanacağı biçimdir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:120
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
@@ -4138,10 +4871,10 @@ msgstr "draksambashare4.png"
 #: en/draksambashare.xml:126
 msgid ""
 "The place where Samba can log information can be specified at the next step."
-msgstr "Samba'nın bilgileri kaydedeceği yer bir sonraki bölümde belirtilebilir."
+msgstr ""
+"Samba'nın bilgileri kaydedeceği yer bir sonraki bölümde belirtilebilir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:131
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
@@ -4150,12 +4883,14 @@ msgstr "draksambashare5.png"
 #: en/draksambashare.xml:137
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
-"configuration. When accepted, the configuration will be written in "
-"<code>/etc/samba/smb.conf</code>."
-msgstr "Sihirbaz, yapılandırmayı kabul etmenizden önce seçilen parametlerin bir listesini gösterir. Kabul edildiğinde yapılandırma <code>/etc/samba/smb.conf</code> dosyasına yazılır."
+"configuration. When accepted, the configuration will be written in <code>/"
+"etc/samba/smb.conf</code>."
+msgstr ""
+"Sihirbaz, yapılandırmayı kabul etmenizden önce seçilen parametlerin bir "
+"listesini gösterir. Kabul edildiğinde yapılandırma <code>/etc/samba/smb."
+"conf</code> dosyasına yazılır."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:143
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
@@ -4165,8 +4900,7 @@ msgstr "draksambashare6.png"
 msgid "Wizard - Primary domain controller"
 msgstr "Sihirbaz - birincil alan denetleyicisi"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:155
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
@@ -4179,7 +4913,12 @@ msgid ""
 "to support or not and to provide admin users names. The following steps are "
 "then the same as for standalone server, except you can choose also the "
 "security mode:"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Eğer \"Birincil alan denetcisi\" seçeneği seçilmişse, sihirbaz, Wins'in desteklenip desteklenmeyeceğini ve yönetici isimlerinin sağlanıp sağlanmayacağını sorar. Takip eden adımlar, tek başına sunucu için olanla -ayrıca güvenlik modunu seçebilmeniz dışında- aynıdır:"
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Eğer \"Birincil alan denetcisi\" "
+"seçeneği seçilmişse, sihirbaz, Wins'in desteklenip desteklenmeyeceğini ve "
+"yönetici isimlerinin sağlanıp sağlanmayacağını sorar. Takip eden adımlar, "
+"tek başına sunucu için olanla -ayrıca güvenlik modunu seçebilmeniz dışında- "
+"aynıdır:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/draksambashare.xml:164
@@ -4187,7 +4926,10 @@ msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
 "account repository is shared between (security)  controllers."
-msgstr "<guilabel>domain</guilabel>: tüm kullanıcı ve grup hesaplarının merkezi ve paylaşılan bir hesap deposunda depolanmasını sağlayan bir mekanizma sunar. Merkezi hesap deposu, alan (güvenlik) denetleyiceleri arasında paylaştırılır."
+msgstr ""
+"<guilabel>domain</guilabel>: tüm kullanıcı ve grup hesaplarının merkezi ve "
+"paylaşılan bir hesap deposunda depolanmasını sağlayan bir mekanizma sunar. "
+"Merkezi hesap deposu, alan (güvenlik) denetleyiceleri arasında paylaştırılır."
 
 #. type: Content of: <section><section><title>
 #: en/draksambashare.xml:173
@@ -4199,8 +4941,7 @@ msgstr "Paylaşılacak dizini belirtin"
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "<guibutton>Ekle</guibutton> düğmesiyle şu gelir:"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:179
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
@@ -4208,14 +4949,16 @@ msgstr "draksambashare15.png"
 #. type: Content of: <section><section><para>
 #: en/draksambashare.xml:184
 msgid ""
-"A new entry is thus added. It can be modified with the "
-"<guibutton>Modify</guibutton> button. Options can be edited, such as whether"
-" the directory is visible to the public, writable or browseable.  The share "
-"name can not be modified."
-msgstr "Yeni bir girdi böylece eklendi. Bu <guibutton>Değiştir</guibutton> düğmesiyle değiştirilebilir. Dizinin görünebilir, yazılabilir, görüntülenebilir olup olmayacağı gibi seçenekler düzenlenebilir."
+"A new entry is thus added. It can be modified with the <guibutton>Modify</"
+"guibutton> button. Options can be edited, such as whether the directory is "
+"visible to the public, writable or browseable.  The share name can not be "
+"modified."
+msgstr ""
+"Yeni bir girdi böylece eklendi. Bu <guibutton>Değiştir</guibutton> "
+"düğmesiyle değiştirilebilir. Dizinin görünebilir, yazılabilir, "
+"görüntülenebilir olup olmayacağı gibi seçenekler düzenlenebilir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:191
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
@@ -4228,7 +4971,8 @@ msgstr "Liste en azından bir girdi içerdiğinde, menü girdileri kullanılabil
 #. type: Content of: <section><section><formalpara><para>
 #: en/draksambashare.xml:209
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
-msgstr "Aktif yapılandırmayı <code>/etc/samba/smb.conf</code> dosyasına kaydet."
+msgstr ""
+"Aktif yapılandırmayı <code>/etc/samba/smb.conf</code> dosyasına kaydet."
 
 #. type: Content of: <section><section><formalpara><title>
 #: en/draksambashare.xml:214
@@ -4260,17 +5004,16 @@ msgstr "Yazıcıların paylaşımı"
 msgid "Samba also allows you to share printers."
 msgstr "Samba ayrıca yazıcıları paylaştırmanızı sağlar."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:241
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
@@ -4279,8 +5022,7 @@ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgid "Samba users"
 msgstr "Samba Kullanıcıları"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
 #: en/draksambashare.xml:253
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
@@ -4291,7 +5033,11 @@ msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
 "linkend=\"userdrake-ti1\"/><placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "Bu sekmede, kimlik denetimi gerektiğinde paylaşılan kaynaklara erişmeye izin verilen kullanıcılar eklenebilir. <xref linkend=\"userdrake-ti1\"/><placeholder type=\"mediaobject\" id=\"0\"/>'dan kullanıcıları ekleyebilirsiniz. "
+msgstr ""
+"Bu sekmede, kimlik denetimi gerektiğinde paylaşılan kaynaklara erişmeye izin "
+"verilen kullanıcılar eklenebilir. <xref linkend=\"userdrake-ti1\"/"
+"><placeholder type=\"mediaobject\" id=\"0\"/>'dan kullanıcıları "
+"ekleyebilirsiniz. "
 
 #. type: Content of: <section><info><title>
 #: en/draksec.xml:3
@@ -4303,8 +5049,7 @@ msgstr "Mageia araçları için kimlik denetimini yapılandırın"
 msgid "draksec"
 msgstr "draksec"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draksec.xml:11
 msgid "draksec.png"
 msgstr "draksec.png"
@@ -4312,23 +5057,29 @@ msgstr "draksec.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/draksec.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksec</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">draksec</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksec</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">draksec</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/draksec.xml:15
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
 "Control Center under the tab <emphasis role=\"bold\">Security</emphasis>"
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde <emphasis role=\"bold\">Güvenlik</emphasis> sekmesinde bulunur."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
+"<emphasis role=\"bold\">Güvenlik</emphasis> sekmesinde bulunur."
 
 #. type: Content of: <section><para>
 #: en/draksec.xml:20
 msgid ""
 "It allows to give the regular users the needed rights to accomplish tasks "
 "usually done by the administrator."
-msgstr "Bu sıradan kullanıcılara genellikle yönetici tarafından yapılan görevleri yapabilme için gerekli hakları verir."
+msgstr ""
+"Bu sıradan kullanıcılara genellikle yönetici tarafından yapılan görevleri "
+"yapabilme için gerekli hakları verir."
 
 #. type: Content of: <section><para>
 #: en/draksec.xml:23
@@ -4336,7 +5087,10 @@ msgid ""
 "Most of the tools available in the Mageia Control Center are displayed in "
 "the left side of the window (see the screenshot above) and for each tool, a "
 "drop down list gives the choice between:"
-msgstr "Mageia Denetim Merkezindeki çoğu araç pencerenin solunda gösterilir (aşağıdaki ekran görüntüsüne bakın) ve her bir araç için bir açılır liste şöyle seçenekler verir:"
+msgstr ""
+"Mageia Denetim Merkezindeki çoğu araç pencerenin solunda gösterilir "
+"(aşağıdaki ekran görüntüsüne bakın) ve her bir araç için bir açılır liste "
+"şöyle seçenekler verir:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/draksec.xml:29
@@ -4346,7 +5100,8 @@ msgstr "Parola yok: Araç parola sormadan çalıştırılır."
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/draksec.xml:34
 msgid "User password: The user password is asked before the tool launching."
-msgstr "Kullanıcı parolası: Araça çalıştırılmadan önce kullanıcı parolası sorulur."
+msgstr ""
+"Kullanıcı parolası: Araça çalıştırılmadan önce kullanıcı parolası sorulur."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/draksec.xml:39
@@ -4358,7 +5113,9 @@ msgstr "Root parolası: araç çalıştırılmadan önce root parolası sorulur"
 msgid ""
 "The default values depend of the chosen security level. See in the same MCC "
 "tab, the tool \"Configure system security, permissions and audit\"."
-msgstr "Varsayılan değerler seçilen güvenlik seviyesine bağlıdır. Aynı MCC sekmesinde bakınız \"Sistem güvenliğini yapılandır, izinler ve denetim\"."
+msgstr ""
+"Varsayılan değerler seçilen güvenlik seviyesine bağlıdır. Aynı MCC "
+"sekmesinde bakınız \"Sistem güvenliğini yapılandır, izinler ve denetim\"."
 
 #. type: Content of: <section><info><title>
 #: en/draksnapshot-config.xml:11
@@ -4370,8 +5127,7 @@ msgstr "Anlık Durum Yedekleri"
 msgid "draksnapshot-config"
 msgstr "draksnapshot-config"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draksnapshot-config.xml:18
 msgid "draksnapshot-config.png"
 msgstr "draksnapshot-config.png"
@@ -4379,17 +5135,22 @@ msgstr "draksnapshot-config.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/draksnapshot-config.xml:22
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksnapshot-config </emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">draksnapshot-config </emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksnapshot-config </emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">draksnapshot-"
+"config </emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is available in MCC's "
-"<guilabel>System</guilabel> tab, in the <guilabel>Administration "
-"tools</guilabel> section."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde  <guilabel>Sistem</guilabel> sekmesinde <guilabel>Yönetimsel araçlar</guilabel> bölümünde bulunur."
+"<guilabel>System</guilabel> tab, in the <guilabel>Administration tools</"
+"guilabel> section."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde  "
+"<guilabel>Sistem</guilabel> sekmesinde <guilabel>Yönetimsel araçlar</"
+"guilabel> bölümünde bulunur."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:26
@@ -4397,44 +5158,64 @@ msgid ""
 "When you start this tool in MCC for the first time, you will see a message "
 "about installing draksnapshot. Click on <guibutton>Install</guibutton> to "
 "proceed. Draksnapshot and some other packages it needs will be installed."
-msgstr "Bu aracı MDM'de ilk kez başlattığınızda, draksnapshot kurulumu hakkında bir mesaj göreceksiniz. Devam etmek için <guibutton>Kur</guibutton> düğmesine tıklayın. Draksnapshot ve ihtiyaç duyduğu bazı diğer paketler kurulacaktır. "
+msgstr ""
+"Bu aracı MDM'de ilk kez başlattığınızda, draksnapshot kurulumu hakkında bir "
+"mesaj göreceksiniz. Devam etmek için <guibutton>Kur</guibutton> düğmesine "
+"tıklayın. Draksnapshot ve ihtiyaç duyduğu bazı diğer paketler kurulacaktır. "
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:31
 msgid ""
 "Click again on <guilabel>Snapshots</guilabel>, you will see the "
-"<guilabel>Settings</guilabel> screen. Tick <guilabel>Enable "
-"Backups</guilabel> and, if you want to backup the whole system, "
-"<guilabel>Backup the whole system</guilabel>."
-msgstr "Yeniden <guilabel>Anlıkyedekler</guilabel>a tıklayın, <guilabel>Ayarlar</guilabel> ekranını göreceksiniz. <guilabel>Yedekleri Etkinleştir</guilabel>i  ve, tüm sistemin yedeğini almak isterseniz <guilabel>Tüm sistemi yedekle</guilabel> işaretleyin."
+"<guilabel>Settings</guilabel> screen. Tick <guilabel>Enable Backups</"
+"guilabel> and, if you want to backup the whole system, <guilabel>Backup the "
+"whole system</guilabel>."
+msgstr ""
+"Yeniden <guilabel>Anlıkyedekler</guilabel>a tıklayın, <guilabel>Ayarlar</"
+"guilabel> ekranını göreceksiniz. <guilabel>Yedekleri Etkinleştir</"
+"guilabel>i  ve, tüm sistemin yedeğini almak isterseniz <guilabel>Tüm sistemi "
+"yedekle</guilabel> işaretleyin."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:34
 msgid ""
 "If you only want to backup part of your directories, then choose "
 "<guilabel>Advanced</guilabel>. You will see a little pop-up screen. Use the "
-"<guibutton>Add</guibutton> and <guibutton>Remove</guibutton> buttons next to"
-" the <guilabel>Backup list</guilabel> to include or exclude directories and "
-"files from the backup. Use the same buttons next to the "
-"<guilabel>Exclude</guilabel> list to remove subdirectories and/or files from"
-" the chosen directories, that should <emphasis role=\"bold\">not</emphasis> "
-"be included in the backup. Click on <guibutton>Close</guibutton> when you "
-"are done."
-msgstr "Dizinlerin sadece bazı bölümlerini yedekleyecekseniz <guilabel>Gelişmiş</guilabel>i seçiniz. Küçük bir açılır pencere göreceksiniz. Dizinleri yedeklemeye eklemek veya yedeklemeden çıkartmak için <guilabel>Yedekleme listesi</guilabel> yanındaki <guibutton>Ekle</guibutton> ve <guibutton>Çıkar</guibutton> düğmelerini kullanınız. Seçilen dizinler içinde yedeklemeye <emphasis role=\"bold\">eklenmemesi</emphasis> gereken altdizinleri ve/veya dosyaları kaldırmak için <guilabel>Hariç</guilabel> listesinin yanındaki aynı düğmeleri kullanınız. Bitirdiğinizde <guibutton>Çıkış</guibutton> düğmesine tıklayınız."
+"<guibutton>Add</guibutton> and <guibutton>Remove</guibutton> buttons next to "
+"the <guilabel>Backup list</guilabel> to include or exclude directories and "
+"files from the backup. Use the same buttons next to the <guilabel>Exclude</"
+"guilabel> list to remove subdirectories and/or files from the chosen "
+"directories, that should <emphasis role=\"bold\">not</emphasis> be included "
+"in the backup. Click on <guibutton>Close</guibutton> when you are done."
+msgstr ""
+"Dizinlerin sadece bazı bölümlerini yedekleyecekseniz <guilabel>Gelişmiş</"
+"guilabel>i seçiniz. Küçük bir açılır pencere göreceksiniz. Dizinleri "
+"yedeklemeye eklemek veya yedeklemeden çıkartmak için <guilabel>Yedekleme "
+"listesi</guilabel> yanındaki <guibutton>Ekle</guibutton> ve "
+"<guibutton>Çıkar</guibutton> düğmelerini kullanınız. Seçilen dizinler içinde "
+"yedeklemeye <emphasis role=\"bold\">eklenmemesi</emphasis> gereken "
+"altdizinleri ve/veya dosyaları kaldırmak için <guilabel>Hariç</guilabel> "
+"listesinin yanındaki aynı düğmeleri kullanınız. Bitirdiğinizde "
+"<guibutton>Çıkış</guibutton> düğmesine tıklayınız."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:41
 msgid ""
 "Now give the path to <guilabel>Where to backup</guilabel>, or choose the "
-"<guibutton>Browse</guibutton> button to select the correct path. Any mounted"
-" USB-key or external HD can be found in <emphasis "
-"role=\"bold\">/run/media/your_user_name/</emphasis>."
-msgstr "Şimdi <guilabel>Yedekleme yeri</guilabel> için yolu girin, veya <guibutton>Gözat</guibutton> düğmesiyle doğru yolu seçin.  Herhangi bağlı USB-anahtarı veya harici HD <emphasis role=\"bold\">/run/media/kullanıcı_adınız/</emphasis> içinde bulunabilir."
+"<guibutton>Browse</guibutton> button to select the correct path. Any mounted "
+"USB-key or external HD can be found in <emphasis role=\"bold\">/run/media/"
+"your_user_name/</emphasis>."
+msgstr ""
+"Şimdi <guilabel>Yedekleme yeri</guilabel> için yolu girin, veya "
+"<guibutton>Gözat</guibutton> düğmesiyle doğru yolu seçin.  Herhangi bağlı "
+"USB-anahtarı veya harici HD <emphasis role=\"bold\">/run/media/"
+"kullanıcı_adınız/</emphasis> içinde bulunabilir."
 
 #. type: Content of: <section><para>
 #: en/draksnapshot-config.xml:45
 msgid "Click on <guibutton>Apply</guibutton> to make the snapshot."
-msgstr " Anlık yedekleme için <guibutton>Uygula</guibutton> düğmesine tıklayın."
+msgstr ""
+" Anlık yedekleme için <guibutton>Uygula</guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><info><title>
 #: en/draksound.xml:3
@@ -4446,8 +5227,7 @@ msgstr "Ses Yapılandırması"
 msgid "draksound"
 msgstr "draksound"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draksound.xml:10
 msgid "draksound.png"
 msgstr "draksound.png"
@@ -4455,16 +5235,20 @@ msgstr "draksound.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/draksound.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksound</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak <emphasis role=\"bold\">draksound</emphasis> ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksound</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak <emphasis role=\"bold\">draksound</"
+"emphasis> ile başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
 "Control Center under the tab <emphasis role=\"bold\">Hardware</emphasis>.¶"
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde <emphasis role=\"bold\">Donanım</emphasis> sekmesinde bulunur.¶"
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
+"<emphasis role=\"bold\">Donanım</emphasis> sekmesinde bulunur.¶"
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:19
@@ -4472,15 +5256,19 @@ msgid ""
 "Draksound deals with the sound configuration, including the driver choice, "
 "PulseAudio options and trouble shooting. It will help you if you experience "
 "sound problems or if you change the sound card."
-msgstr "Draksound ses yapılandırmasını, sürücü seçimi, PulseAudio seçenekleri ve hata giderme de dahil olmak üzere, halleder.Ses problemi yaşadığınızda veya ses kartını değiştirdiğinizde size yardım eder."
+msgstr ""
+"Draksound ses yapılandırmasını, sürücü seçimi, PulseAudio seçenekleri ve "
+"hata giderme de dahil olmak üzere, halleder.Ses problemi yaşadığınızda veya "
+"ses kartını değiştirdiğinizde size yardım eder."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:23
 msgid ""
-"The drop down list called <guilabel>Driver</guilabel> allows you to select a"
-" driver from all the ones available on the computer that match the sound "
-"card."
-msgstr "Açılır liste <guilabel>Sürücü</guilabel> bilgisatarınızda ses kartınızla eşleşen tüm sürücüler arasında seçim yapmanızı sağlar."
+"The drop down list called <guilabel>Driver</guilabel> allows you to select a "
+"driver from all the ones available on the computer that match the sound card."
+msgstr ""
+"Açılır liste <guilabel>Sürücü</guilabel> bilgisatarınızda ses kartınızla "
+"eşleşen tüm sürücüler arasında seçim yapmanızı sağlar."
 
 #. type: Content of: <section><note><para>
 #: en/draksound.xml:28
@@ -4488,40 +5276,52 @@ msgid ""
 "Most of the time, it is possible to choose a driver using the OSS or ALSA "
 "API. OSS is the oldest and very basic, we recommend to choose ALSA when "
 "possible for its enhanced features."
-msgstr "Çoğu zaman, OSS veya ALSA API kullanan bir sürücü seçmek mümkündür. OSS en eskisidir ve çok basittir, gelişmiş özelliklerinden dolayı mümkün olduğunda ALSA'yı seçmenizi öneriyoruz."
+msgstr ""
+"Çoğu zaman, OSS veya ALSA API kullanan bir sürücü seçmek mümkündür. OSS en "
+"eskisidir ve çok basittir, gelişmiş özelliklerinden dolayı mümkün olduğunda "
+"ALSA'yı seçmenizi öneriyoruz."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:33
 msgid ""
-"<guilabel>PulseAudio</guilabel> is a sound server. It receives all the sound"
-" inputs, mixes them according to the user preferences and sends the "
-"resulting sound to the output. See <guimenu>Menu ->Sound and video -> "
-"PulseAudio volume control</guimenu> to set these preferences."
-msgstr "<guilabel>PulseAudio</guilabel> bir ses sunucudur. Tüm ses girişlerini karşılar, onları kullanıcı tercihlerine bağlı olarak karıştırır ve sonuçta oluşan sesi çıktıya gönderir. Bu özellikleri ayarlamak için <guimenu>Menü ->Ses ve Video -> PulseAudio ses denetimi</guimenu> ne bakınız."
+"<guilabel>PulseAudio</guilabel> is a sound server. It receives all the sound "
+"inputs, mixes them according to the user preferences and sends the resulting "
+"sound to the output. See <guimenu>Menu ->Sound and video -> PulseAudio "
+"volume control</guimenu> to set these preferences."
+msgstr ""
+"<guilabel>PulseAudio</guilabel> bir ses sunucudur. Tüm ses girişlerini "
+"karşılar, onları kullanıcı tercihlerine bağlı olarak karıştırır ve sonuçta "
+"oluşan sesi çıktıya gönderir. Bu özellikleri ayarlamak için <guimenu>Menü -"
+">Ses ve Video -> PulseAudio ses denetimi</guimenu> ne bakınız."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:38
 msgid ""
 "PulseAudio is the default sound server and it is recommended to leave it "
 "enabled."
-msgstr "PulseAudio varsayılan ses sunucusudur ve bunu etkinleştirilmiş olarak bırakmanız önerilir."
+msgstr ""
+"PulseAudio varsayılan ses sunucusudur ve bunu etkinleştirilmiş olarak "
+"bırakmanız önerilir."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:41
 msgid ""
 "<guilabel>Glitch-Free</guilabel> improves PulseAudio with some programs. It "
 "is also recommended to leave it enabled."
-msgstr "<guilabel>Glitch-Free</guilabel> PulseAudio'yu bazı programlarla zenginleştirir. Bunu da etkinleştirilmiş olarak bırakmanız önerilir."
+msgstr ""
+"<guilabel>Glitch-Free</guilabel> PulseAudio'yu bazı programlarla "
+"zenginleştirir. Bunu da etkinleştirilmiş olarak bırakmanız önerilir."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:44
 msgid ""
 "The button <guibutton>Advanced</guibutton> display a new window with three "
 "buttons:"
-msgstr "<guibutton>Gelişmiş</guibutton> düğmesi üç düğme olan yeni bir pencere görüntüler:"
+msgstr ""
+"<guibutton>Gelişmiş</guibutton> düğmesi üç düğme olan yeni bir pencere "
+"görüntüler:"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/draksound.xml:49
 msgid "Draksound1.png"
 msgstr "Draksound1.png"
@@ -4531,7 +5331,8 @@ msgstr "Draksound1.png"
 msgid ""
 "The first button gives total freedom of choice. You have to know what you "
 "are doing."
-msgstr "İlk düğme tamamen seçim özgürlüğü verir. Ne yaptığınızı biliyor olmalısınız."
+msgstr ""
+"İlk düğme tamamen seçim özgürlüğü verir. Ne yaptığınızı biliyor olmalısınız."
 
 #. type: Content of: <section><para>
 #: en/draksound.xml:56
@@ -4539,7 +5340,9 @@ msgid ""
 "The second one is obvious and the last one gives assistance with fixing any "
 "problems you may have. You will find it helpful to try this before asking "
 "the community for help."
-msgstr "İkincisi açıktır ve sonuncusu karşılaşabileceğiniz problemleri çözmede yardım sağlar. Topluluğa sormadan önce bunu denemeyi faydalı bulacaksınız."
+msgstr ""
+"İkincisi açıktır ve sonuncusu karşılaşabileceğiniz problemleri çözmede "
+"yardım sağlar. Topluluğa sormadan önce bunu denemeyi faydalı bulacaksınız."
 
 #. type: Content of: <section><info><title>
 #: en/drakups.xml:3
@@ -4551,8 +5354,7 @@ msgstr "Güç görüntüleme için bir UPS ayarlayın"
 msgid "drakups"
 msgstr "drakups"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakups.xml:8
 msgid "drakups.png"
 msgstr "drakups.png"
@@ -4560,9 +5362,11 @@ msgstr "drakups.png"
 #. type: Content of: <section><para>
 #: en/drakups.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakups</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakups</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakups</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakups</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/drakvpn.xml:3
@@ -4574,8 +5378,7 @@ msgstr "Ağ erişimi güvenliği için VPN Bağlantısı yapılandır"
 msgid "drakvpn"
 msgstr "drakvpn"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakvpn.xml:11
 msgid "drakvpn1.png"
 msgstr "drakvpn1.png"
@@ -4583,9 +5386,11 @@ msgstr "drakvpn1.png"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakvpn.xml:19
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakvpn</emphasis> as root."
-msgstr "Bu aracı komut satırından root olarak<emphasis role=\"bold\">drakfont</emphasis> ile başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakvpn</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırından root olarak<emphasis role=\"bold\">drakfont</"
+"emphasis> ile başlatabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/drakvpn.xml:18
@@ -4596,7 +5401,13 @@ msgid ""
 "configuration on the workstation side. We assume that the remote network is "
 "already in operation, and that you have the connection information from the "
 "network administrator, like a .pcf configuration file ."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> uzak bir ağa yerel iş istasyonu ve uzak ağ arasında tünel oluşturarak güvenli erişimi yapılandırmanızı sağlar. Burada sadece iş istasyonu tarafındaki yapılandırmadan bahsedeceğiz. Uzak ağın halihazırda çalışmakta olduğunu  ve ağ yöneticisinden .pcf yapılandırma dosyası gibi bilgilere ulaştıınızı varsayıyoruz."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> uzak bir ağa yerel iş "
+"istasyonu ve uzak ağ arasında tünel oluşturarak güvenli erişimi "
+"yapılandırmanızı sağlar. Burada sadece iş istasyonu tarafındaki "
+"yapılandırmadan bahsedeceğiz. Uzak ağın halihazırda çalışmakta olduğunu  ve "
+"ağ yöneticisinden .pcf yapılandırma dosyası gibi bilgilere ulaştıınızı "
+"varsayıyoruz."
 
 #. type: Content of: <section><section><title>
 #: en/drakvpn.xml:30
@@ -4608,7 +5419,9 @@ msgstr "Yapılandırma"
 msgid ""
 "First, select either Cisco VPN Concentrator or OpenVPN, depending on which "
 "protocol is used for your virtual private network."
-msgstr "Önce sanal özel ağınız için hangi protokolün kullanıldığına bağlı olarak Cisco VPN Concentrator'u veya OpenVPN'i seçiniz."
+msgstr ""
+"Önce sanal özel ağınız için hangi protokolün kullanıldığına bağlı olarak "
+"Cisco VPN Concentrator'u veya OpenVPN'i seçiniz."
 
 #. type: Content of: <section><section><para>
 #: en/drakvpn.xml:35
@@ -4625,8 +5438,7 @@ msgstr "Sonraki ekranda, VPN bağlantınızın detaylarını sağlayınız."
 msgid "For Cisco VPN"
 msgstr "Cisco VPN için"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
 #: en/drakvpn.xml:48
 msgid "drakvpn3.png"
 msgstr "drakvpn3.png"
@@ -4636,10 +5448,11 @@ msgstr "drakvpn3.png"
 msgid ""
 "For openvpn. The openvpn package and its dependencies will be installed the "
 "first time the tool is used."
-msgstr "openvpn için. openvpn ve bağımlı olduğu paketler araç ilk kez kullanıldığında kurulacaktır."
+msgstr ""
+"openvpn için. openvpn ve bağımlı olduğu paketler araç ilk kez "
+"kullanıldığında kurulacaktır."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><itemizedlist><listitem><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><itemizedlist><listitem><para><mediaobject><imageobject><imagedata>
 #: en/drakvpn.xml:59
 msgid "drakvpn7.png"
 msgstr "drakvpn7.png"
@@ -4649,15 +5462,16 @@ msgstr "drakvpn7.png"
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>Select the files that you "
 "received from the network administrator."
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Ağ yöneticinizden aldığınız dosyaları seçin."
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Ağ yöneticinizden aldığınız "
+"dosyaları seçin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakvpn.xml:64
 msgid "Advanced parameters:"
 msgstr "Gelişmiş parametreler:"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
 #: en/drakvpn.xml:68
 msgid "drakvpn8.png"
 msgstr "drakvpn8.png"
@@ -4672,15 +5486,20 @@ msgstr "Sonraki ekran ağ geçidinin IP-adresini sorar."
 msgid ""
 "When the parameters are set, you have the option of starting the VPN "
 "connection."
-msgstr "Parametreler ayarlandığında VPN bağlantısını başlatma imkanına sahip olursunuz."
+msgstr ""
+"Parametreler ayarlandığında VPN bağlantısını başlatma imkanına sahip "
+"olursunuz."
 
 #. type: Content of: <section><section><para>
 #: en/drakvpn.xml:79
 msgid ""
 "This VPN connection can be set to start automatically with a network "
-"connection. To do this, reconfigure the network connection to always connect"
-" to this VPN."
-msgstr "Bu VPN bağlantısı ağ bağlantısı ile otomatik olarak başlayacak şekilde ayarlanabilir. Bunu yapmak için, ağ bağlantısını daima bu VPN'e bağlanmak için yeniden yapılandırın."
+"connection. To do this, reconfigure the network connection to always connect "
+"to this VPN."
+msgstr ""
+"Bu VPN bağlantısı ağ bağlantısı ile otomatik olarak başlayacak şekilde "
+"ayarlanabilir. Bunu yapmak için, ağ bağlantısını daima bu VPN'e bağlanmak "
+"için yeniden yapılandırın."
 
 #. type: Content of: <section><info><title>
 #: en/drakwizard_apache2.xml:3
@@ -4692,8 +5511,7 @@ msgstr "Web sunucu yapılandır"
 msgid "drakwizard apache2"
 msgstr "drakwizard apache2"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakwizard_apache2.xml:8
 msgid "drakwizard_apache2.png"
 msgstr "drakwizard_apache2.png"
@@ -4701,16 +5519,20 @@ msgstr "drakwizard_apache2.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakwizard_apache2.xml:12
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard apache2</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard apache2</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard apache2</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard "
+"apache2</emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakwizard_apache2.xml:12
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
 "web server."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> bir web sunucusu kurmanız için yardımcı olabilir."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> bir web sunucusu kurmanız "
+"için yardımcı olabilir."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_apache2.xml:15
@@ -4722,7 +5544,9 @@ msgstr "Bir web sunucusu nedir?"
 msgid ""
 "Web server is the software that helps to deliver web content that can be "
 "accessed through the Internet. (From Wikipedia)"
-msgstr "Web sunucusu, İnternet üzerinden erişilebilen web içeriğini ulaştımaya yardımcı olan bir yazılımdır. (Wikipedia)"
+msgstr ""
+"Web sunucusu, İnternet üzerinden erişilebilen web içeriğini ulaştımaya "
+"yardımcı olan bir yazılımdır. (Wikipedia)"
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_apache2.xml:21
@@ -4734,26 +5558,25 @@ msgstr "Bir web sunucusunu drakwizard apache2 ile kurmak"
 msgid "Welcome to the web server wizard."
 msgstr "Web sunucusu sihirbazına hoş geldiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_apache2.xml:30
 msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-web-step1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
-msgstr "İlk sayfa sadece bir sunumdur, <guibutton>İleri</guibutton>' yi tıklayın."
+msgstr ""
+"İlk sayfa sadece bir sunumdur, <guibutton>İleri</guibutton>' yi tıklayın."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:38 en/drakwizard_proftpd.xml:38
 msgid "Selecting Server Exposer: Local Net and/or World"
 msgstr "Sunucu Açılımcısı seçiliyor: Yerel Ağ ve/veya Dünya"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_apache2.xml:41
 msgid "drakwizard-web-step2.png"
 msgstr "drakwizard-web-step2.png"
@@ -4763,15 +5586,16 @@ msgstr "drakwizard-web-step2.png"
 msgid ""
 "Exposing the web server to the Internet has it's risks. Be ready for bad "
 "things."
-msgstr "Web sunucusunu İnternete açmanın tehlikeleri vardır.  Kötü şeyler için şimdiden hazır olun."
+msgstr ""
+"Web sunucusunu İnternete açmanın tehlikeleri vardır.  Kötü şeyler için "
+"şimdiden hazır olun."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:49
 msgid "Server User Module"
 msgstr "Sunucu Kullanıcı Modülü"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_apache2.xml:52
 msgid "drakwizard-web-step3.png"
 msgstr "drakwizard-web-step3.png"
@@ -4786,8 +5610,7 @@ msgstr "Kullanıcıların kendi sitelerini oluşturmalarına izin verir."
 msgid "User web directory name"
 msgstr "Kullanıcı web dizini adı"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_apache2.xml:63
 msgid "drakwizard-web-step4.png"
 msgstr "drakwizard-web-step4.png"
@@ -4797,15 +5620,16 @@ msgstr "drakwizard-web-step4.png"
 msgid ""
 "The user needs to create and populate this directory, then the server will "
 "display it."
-msgstr "Kullanıcı bu dizini oluşturmalı ve içini doldurmalıdır, daha sonra sunucu bunu gösterecektir."
+msgstr ""
+"Kullanıcı bu dizini oluşturmalı ve içini doldurmalıdır, daha sonra sunucu "
+"bunu gösterecektir."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:71
 msgid "Server Document Root"
 msgstr "Sunucu Belge Kökü"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_apache2.xml:74
 msgid "drakwizard-web-step5.png"
 msgstr "drakwizard-web-step5.png"
@@ -4813,45 +5637,45 @@ msgstr "drakwizard-web-step5.png"
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:78
 msgid "Allows you to configure the path to the web servers default documents."
-msgstr "Web sunucusunun öntanımlı belgelerinin konumunu ayarlamanıza olanak sağlar."
+msgstr ""
+"Web sunucusunun öntanımlı belgelerinin konumunu ayarlamanıza olanak sağlar."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr "Özet"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_apache2.xml:85
 msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-web-step6.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
-"Take a second to check these options, then click "
-"<guibutton>Next</guibutton>."
-msgstr "Bu seçenekleri denetlemek için bir saniyenizi ayırın ve <guibutton>İleri</guibutton> düğmesine basın."
+"Take a second to check these options, then click <guibutton>Next</guibutton>."
+msgstr ""
+"Bu seçenekleri denetlemek için bir saniyenizi ayırın ve <guibutton>İleri</"
+"guibutton> düğmesine basın."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr "Son"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_apache2.xml:96
 msgid "drakwizard-web-step7.png"
 msgstr "drakwizard-web-step7.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "Bu kadar! <guibutton>Son</guibutton>'u tıklayın."
 
@@ -4865,8 +5689,7 @@ msgstr "DNS yapılandır"
 msgid "drakwizard bind"
 msgstr "drakwizard bind"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakwizard_bind.xml:8
 msgid "drakwizard_bind.png"
 msgstr "drakwizard_bind.png"
@@ -4874,47 +5697,54 @@ msgstr "drakwizard_bind.png"
 #. type: Content of: <section><para>
 #: en/drakwizard_bind.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard bind</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard bind</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard bind</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard "
+"bind</emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr "DHCP yapılandırın"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr "drakwizard dhcp"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard dhcp</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard dhcp</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard dhcp</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard "
+"dhcp</emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> bir <acronym>DHCP</acronym> sunucusu kurmanız için yardımcı olabilir."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> bir <acronym>DHCP</acronym> "
+"sunucusu kurmanız için yardımcı olabilir."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr "DHCP nedir?"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -4926,189 +5756,341 @@ msgstr ""
 "parametreleri atamak için kullanılan servistir. (Wikipedia' dan)"
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+#, fuzzy
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr "Bir DHCP sunucusunu drakwizard dhcp ile kurmak"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr "DHCP sunucusu sihirbazına hoş geldiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_dhcp.xml:49
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-dhcp-step1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr "Adaptörü seçerek"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_dhcp.xml:63
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-dhcp-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
+#, fuzzy
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 "DHCP' nin IP atayacağı alt ağa bağlanacak ağ arabirimini seçin ve sonra "
 "<guibutton>İleri</guibutton> düğmesine basın."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr "IP aralığı seçin"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_dhcp.xml:78
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-dhcp-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
+#, fuzzy
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 "Sunucunun önermesini istediğiniz IP aralığındaki başlangıç ve bitiş IP "
 "adreslerini, yerel ağ dışına bağlanan dış kapı makinesinin IP adresiyle "
 "birlikte seçin ve <guibutton>İleri</guibutton> düğmesine tıklayın."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_dhcp.xml:94
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard-dhcp-step4.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr "Bekleyin..."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_dhcp.xml:108
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard-dhcp-step5.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
+#, fuzzy
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
 "Bu onarılabilir. Bir kaç kez <guibutton>Geri</guibutton> düğmesine tıklayın "
 "ve bazı ayarları değiştirin. İzinizi kaybetmeyin."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr "Saatler sonra..."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_dhcp.xml:122
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard-dhcp-step6.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
-msgstr "Bir başka ders öğrenildi."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+#, fuzzy
+msgid "What is done"
+msgstr "DHCP nedir?"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+#, fuzzy
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+"Aktif yapılandırmayı <code>/etc/samba/smb.conf</code> dosyasına kaydet."
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
+msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr "Zamanı yapılandırın"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr "drakwizard ntp"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard ntp</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard ntp</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard ntp</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard "
+"ntp</emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
-"time of your server synchronised with an external server. It isn't installed"
-" by default and you have to also install the drakwizard and drakwizard-base "
+"time of your server synchronised with an external server. It isn't installed "
+"by default and you have to also install the drakwizard and drakwizard-base "
 "packages."
-msgstr "Bu aracın<placeholder type=\"footnote\" id=\"0\"/> amacı sisteminizin saatini harici bir sunucu ile eşzamanlamaktır. Varsayılan olarak kurulu değildir ve ayrıca drakwizard vedrakwizard-base paketlerini de kurmanız gerekir."
+msgstr ""
+"Bu aracın<placeholder type=\"footnote\" id=\"0\"/> amacı sisteminizin "
+"saatini harici bir sunucu ile eşzamanlamaktır. Varsayılan olarak kurulu "
+"değildir ve ayrıca drakwizard vedrakwizard-base paketlerini de kurmanız "
+"gerekir."
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+#, fuzzy
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr "Bir FTP sunucusunu drakwizard proftpd ile kurmak"
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
 "because this server always points to available time servers."
-msgstr "Hoşgeldiniz ekranından sonra (yukarıya bakınız), ikincisi açılır listelerden üç zaman sunucu seçmenizi ister ve pool.ntp.org'u iki kez önerir çünkü bu sunucu daima müsait zaman sunucuları gösterir."
+msgstr ""
+"Hoşgeldiniz ekranından sonra (yukarıya bakınız), ikincisi açılır listelerden "
+"üç zaman sunucu seçmenizi ister ve pool.ntp.org'u iki kez önerir çünkü bu "
+"sunucu daima müsait zaman sunucuları gösterir."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr "<author> <personname/> </author> <pubdate/>"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
+#, fuzzy
 msgid ""
-"The following screens allows to choose the region and the city and then, you"
-" arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"The following screens allows to choose the region and the city and then, you "
+"arrive on a summary. If something is wrong, you can obviously change it "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
-msgstr "Takip eden ekranlar bölge ve şehri seçmenizi sağlar ve sonra özete varırsınız. Eğer birşey yanlışsa, açıktır ki <guibutton>Önceki</guibutton> düğmesiyle bunu değiştirebilirsiniz. Eğer herşey doğruysa, test ile devam etmek için <guibutton>Sonraki</guibutton> düğmesine tıklayınız. Biraz zaman alabilir ve sonunda aşağıdaki şu ekranla karşılaşırsınız:"
-
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+msgstr ""
+"Takip eden ekranlar bölge ve şehri seçmenizi sağlar ve sonra özete "
+"varırsınız. Eğer birşey yanlışsa, açıktır ki <guibutton>Önceki</guibutton> "
+"düğmesiyle bunu değiştirebilirsiniz. Eğer herşey doğruysa, test ile devam "
+"etmek için <guibutton>Sonraki</guibutton> düğmesine tıklayınız. Biraz zaman "
+"alabilir ve sonunda aşağıdaki şu ekranla karşılaşırsınız:"
+
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr "Aracı kapatmak için <guibutton>Bitir</guibutton> düğmesini tıklayın"
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+#, fuzzy
+msgid "This tool executes the following steps:"
+msgstr "Bu komut sisteminizden şu bilgileri toplar:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -5119,8 +6101,7 @@ msgstr "FTP yapılandırın"
 msgid "drakwizard proftpd"
 msgstr "drakwizard proftpd"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:8
 msgid "drakwizard_proftpd.png"
 msgstr "drakwizard_proftpd.png"
@@ -5128,15 +6109,17 @@ msgstr "drakwizard_proftpd.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakwizard_proftpd.xml:12
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard proftpd</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard proftpd</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard proftpd</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard "
+"proftpd</emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakwizard_proftpd.xml:12
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up an"
-" <acronym>FTP</acronym> server."
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up an "
+"<acronym>FTP</acronym> server."
 msgstr ""
 "Bu araç<placeholder type=\"footnote\" id=\"0\"/> bir <acronym>FTP</acronym> "
 "sunucusu kurmanız için yardımcı olabilir."
@@ -5153,10 +6136,9 @@ msgid ""
 "protocol used to transfer files from one host to another host over a "
 "<acronym>TCP</acronym>-based network, such as the Internet. (From Wikipedia)"
 msgstr ""
-"Dosya Aktarım Protokolü (<acronym>FTP</acronym>), İntenet gibi "
-"<acronym>TCP</acronym> temelli bir ağ üzerinde bir makineden diğer bir "
-"makineye dosya aktarımında kullanılan bir standart ağ protokolüdür. "
-"(Wikipedia)"
+"Dosya Aktarım Protokolü (<acronym>FTP</acronym>), İntenet gibi <acronym>TCP</"
+"acronym> temelli bir ağ üzerinde bir makineden diğer bir makineye dosya "
+"aktarımında kullanılan bir standart ağ protokolüdür. (Wikipedia)"
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_proftpd.xml:21
@@ -5168,14 +6150,12 @@ msgstr "Bir FTP sunucusunu drakwizard proftpd ile kurmak"
 msgid "Welcome to the FTP wizard. Buckle up."
 msgstr "FTP sihirbazına hoş geldiniz. Kemerinizi bağlayın."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:30
 msgid "drakwizard-ftp-step1.png"
 msgstr "drakwizard-ftp-step1.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:41
 msgid "drakwizard-ftp-step2.png"
 msgstr "drakwizard-ftp-step2.png"
@@ -5194,8 +6174,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "Sunucu Bilgisi"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:52
 msgid "drakwizard-ftp-step3.png"
 msgstr "drakwizard-ftp-step3.png"
@@ -5214,8 +6193,7 @@ msgstr ""
 msgid "Server Options"
 msgstr "Sunucu Seçenekleri"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:63
 msgid "drakwizard-ftp-step4.png"
 msgstr "drakwizard-ftp-step4.png"
@@ -5223,65 +6201,67 @@ msgstr "drakwizard-ftp-step4.png"
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_proftpd.xml:67
 msgid ""
-"Set listening port, jailed user, allow resumes and/or <acronym>FXP</acronym>"
-" (File eXchange Protocol)"
+"Set listening port, jailed user, allow resumes and/or <acronym>FXP</acronym> "
+"(File eXchange Protocol)"
 msgstr ""
 "Dinlenen portu, hapsedilen kullanıcıyı ayarla; geri yüklemeye ve/veya "
 "<acronym>FXP</acronym> (Dosya Değişim Protokolü)ne izin ver"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:74
 msgid "drakwizard-ftp-step5.png"
 msgstr "drakwizard-ftp-step5.png"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:85
 msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ftp-step6.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr "Vekil sunucu yapılandırın"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr "drakwizard squid"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard squid</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard squid</emphasis>  yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard squid</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard "
+"squid</emphasis>  yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
-"Bu araç<placeholder type=\"footnote\" id=\"0\"/> bir vekil sunucu kurmanız için "
-"yardımcı olabilir."
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> bir vekil sunucu kurmanız "
+"için yardımcı olabilir."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr "Bir vekil sunucu nedir?"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
+#, fuzzy
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -5297,159 +6277,208 @@ msgstr ""
 "kontrol edecek şekilde değerlendirir. (Wikipedia' dan)"
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr "Bir vekil sunucuyu drakwizard squid ile kurmak"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr "Vekil sunucu sihirbazına hoş geldiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:50
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-proxy-step1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr "Vekil sunucu portunu seçmek"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:64
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-proxy-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
 msgstr ""
-"Bağlanılacak veki sunucu port tarayıcılarını seçin ve "
-"<guibutton>İleri</guibutton> düğmesine tıklayın."
+"Bağlanılacak veki sunucu port tarayıcılarını seçin ve <guibutton>İleri</"
+"guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr "Bellek ve Disk Kullanımını Ayarla"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:78
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-proxy-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Bellek ve disk önbellekleme sınırlarını ayarlayın ve "
-"<guibutton>İleri</guibutton> düğmesine tıklayın."
+"Bellek ve disk önbellekleme sınırlarını ayarlayın ve <guibutton>İleri</"
+"guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr "Ağ Erişim Denetimini Seç"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:92
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard-proxy-step4.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
-"Set visibility to local network or world, then click "
-"<guibutton>Next</guibutton>."
+"Set visibility to local network or world, then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 msgid "Grant Network Access"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:106
 msgid "drakwizard-proxy-step5.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
-msgid ""
-"Grant access to local networks, then click <guibutton>Next</guibutton>."
+#: en/drakwizard_squid.xml:111
+msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:120
 msgid "drakwizard-proxy-step6.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:134
 msgid "drakwizard-proxy-step7.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
-"Provide upper level proxy hostname and port, then click "
-"<guibutton>Next</guibutton>."
+"Provide upper level proxy hostname and port, then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:148
 msgid "drakwizard-proxy-step8.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:162
 msgid "drakwizard-proxy-step9.png"
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_squid.xml:177
 msgid "drakwizard-proxy-step10.png"
 msgstr ""
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr ""
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -5460,8 +6489,7 @@ msgstr "OpenSSH art süreç yapılandırması"
 msgid "drakwizard sshd"
 msgstr "drakwizard sshd"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:8
 msgid "drakwizard_sshd.png"
 msgstr "drakwizard_sshd.png"
@@ -5469,15 +6497,17 @@ msgstr "drakwizard_sshd.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/drakwizard_sshd.xml:13
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard sshd</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard sshd</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard sshd</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">drakwizard "
+"sshd</emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/drakwizard_sshd.xml:13
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up an"
-" <acronym>SSH</acronym> daemon."
+"This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up an "
+"<acronym>SSH</acronym> daemon."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -5490,8 +6520,8 @@ msgstr ""
 msgid ""
 "Secure Shell (SSH) is a cryptographic network protocol for secure data "
 "communication, remote command-line login, remote command execution, and "
-"other secure network services between two networked computers that connects,"
-" via a secure channel over an insecure network, a server and a client "
+"other secure network services between two networked computers that connects, "
+"via a secure channel over an insecure network, a server and a client "
 "(running SSH server and <acronym>SSH</acronym> client programs, "
 "respectively). (From Wikipedia)"
 msgstr ""
@@ -5511,8 +6541,7 @@ msgstr ""
 msgid "Select Type of Configure Options"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:31
 msgid "drakwizard-sshd-step1.png"
 msgstr ""
@@ -5520,9 +6549,8 @@ msgstr ""
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:35
 msgid ""
-"Choose <guilabel>Expert</guilabel> for all options or "
-"<guilabel>Newbie</guilabel> to skip steps 3-7, click "
-"<guibutton>Next</guibutton>."
+"Choose <guilabel>Expert</guilabel> for all options or <guilabel>Newbie</"
+"guilabel> to skip steps 3-7, click <guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
@@ -5530,8 +6558,7 @@ msgstr ""
 msgid "General Options"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:42
 msgid "drakwizard-sshd-step2.png"
 msgstr ""
@@ -5548,8 +6575,7 @@ msgstr ""
 msgid "Authentication Methods"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:53
 msgid "drakwizard-sshd-step3.png"
 msgstr ""
@@ -5566,8 +6592,7 @@ msgstr ""
 msgid "Logging"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:64
 msgid "drakwizard-sshd-step4.png"
 msgstr ""
@@ -5575,8 +6600,8 @@ msgstr ""
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_sshd.xml:68
 msgid ""
-"Choose logging facility and level of output, then click "
-"<guibutton>Next</guibutton>."
+"Choose logging facility and level of output, then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
@@ -5584,8 +6609,7 @@ msgstr ""
 msgid "Login Options"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:75
 msgid "drakwizard-sshd-step5.png"
 msgstr ""
@@ -5600,8 +6624,7 @@ msgstr ""
 msgid "User Login Options"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:86
 msgid "drakwizard-sshd-step6.png"
 msgstr ""
@@ -5617,8 +6640,7 @@ msgstr ""
 msgid "Compression and Forwarding"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:97
 msgid "drakwizard-sshd-step7.png"
 msgstr ""
@@ -5630,14 +6652,12 @@ msgid ""
 "<guibutton>Next</guibutton>."
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:108
 msgid "drakwizard-sshd-step8.png"
 msgstr ""
 
-#. type: Attribute 'fileref' of:
-#. <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_sshd.xml:119
 msgid "drakwizard-sshd-step9.png"
 msgstr ""
@@ -5645,15 +6665,15 @@ msgstr ""
 #. type: Content of: <section><info><title>
 #: en/drakxservices.xml:3
 msgid "Manage system services by enabling or disabling them"
-msgstr "Sistem hizmetlerini etkinleştirmek veya devre dışı bırakmak suretiyle yönetin"
+msgstr ""
+"Sistem hizmetlerini etkinleştirmek veya devre dışı bırakmak suretiyle yönetin"
 
 #. type: Content of: <section><info><subtitle>
 #: en/drakxservices.xml:3
 msgid "drakxservices"
 msgstr "drakxservices"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/drakxservices.xml:8
 msgid "drakxservices.png"
 msgstr "drakxservices.png"
@@ -5661,9 +6681,11 @@ msgstr "drakxservices.png"
 #. type: Content of: <section><para>
 #: en/drakxservices.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakxservices</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakxservices</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakxservices</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">drakxservices</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/harddrake2.xml:10
@@ -5675,8 +6697,7 @@ msgstr "Donanım Yapılandırması"
 msgid "harddrake2"
 msgstr "harddrake2"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/harddrake2.xml:17
 msgid "harddrake2.png"
 msgstr "harddrake2.png"
@@ -5684,9 +6705,11 @@ msgstr "harddrake2.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/harddrake2.xml:23
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">harddrake2</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">harddrake2</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">harddrake2</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">harddrake2</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/harddrake2.xml:22
@@ -5696,7 +6719,11 @@ msgid ""
 "to look for every element of the hardware. For that, it uses the command "
 "<code>ldetect </code>which refers to a list of hardware in <code>ldetect-"
 "lst</code> package."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> bilgisayarınızın donanımı ile ilgili genel bir görünüm verir. Araç çalıştırıldığında donanımın her bir öğesi için arama başlatır. Bunun için <code>ldetect-lst</code> içindeki bir donanım listesine başvuran <code>ldetect </code>komutunu kullanır."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> bilgisayarınızın donanımı "
+"ile ilgili genel bir görünüm verir. Araç çalıştırıldığında donanımın her bir "
+"öğesi için arama başlatır. Bunun için <code>ldetect-lst</code> içindeki bir "
+"donanım listesine başvuran <code>ldetect </code>komutunu kullanır."
 
 #. type: Content of: <section><section><title>
 #: en/harddrake2.xml:31
@@ -5714,7 +6741,9 @@ msgid ""
 "The left column contains a list of the detected hardware. The devices are "
 "grouped by categories. Click on the &gt; to expand the content of a "
 "category. Each device can be selected in this column."
-msgstr "Sol sütun algılanan donanımların bir listesini içerir. Aygıtlar kategorilerine göre gruplandırılmıştır. Bu sütunda her araç seçilebilir."
+msgstr ""
+"Sol sütun algılanan donanımların bir listesini içerir. Aygıtlar "
+"kategorilerine göre gruplandırılmıştır. Bu sütunda her araç seçilebilir."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:39
@@ -5722,14 +6751,19 @@ msgid ""
 "The right column displays information about the selected device.  The "
 "<guimenu>Help -&gt; Fields description</guimenu> gives some information "
 "about the content of the fields."
-msgstr "Sağ sütun seçilen aygıt ile ilgili bilgileri gösterir. <guimenu>Yardım -&gt; Alanların tanımlamaları</guimenu> alanların içerikleri ile ilgili bilgiler verir."
+msgstr ""
+"Sağ sütun seçilen aygıt ile ilgili bilgileri gösterir. <guimenu>Yardım -&gt; "
+"Alanların tanımlamaları</guimenu> alanların içerikleri ile ilgili bilgiler "
+"verir."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:43
 msgid ""
-"According to which type of device is selected, either one or two buttons are"
-" available at the bottom of the right column:"
-msgstr "Hangi tür aygıtın seçildiğine bağlı olarak, sağ altta bir ya da iki düğmeye ulaşılabilir."
+"According to which type of device is selected, either one or two buttons are "
+"available at the bottom of the right column:"
+msgstr ""
+"Hangi tür aygıtın seçildiğine bağlı olarak, sağ altta bir ya da iki düğmeye "
+"ulaşılabilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/harddrake2.xml:48
@@ -5737,21 +6771,28 @@ msgid ""
 "<guibutton>Set current driver options</guibutton>: this can be used to "
 "parameterize the module which is used in relation to the device. This must "
 "used by experts only."
-msgstr "<guibutton>Aktif sürücü seçeneklerini ayarla</guibutton>: aygıtla ilgili olarak kullanılan modül parametrelerini değiştirmek için kullanılabilir. Bu sadece uzmanlar tarafından kullanılmalıdır."
+msgstr ""
+"<guibutton>Aktif sürücü seçeneklerini ayarla</guibutton>: aygıtla ilgili "
+"olarak kullanılan modül parametrelerini değiştirmek için kullanılabilir. Bu "
+"sadece uzmanlar tarafından kullanılmalıdır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/harddrake2.xml:54
 msgid ""
 "<guibutton>Run config tool</guibutton>: access to the tool which can "
 "configure the device. The tool can often be accessed directly from the MCC."
-msgstr "<guibutton>Yapılandırma aracı çalıştır</guibutton>: aygıtı yapılandıran araca erişim. Araç sıklıkla MDM'den erişilebilir."
+msgstr ""
+"<guibutton>Yapılandırma aracı çalıştır</guibutton>: aygıtı yapılandıran "
+"araca erişim. Araç sıklıkla MDM'den erişilebilir."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:68
 msgid ""
 "The <guimenu>options</guimenu> menu gives the opportunity to check boxes to "
 "enable automatic detection:"
-msgstr "<guimenu>seçenekler</guimenu> menüsü otomatik algılamayı etkinleştirmek onay kutuları imkanını verir:"
+msgstr ""
+"<guimenu>seçenekler</guimenu> menüsü otomatik algılamayı etkinleştirmek onay "
+"kutuları imkanını verir:"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/harddrake2.xml:73
@@ -5774,7 +6815,10 @@ msgid ""
 "By default these detections are not enabled, because they are slow. Check "
 "the appropriate box(es) if you have this hardware connected. Detection will "
 "be operational the next time this tool is started."
-msgstr "Varsayılan olarak bu tespit edilenler etkinleştirilmemiştir, çünkü yavaştırlar. Eğer bu donanım bağlanmış ise uygun kutuları işaretleyin. Tespit etme bu aracın çalıştırıldığı bir sonraki zamanda gerçekleştirilir."
+msgstr ""
+"Varsayılan olarak bu tespit edilenler etkinleştirilmemiştir, çünkü "
+"yavaştırlar. Eğer bu donanım bağlanmış ise uygun kutuları işaretleyin. "
+"Tespit etme bu aracın çalıştırıldığı bir sonraki zamanda gerçekleştirilir."
 
 #. type: Content of: <section><info><title>
 #: en/keyboarddrake.xml:3
@@ -5786,8 +6830,7 @@ msgstr "Kılavye düzenini ayarlayın"
 msgid "keyboarddrake"
 msgstr "keyboarddrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/keyboarddrake.xml:12
 msgid "keyboarddrake.png"
 msgstr "keyboarddrake.png"
@@ -5795,9 +6838,11 @@ msgstr "keyboarddrake.png"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/keyboarddrake.xml:20
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">keyboarddrake</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">keyboarddrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">keyboarddrake</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">keyboarddrake</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/keyboarddrake.xml:19
@@ -5807,7 +6852,12 @@ msgid ""
 "It affects the keyboard layout for all users on the system. It can be found "
 "in the Hardware section of the Mageia Control Center (MCC) labelled "
 "\"Configure mouse and keyboard\"."
-msgstr "keyboarddrake aracı<placeholder type=\"footnote\" id=\"0\"/> Mageia üzerinde kullanmak istediğiniz klavye için temel düzeni yapılandırmada size yardımcı olur. Klavye düzenini sistemdeki tüm kullanıcılar için etkiler. Mageia Denetim Merkezinde (MDM) Donanım bölümünde \"Fareyi ve klavyeyi yapılandır\" etiketiyle bulunur."
+msgstr ""
+"keyboarddrake aracı<placeholder type=\"footnote\" id=\"0\"/> Mageia üzerinde "
+"kullanmak istediğiniz klavye için temel düzeni yapılandırmada size yardımcı "
+"olur. Klavye düzenini sistemdeki tüm kullanıcılar için etkiler. Mageia "
+"Denetim Merkezinde (MDM) Donanım bölümünde \"Fareyi ve klavyeyi yapılandır\" "
+"etiketiyle bulunur."
 
 #. type: Content of: <section><section><title>
 #: en/keyboarddrake.xml:29
@@ -5817,10 +6867,13 @@ msgstr "Klavye Düzeni"
 #. type: Content of: <section><section><para>
 #: en/keyboarddrake.xml:31
 msgid ""
-"Here you can select which keyboard layout you wish to use. The names (listed"
-" in alphabetical order) describe the language, country, and/or ethnicity "
-"each layout should be used for."
-msgstr "Burada hangi klavye düzenini kullanmak istediinizi seçebilirsiniz. İsimler (alfabetik olarak sıralanmıştır) her düzen için kullanılması gereken dili, ülkeyi, ve/veya etnik kökeni tanımlar. "
+"Here you can select which keyboard layout you wish to use. The names (listed "
+"in alphabetical order) describe the language, country, and/or ethnicity each "
+"layout should be used for."
+msgstr ""
+"Burada hangi klavye düzenini kullanmak istediinizi seçebilirsiniz. İsimler "
+"(alfabetik olarak sıralanmıştır) her düzen için kullanılması gereken dili, "
+"ülkeyi, ve/veya etnik kökeni tanımlar. "
 
 #. type: Content of: <section><section><title>
 #: en/keyboarddrake.xml:37
@@ -5832,7 +6885,9 @@ msgstr "Klavye Türü"
 msgid ""
 "This menu lets you select the type of keyboard you are using. If you are "
 "unsure of which to choose, it is best to leave it as the default type."
-msgstr "Bu menü kullandığınız klavye türünü seçmenizi sağlar. Hangisini seçmeniz gerektiğinden emin değilseniz en iyisi varsayılan tür olarak bırakmaktır."
+msgstr ""
+"Bu menü kullandığınız klavye türünü seçmenizi sağlar. Hangisini seçmeniz "
+"gerektiğinden emin değilseniz en iyisi varsayılan tür olarak bırakmaktır."
 
 #. type: Content of: <section><info><title>
 #: en/localedrake.xml:10
@@ -5844,8 +6899,7 @@ msgstr "Sisteminizin yerelleştirmesini yönetin"
 msgid "localedrake"
 msgstr "localedrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/localedrake.xml:18
 msgid "localedrake.png"
 msgstr "localedrake.png"
@@ -5853,9 +6907,11 @@ msgstr "localedrake.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/localedrake.xml:24
 msgid ""
-"You can also start this tool from the command line, by typing <emphasis "
-"role=\"bold\">localedrake</emphasis> as root."
-msgstr "Bu aracı ayrıca komut satırında root olarak <emphasis role=\"bold\">localedrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can also start this tool from the command line, by typing <emphasis role="
+"\"bold\">localedrake</emphasis> as root."
+msgstr ""
+"Bu aracı ayrıca komut satırında root olarak <emphasis role=\"bold"
+"\">localedrake</emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/localedrake.xml:24
@@ -5865,14 +6921,20 @@ msgid ""
 "localization for your system\". It opens with a window in which you can "
 "choose your language. The choice is adapted to languages selected during "
 "installation."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinin (MDM) Sistem bölümünde \"Sisteminiz için yerelleştirmeyi yönetin\" etiketiyle bulunur. Dilinizi seçebileceğiniz bir pencere açar. Seçim kurulum sırasında seçilen dile uyarlanır."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinin "
+"(MDM) Sistem bölümünde \"Sisteminiz için yerelleştirmeyi yönetin\" "
+"etiketiyle bulunur. Dilinizi seçebileceğiniz bir pencere açar. Seçim kurulum "
+"sırasında seçilen dile uyarlanır."
 
 #. type: Content of: <section><para>
 #: en/localedrake.xml:31
 msgid ""
 "The <guibutton>Advanced</guibutton> button give access to activate "
 "compatibility with old encoding (non UTF8)."
-msgstr "<guibutton>Gelişmiş</guibutton> düğmesi eski kodlama (UTF8 olmayan) ile uyumluluğu etkinleştirmeye erişimi sağlar."
+msgstr ""
+"<guibutton>Gelişmiş</guibutton> düğmesi eski kodlama (UTF8 olmayan) ile "
+"uyumluluğu etkinleştirmeye erişimi sağlar."
 
 #. type: Content of: <section><para>
 #: en/localedrake.xml:34
@@ -5880,12 +6942,16 @@ msgid ""
 "The second window shows a list of countries according to the selected "
 "language. The button <guibutton>Other Countries</guibutton> gives access to "
 "countries not listed."
-msgstr "İkinci ekran seçilen dile bağlı olarak ülkeler listesini gösterir. <guibutton>Diğer Ülkeler</guibutton> düğmesi listelenmemiş ülkelere erişimi verir."
+msgstr ""
+"İkinci ekran seçilen dile bağlı olarak ülkeler listesini gösterir. "
+"<guibutton>Diğer Ülkeler</guibutton> düğmesi listelenmemiş ülkelere erişimi "
+"verir."
 
 #. type: Content of: <section><para>
 #: en/localedrake.xml:38
 msgid "You have to restart your session after any modifications."
-msgstr "Herhangi bir değişiklikten sonra oturumunuzu yeniden başlatmak zorundasınız."
+msgstr ""
+"Herhangi bir değişiklikten sonra oturumunuzu yeniden başlatmak zorundasınız."
 
 #. type: Content of: <section><section><info><title>
 #: en/localedrake.xml:42
@@ -5899,14 +6965,21 @@ msgid ""
 "input method (from the drop-down menu at the bottom of the list). Input "
 "methods allow users to input multilingual characters (Chinese, Japanese, "
 "Korean, etc)."
-msgstr "<guilabel>Diğer Ülkeler</guilabel> ekranında ayrıca girdi yöntemini seçebilirsiniz (listenin altındaki aşağı-açılır menüden). Girdi yöntemleri kullanıcının çokdilli karakterlkeri girmesini sağlar (Çince, Japonca, Korece, vb.)."
+msgstr ""
+"<guilabel>Diğer Ülkeler</guilabel> ekranında ayrıca girdi yöntemini "
+"seçebilirsiniz (listenin altındaki aşağı-açılır menüden). Girdi yöntemleri "
+"kullanıcının çokdilli karakterlkeri girmesini sağlar (Çince, Japonca, "
+"Korece, vb.)."
 
 #. type: Content of: <section><section><para>
 #: en/localedrake.xml:48
 msgid ""
 "For Asian and African locales, IBus will be set as default input method so "
 "users should not need to configure it manually."
-msgstr "Asya ve Afrika yerelleştirmeleri için, IBus, kullanııların elle yapılandırması gerekmesin diye varsayılan giriş yöntemi olarak ayarlanacaktır. "
+msgstr ""
+"Asya ve Afrika yerelleştirmeleri için, IBus, kullanııların elle "
+"yapılandırması gerekmesin diye varsayılan giriş yöntemi olarak "
+"ayarlanacaktır. "
 
 #. type: Content of: <section><section><para>
 #: en/localedrake.xml:50
@@ -5914,7 +6987,10 @@ msgid ""
 "Other input methods (SCIM, GCIN, HIME, etc.) also provide similar functions "
 "and can, if not available from the drop-down menu, be installed in another "
 "part of the Mageia Control Center. See <xref linkend=\"rpmdrake\"></xref>."
-msgstr "Diğer girdi yöntemleri (SCIM, GCIN, HIME, vb.) ayrıca benzer işlevleri sağlar ve eğer aşağı-açılır menüde yoksa Mageia Denetim Merkezinin başka bir yerinden kurulmasını sağlar. Bakınız <xref linkend=\"rpmdrake\"></xref>."
+msgstr ""
+"Diğer girdi yöntemleri (SCIM, GCIN, HIME, vb.) ayrıca benzer işlevleri "
+"sağlar ve eğer aşağı-açılır menüde yoksa Mageia Denetim Merkezinin başka bir "
+"yerinden kurulmasını sağlar. Bakınız <xref linkend=\"rpmdrake\"></xref>."
 
 #. type: Content of: <section><info><title>
 #: en/logdrake.xml:3
@@ -5926,8 +7002,7 @@ msgstr "Sistem günlük kayıtlarını görüntüleyin ve arama yapın"
 msgid "logdrake"
 msgstr "logdrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/logdrake.xml:10
 msgid "logdrake.png"
 msgstr "logdrake.png"
@@ -5935,17 +7010,22 @@ msgstr "logdrake.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/logdrake.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">logdrake</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">logdrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">logdrake</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">logdrake</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/logdrake.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
-"Control Center System tab, labelled \"<guilabel>View and search system "
-"logs</guilabel>\"."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezi Sistem sekmesinde  \"<guilabel>Sistem günlüklerini gör ve ara</guilabel>\" etiketiyle bulunur."
+"Control Center System tab, labelled \"<guilabel>View and search system logs</"
+"guilabel>\"."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezi "
+"Sistem sekmesinde  \"<guilabel>Sistem günlüklerini gör ve ara</guilabel>\" "
+"etiketiyle bulunur."
 
 #. type: Content of: <section><section><title>
 #: en/logdrake.xml:22
@@ -5955,27 +7035,42 @@ msgstr "Sistem günlüklerinde arama yapmak için"
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:24
 msgid ""
-"First, enter the key string you want to look for in the <emphasis "
-"role=\"bold\">Matching</emphasis> field and/or the key string you want to "
-"<emphasis>do not</emphasis> wish to see amongst the answers in the field "
-"<emphasis role=\"bold\">but not matching</emphasis>. Then select the file(s)"
-"  to search in the <guilabel>Choose file</guilabel> field. Optionally, it is"
-" possible to limit the search to only one day. Select it in the <emphasis "
-"role=\"bold\">Calendar</emphasis>, using the little arrows on each side of "
-"the month and year, and check \"<guibutton>Show only for the selected "
-"day</guibutton>\". At last, click on the <guibutton>search</guibutton> "
-"button to see the results in the window called <guilabel>Content of the "
-"file</guilabel>. It is possible to save the results in the .txt format by "
-"clicking on the <emphasis role=\"bold\">Save</emphasis> button."
-msgstr "İlk olarak aramak istediğiniz anahtar dizgeyi <emphasis role=\"bold\">Eşleşen</emphasis> alanı içine ve/veya cevaplar arasında görmek <emphasis>istemediğiniz</emphasis> anahtar dizgeyi <emphasis role=\"bold\">fakat eşleşmeyen</emphasis> alanına giriniz. Sonra <guilabel>Dosya seçininiz</guilabel> alanından aramak istediğiniz dosya(lar)ı seçiniz. Seçimlik olarak, aramayı sadece bir günlük olarak sınırlandırmak mümkündür. <emphasis role=\"bold\">Takvim</emphasis> içinden ay ve yılın her iki yanındaki küçük okları kullanarak seçiniz, ve \"<guibutton>Sadece seçilen günler için göster</guibutton>\"i işaretleyiniz. En sonunda sonucu <guilabel>Dosyanın içeriği</guilabel> isimli pencerede görmek için <guibutton>ara</guibutton> düğmesine tıklayınız. <emphasis role=\"bold\">Kaydet</emphasis> düğmesine tıklayıp sonucu .txt biçiminde kaydetmek mümkündür."
+"First, enter the key string you want to look for in the <emphasis role=\"bold"
+"\">Matching</emphasis> field and/or the key string you want to <emphasis>do "
+"not</emphasis> wish to see amongst the answers in the field <emphasis role="
+"\"bold\">but not matching</emphasis>. Then select the file(s)  to search in "
+"the <guilabel>Choose file</guilabel> field. Optionally, it is possible to "
+"limit the search to only one day. Select it in the <emphasis role=\"bold"
+"\">Calendar</emphasis>, using the little arrows on each side of the month "
+"and year, and check \"<guibutton>Show only for the selected day</guibutton>"
+"\". At last, click on the <guibutton>search</guibutton> button to see the "
+"results in the window called <guilabel>Content of the file</guilabel>. It is "
+"possible to save the results in the .txt format by clicking on the <emphasis "
+"role=\"bold\">Save</emphasis> button."
+msgstr ""
+"İlk olarak aramak istediğiniz anahtar dizgeyi <emphasis role=\"bold"
+"\">Eşleşen</emphasis> alanı içine ve/veya cevaplar arasında görmek "
+"<emphasis>istemediğiniz</emphasis> anahtar dizgeyi <emphasis role=\"bold"
+"\">fakat eşleşmeyen</emphasis> alanına giriniz. Sonra <guilabel>Dosya "
+"seçininiz</guilabel> alanından aramak istediğiniz dosya(lar)ı seçiniz. "
+"Seçimlik olarak, aramayı sadece bir günlük olarak sınırlandırmak mümkündür. "
+"<emphasis role=\"bold\">Takvim</emphasis> içinden ay ve yılın her iki "
+"yanındaki küçük okları kullanarak seçiniz, ve \"<guibutton>Sadece seçilen "
+"günler için göster</guibutton>\"i işaretleyiniz. En sonunda sonucu "
+"<guilabel>Dosyanın içeriği</guilabel> isimli pencerede görmek için "
+"<guibutton>ara</guibutton> düğmesine tıklayınız. <emphasis role=\"bold"
+"\">Kaydet</emphasis> düğmesine tıklayıp sonucu .txt biçiminde kaydetmek "
+"mümkündür."
 
 #. type: Content of: <section><section><note><para>
 #: en/logdrake.xml:36
 msgid ""
-"The <guibutton>Mageia Tools Logs</guibutton> houses the logs from the Mageia"
-" configuration tools such as the Mageia Control Center tools.  These logs "
-"are updated each time a configuration is modified."
-msgstr "<guibutton>Mageia Günlükleme Araçları</guibutton> Mageia Denetim Merkezi araçları gibi Mageia yapılandırma araçlarına evsahipliği yapar."
+"The <guibutton>Mageia Tools Logs</guibutton> houses the logs from the Mageia "
+"configuration tools such as the Mageia Control Center tools.  These logs are "
+"updated each time a configuration is modified."
+msgstr ""
+"<guibutton>Mageia Günlükleme Araçları</guibutton> Mageia Denetim Merkezi "
+"araçları gibi Mageia yapılandırma araçlarına evsahipliği yapar."
 
 #. type: Content of: <section><section><title>
 #: en/logdrake.xml:43
@@ -5988,17 +7083,24 @@ msgid ""
 "<guibutton>Mail alert</guibutton> automatically checks the system load and "
 "the services every hour and if necessary sends an e-mail to the configured "
 "address."
-msgstr "<guibutton>E-posta ikazı</guibutton> otomatik olarak her saat sistetem yükünü kontrol eder ve gerekliyse ayarlanmış adrese e-posta gönderir."
+msgstr ""
+"<guibutton>E-posta ikazı</guibutton> otomatik olarak her saat sistetem "
+"yükünü kontrol eder ve gerekliyse ayarlanmış adrese e-posta gönderir."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:49
 msgid ""
-"To configure this tool, click on the <emphasis role=\"bold\">Mail "
-"Alert</emphasis> button and then, in the next screen, on the<guibutton> "
-"Configure the mail alert system</guibutton> drop down button. Here, all the "
-"running services are displayed and you can choose which ones you want to "
-"look watch. (See screenshot above)."
-msgstr "Bu aracı yapılandırmak için, <emphasis role=\"bold\">E-posta İkazı</emphasis> düğmesine tıklayın ve sonra, sonraki ekranda, <guibutton> E-posta ikaz sistemini yapılandır</guibutton> açılır dümesine tıklayın. Burada, tüm çalışan servisler gösterilir ve hangisini izleyeceğinizi seçebilirsiniz. (Aşağıdaki ekran görüntüsüne bakınız)."
+"To configure this tool, click on the <emphasis role=\"bold\">Mail Alert</"
+"emphasis> button and then, in the next screen, on the<guibutton> Configure "
+"the mail alert system</guibutton> drop down button. Here, all the running "
+"services are displayed and you can choose which ones you want to look watch. "
+"(See screenshot above)."
+msgstr ""
+"Bu aracı yapılandırmak için, <emphasis role=\"bold\">E-posta İkazı</"
+"emphasis> düğmesine tıklayın ve sonra, sonraki ekranda, <guibutton> E-posta "
+"ikaz sistemini yapılandır</guibutton> açılır dümesine tıklayın. Burada, tüm "
+"çalışan servisler gösterilir ve hangisini izleyeceğinizi seçebilirsiniz. "
+"(Aşağıdaki ekran görüntüsüne bakınız)."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:55
@@ -6045,8 +7147,7 @@ msgstr "Xinetd Servisi"
 msgid "BIND Domain Name Resolve"
 msgstr "BIND Alan Adı Çözücüsü"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><itemizedlist><listitem><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><itemizedlist><listitem><para><mediaobject><imageobject><imagedata>
 #: en/logdrake.xml:91
 msgid "logdrake1.png"
 msgstr "logdrake1.png"
@@ -6055,11 +7156,16 @@ msgstr "logdrake1.png"
 #: en/logdrake.xml:97
 msgid ""
 "In the next screen, select the <guilabel>Load</guilabel> value you consider "
-"unacceptable. The load represents the demand to a process, a high load slows"
-" the system down and a very high load may indicate that a process has gone "
+"unacceptable. The load represents the demand to a process, a high load slows "
+"the system down and a very high load may indicate that a process has gone "
 "out of control. The default value is 3. We recommend setting the load value "
 "to 3 times the number of processors."
-msgstr "Sonrakiekranda,  kabul edilebilir olarak düşündüğünüz <guilabel>Yük</guilabel> değerini giriniz. Yük, süreç talebini temsil eder, yüksek bir yük sistemi yavaşlatır ve çok yüksek yük bir sürecin kontrolden çıkmasına işaret edebilir. Varsayılan değer 3tür. Yük değerinin işlemci sayısının 3 katı olmasını tavsiye ediyoruz."
+msgstr ""
+"Sonrakiekranda,  kabul edilebilir olarak düşündüğünüz <guilabel>Yük</"
+"guilabel> değerini giriniz. Yük, süreç talebini temsil eder, yüksek bir yük "
+"sistemi yavaşlatır ve çok yüksek yük bir sürecin kontrolden çıkmasına işaret "
+"edebilir. Varsayılan değer 3tür. Yük değerinin işlemci sayısının 3 katı "
+"olmasını tavsiye ediyoruz."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:103
@@ -6067,7 +7173,10 @@ msgid ""
 "In the last screen, enter the <guilabel>Email address</guilabel> of the "
 "person to be warned and the <guilabel>Email server</guilabel> to use (local "
 "or on the Internet)."
-msgstr "Son ekranda, uyarılacak olan kişinin <guilabel>E-posta addresi</guilabel>ni ve kullanılacak <guilabel>E-posta sunucusu</guilabel>nu girin (yerel veya İnternet üzerinde)."
+msgstr ""
+"Son ekranda, uyarılacak olan kişinin <guilabel>E-posta addresi</guilabel>ni "
+"ve kullanılacak <guilabel>E-posta sunucusu</guilabel>nu girin (yerel veya "
+"İnternet üzerinde)."
 
 #. type: Content of: <section><info><title>
 #: en/lsnetdrake.xml:10
@@ -6082,25 +7191,33 @@ msgstr "lsnetdrake"
 #. type: Content of: <section><para><footnote><para>
 #: en/lsnetdrake.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">lsnetdrake</emphasis>."
-msgstr "Bu aracı komut satırında <emphasis role=\"bold\">lsnetdrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">lsnetdrake</emphasis>."
+msgstr ""
+"Bu aracı komut satırında <emphasis role=\"bold\">lsnetdrake</emphasis> "
+"yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/lsnetdrake.xml:14
 msgid ""
 "This tool <placeholder type=\"footnote\" id=\"0\"/> can only be started and "
 "used on the command line."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> sadece komut satırından başlatılabilir ve kullanılabilir."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> sadece komut satırından "
+"başlatılabilir ve kullanılabilir."
 
 #. type: Content of: <section><para>
 #: en/lsnetdrake.xml:21
 msgid ""
 "This page hasn't been written yet for lack of resources. If you think you "
-"can write this help, please contact <link "
-"ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the "
-"Documentation team.</link> Thanking you in advance."
-msgstr "Bu bölüm kaynak yetersizliğinden henüz yazılmamıştır. Eğer bunun yazılmasına yardım edebileceğinizi düşünüyorsanız lütfen <link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> Belgelendirme takımı.</link> ile iletişime geçiniz. Şimdiden teşekkürler."
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Documentation team.</link> Thanking you in "
+"advance."
+msgstr ""
+"Bu bölüm kaynak yetersizliğinden henüz yazılmamıştır. Eğer bunun yazılmasına "
+"yardım edebileceğinizi düşünüyorsanız lütfen <link ns2:href=\"https://wiki."
+"mageia.org/en/Documentation_team\"> Belgelendirme takımı.</link> ile "
+"iletişime geçiniz. Şimdiden teşekkürler."
 
 #. type: Content of: <section><info><title>
 #: en/lspcidrake.xml:3
@@ -6115,9 +7232,11 @@ msgstr "lspcidrake"
 #. type: Content of: <section><para><footnote><para>
 #: en/lspcidrake.xml:10
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">lspcidrake</emphasis>."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">lspcidrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">lspcidrake</emphasis>."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">lspcidrake</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:9
@@ -6125,18 +7244,23 @@ msgid ""
 "This tool <placeholder type=\"footnote\" id=\"0\"/> can only be started and "
 "used on the command line. It will give some more information if used under "
 "root."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> sadece komut satırından başlatılabilir ve kullanılabilir. root kullanıcısı ile kullanıldığında daha fazla bilgi verecektir."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> sadece komut satırından "
+"başlatılabilir ve kullanılabilir. root kullanıcısı ile kullanıldığında daha "
+"fazla bilgi verecektir."
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:14
 msgid ""
-"lspcidrake gives the list of all the connected devices to the computer (USB,"
-" PCI and PCMCIA) and the used drivers. It needs the ldetect and ldetect-lst "
+"lspcidrake gives the list of all the connected devices to the computer (USB, "
+"PCI and PCMCIA) and the used drivers. It needs the ldetect and ldetect-lst "
 "packages to work."
-msgstr "lspcidrake bilgisayara bağlı (USB, PCI ve PCMCIA) tüm aygıtların ve sürücülerin listesini verir. Çalışmak için ldetect ve ldetect-lst paketlerine ihtiyaç duyar."
+msgstr ""
+"lspcidrake bilgisayara bağlı (USB, PCI ve PCMCIA) tüm aygıtların ve "
+"sürücülerin listesini verir. Çalışmak için ldetect ve ldetect-lst "
+"paketlerine ihtiyaç duyar."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/lspcidrake.xml:20
 msgid "lspcidrake1.png"
 msgstr "lspcidrake1.png"
@@ -6152,7 +7276,9 @@ msgstr "-v seçeneği ile lspcidrake üretici ve aygıt tanımlamalarını ekler
 msgid ""
 "lspcidrake often generates very long lists, so, to find an information, it "
 "is often used in a pipeline with the grep command, like in these examples:"
-msgstr "lspcidrake genellikle çok uzun listeler üretir, bu yüzden, sıklıkla bir boru ile grep komutu -bu örnekte olduğu gibi- kullanılır:"
+msgstr ""
+"lspcidrake genellikle çok uzun listeler üretir, bu yüzden, sıklıkla bir boru "
+"ile grep komutu -bu örnekte olduğu gibi- kullanılır:"
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:31
@@ -6184,10 +7310,11 @@ msgstr "-i büyük-küçük harf farklılığını göz ardı etmek için."
 msgid ""
 "In this screenshot below, you can see the action of the -v option for "
 "lspcidrake and the -i option for grep."
-msgstr "Aşağıdaki bu ekran görüntüsünde, lspcidrake için -v seçeneğinin etkisini ve grep için -i seçeneği etkisini görebilirsiniz."
+msgstr ""
+"Aşağıdaki bu ekran görüntüsünde, lspcidrake için -v seçeneğinin etkisini ve "
+"grep için -i seçeneği etkisini görebilirsiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/lspcidrake.xml:46
 msgid "lspcidrake2.png"
 msgstr "lspcidrake2.png"
@@ -6197,7 +7324,9 @@ msgstr "lspcidrake2.png"
 msgid ""
 "There is another tool that gives information about the hardware, it is "
 "called <emphasis role=\"bold\">dmidecode</emphasis> (under root)"
-msgstr "Donanım hakkında bilgi veren<emphasis role=\"bold\">dmidecode</emphasis> adında başka bir araç daha vardır (root altında)."
+msgstr ""
+"Donanım hakkında bilgi veren<emphasis role=\"bold\">dmidecode</emphasis> "
+"adında başka bir araç daha vardır (root altında)."
 
 #. type: Content of: <section><info><title>
 #: en/MageiaUpdate.xml:3
@@ -6209,8 +7338,7 @@ msgstr "Yazılım Paketleri Güncelleme"
 msgid "MageiaUpdate or drakrpm-update"
 msgstr "MageiaUpdate veya drakrpm-update"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/MageiaUpdate.xml:10
 msgid "MageiaUpdate.png"
 msgstr "MageiaUpdate.png"
@@ -6218,18 +7346,23 @@ msgstr "MageiaUpdate.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/MageiaUpdate.xml:14
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">MageiaUpdate</emphasis> or <emphasis role=\"bold\">drakrpm-"
-"update</emphasis> as root."
-msgstr "Bu aracı komut satırında kök olarak <emphasis role=\"bold\">MageiaUpdate</emphasis> veya <emphasis role=\"bold\">drakrpm-update</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">MageiaUpdate</emphasis> or <emphasis role=\"bold\">drakrpm-update</"
+"emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">MageiaUpdate</"
+"emphasis> veya <emphasis role=\"bold\">drakrpm-update</emphasis> yazarak "
+"çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
-"Control Center under the tab <emphasis role=\"bold\">Software "
-"management.</emphasis>"
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde <emphasis role=\"bold\">Yazılım yönetimi</emphasis> sekmesinde bulunur."
+"Control Center under the tab <emphasis role=\"bold\">Software management.</"
+"emphasis>"
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
+"<emphasis role=\"bold\">Yazılım yönetimi</emphasis> sekmesinde bulunur."
 
 #. type: Content of: <section><para><note><para>
 #: en/MageiaUpdate.xml:18
@@ -6237,27 +7370,36 @@ msgid ""
 "To work, MageiaUpdate needs the repositories to be configured with rpmdrake-"
 "edit-media with some media checked as updates. If they are not, you are "
 "prompted to do so."
-msgstr "Çalışması için, MageiaUpdate rpmdrake-edit-media ile yapılandırılacak bazı ortamların güncelleme için işaretlendiği depolara ihtiyaç duyar. Eğer öyle değilse, bu şekilde bilgilendirilirsiniz."
+msgstr ""
+"Çalışması için, MageiaUpdate rpmdrake-edit-media ile yapılandırılacak bazı "
+"ortamların güncelleme için işaretlendiği depolara ihtiyaç duyar. Eğer öyle "
+"değilse, bu şekilde bilgilendirilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:23
 msgid ""
 "As soon as this tool is launched, it scans the installed packages and lists "
-"those with an update available in the repositories. They are all selected by"
-" default to be automatically downloaded and installed. Click on the "
+"those with an update available in the repositories. They are all selected by "
+"default to be automatically downloaded and installed. Click on the "
 "<guibutton>Update</guibutton> button to start the process."
-msgstr "Bu araç başlatılır başlatılmaz, kurulu paketleri tarar ve depolarda güncelleme olanlarını listeler. Tümü varsayılan olarak otomatik olarak indirilecek şekilde seçilmiştir ve kurulur. İşlemin başlaması için <guibutton>Güncelle</guibutton> düğmesine tıklayınız. "
+msgstr ""
+"Bu araç başlatılır başlatılmaz, kurulu paketleri tarar ve depolarda "
+"güncelleme olanlarını listeler. Tümü varsayılan olarak otomatik olarak "
+"indirilecek şekilde seçilmiştir ve kurulur. İşlemin başlaması için "
+"<guibutton>Güncelle</guibutton> düğmesine tıklayınız. "
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:28
 msgid ""
-"By clicking on a package, more information is displayed in the lower half of"
-" the window. The print<emphasis role=\"bold\"> ></emphasis> before a title "
+"By clicking on a package, more information is displayed in the lower half of "
+"the window. The print<emphasis role=\"bold\"> ></emphasis> before a title "
 "means you can click to drop down a text."
-msgstr "Bir pakete tıklayarak, daha fazla bilgi pencerenin alt yarısında görüntülenir. Bir başlıktan önceki <emphasis role=\"bold\"> ></emphasis> işareti tıkladığınızda açılan bir metin anlamına gelir."
+msgstr ""
+"Bir pakete tıklayarak, daha fazla bilgi pencerenin alt yarısında "
+"görüntülenir. Bir başlıktan önceki <emphasis role=\"bold\"> ></emphasis> "
+"işareti tıkladığınızda açılan bir metin anlamına gelir."
 
-#. type: Attribute 'fileref' of:
-#. <section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><para><inlinemediaobject><imageobject><imagedata>
 #: en/MageiaUpdate.xml:36 en/mgaapplet-config.xml:21
 msgid "MageiaUpdate1.png"
 msgstr "MageiaUpdate1.png"
@@ -6266,17 +7408,19 @@ msgstr "MageiaUpdate1.png"
 #: en/MageiaUpdate.xml:33
 msgid ""
 "When updates are available, an applet in the system tray warns you by "
-"displaying this red icon <placeholder type=\"inlinemediaobject\" id=\"0\"/> "
-". Just click and enter the user password to update the system alike."
-msgstr "Güncellemeler müsait olduğunda, bir applet görev çubuğunda kırmızı bir simge <placeholder type=\"inlinemediaobject\" id=\"0\"/> göstererek sizi uyarır. Sistemi güncellemek için sadece tıklayın ve kullanıcı parolasını girin."
+"displaying this red icon <placeholder type=\"inlinemediaobject\" id=\"0\"/"
+"> . Just click and enter the user password to update the system alike."
+msgstr ""
+"Güncellemeler müsait olduğunda, bir applet görev çubuğunda kırmızı bir simge "
+"<placeholder type=\"inlinemediaobject\" id=\"0\"/> göstererek sizi uyarır. "
+"Sistemi güncellemek için sadece tıklayın ve kullanıcı parolasını girin."
 
 #. type: Content of: <section><info><title>
 #: en/mcc-boot.xml:5
 msgid "Boot"
 msgstr "Önyükleme"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-boot.xml:10
 msgid "mcc-boot.png"
 msgstr "mcc-boot.png"
@@ -6286,7 +7430,10 @@ msgstr "mcc-boot.png"
 msgid ""
 "In this screen you can choose between several tools to configure your boot "
 "steps. Click on a link below to learn more."
-msgstr "Bu ekranda önyükleme aşamalarında yapılandırmak için bir çok araç arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
+msgstr ""
+"Bu ekranda önyükleme aşamalarında yapılandırmak için bir çok araç arasından "
+"seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya "
+"tıklayın."
 
 #. type: Content of: <section><orderedlist><title>
 #: en/mcc-boot.xml:19
@@ -6313,8 +7460,7 @@ msgstr "<xref linkend=\"drakedm\"/>"
 msgid "Hardware"
 msgstr "Donanım"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-hardware.xml:9
 msgid "mcc-hardware.png"
 msgstr "mcc-hardware.png"
@@ -6324,23 +7470,25 @@ msgstr "mcc-hardware.png"
 msgid ""
 "In this screen you can choose between several tools to configure your "
 "hardware. Click on a link below to learn more."
-msgstr "Bu ekranda donanımınızı yapılandırmak için bir çok araç arasından seçim yapabilirsiniz.  Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
+msgstr ""
+"Bu ekranda donanımınızı yapılandırmak için bir çok araç arasından seçim "
+"yapabilirsiniz.  Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-hardware.xml:20
 msgid "Manage your hardware"
 msgstr "Donanımınızı yönetin"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:22
 msgid ""
-"<xref linkend=\"harddrake2\"/><emphasis> = Browse and configure "
-"hardware</emphasis>"
-msgstr "<xref linkend=\"harddrake2\"/><emphasis> = Donanım gözat ve yapılandır</emphasis>"
+"<xref linkend=\"harddrake2\"/><emphasis> = Browse and configure hardware</"
+"emphasis>"
+msgstr ""
+"<xref linkend=\"harddrake2\"/><emphasis> = Donanım gözat ve yapılandır</"
+"emphasis>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:27
 msgid "<xref linkend=\"draksound\"/>"
 msgstr "<xref linkend=\"draksound\"/>"
@@ -6350,16 +7498,16 @@ msgstr "<xref linkend=\"draksound\"/>"
 msgid "Configure graphics"
 msgstr "Ekran kartı yapılandırın"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:36
 msgid ""
-"<xref linkend=\"drak3d\"/><emphasis> = Configure 3D Desktop "
-"effects</emphasis>"
-msgstr "<xref linkend=\"drak3d\"/><emphasis> = 3D Masaüstü etkilerini yapılandır</emphasis>"
+"<xref linkend=\"drak3d\"/><emphasis> = Configure 3D Desktop effects</"
+"emphasis>"
+msgstr ""
+"<xref linkend=\"drak3d\"/><emphasis> = 3D Masaüstü etkilerini yapılandır</"
+"emphasis>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:41
 msgid "<xref linkend=\"XFdrake\"/>"
 msgstr "<xref linkend=\"XFdrake\"/>"
@@ -6369,14 +7517,12 @@ msgstr "<xref linkend=\"XFdrake\"/>"
 msgid "Configure mouse and keyboard"
 msgstr "Fare ve klavye yapılandırın"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:50
 msgid "<xref linkend=\"keyboarddrake\"/>"
 msgstr "<xref linkend=\"keyboarddrake\"/>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:54
 msgid "<xref linkend=\"mousedrake\"/>"
 msgstr "<xref linkend=\"mousedrake\"/>"
@@ -6386,16 +7532,16 @@ msgstr "<xref linkend=\"mousedrake\"/>"
 msgid "Configure printing and scanning"
 msgstr "Yazdırma ve tarama yapılandırın"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:63
 msgid ""
-"<xref linkend=\"system-config-printer\"/><emphasis> = Set up the printer(s),"
-" the print job queues, ...</emphasis>"
-msgstr "<xref linkend=\"system-config-printer\"/><emphasis> = Yazıcı(lar)ı ve yazdırma iş kuyruğunu ayarlayın ...</emphasis>"
+"<xref linkend=\"system-config-printer\"/><emphasis> = Set up the printer(s), "
+"the print job queues, ...</emphasis>"
+msgstr ""
+"<xref linkend=\"system-config-printer\"/><emphasis> = Yazıcı(lar)ı ve "
+"yazdırma iş kuyruğunu ayarlayın ...</emphasis>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:68
 msgid "<xref linkend=\"scannerdrake\"/>"
 msgstr "<xref linkend=\"scannerdrake\"/>"
@@ -6405,8 +7551,7 @@ msgstr "<xref linkend=\"scannerdrake\"/>"
 msgid "Others"
 msgstr "Diğerleri"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:77
 msgid "<xref linkend=\"drakups\"/>"
 msgstr "<xref linkend=\"drakups\"/>"
@@ -6423,13 +7568,16 @@ msgid ""
 "choose from in the left column, and even ten if the drakwizard package was "
 "installed. Each of these tabs gives a different set of tools that can be "
 "selected in the big right panel."
-msgstr "Mageia Denetim Merkezi (MDM) soldaki sütundan seçilebilecek sekiz değişik seçenek veya sekmeye sahiptir, ve eğer drakwizard paketi kurulu ise on tane daha olur. Bu sekmelerin her biri büyük sağ panelden seçilebilecek farklı araç kümeleri verir."
+msgstr ""
+"Mageia Denetim Merkezi (MDM) soldaki sütundan seçilebilecek sekiz değişik "
+"seçenek veya sekmeye sahiptir, ve eğer drakwizard paketi kurulu ise on tane "
+"daha olur. Bu sekmelerin her biri büyük sağ panelden seçilebilecek farklı "
+"araç kümeleri verir."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:8
 msgid ""
-"The ten following chapters are about those ten options and the related "
-"tools."
+"The ten following chapters are about those ten options and the related tools."
 msgstr "Takip eden on bölüm on seçenek ve onlarla ilgili araçlar hakkındadır."
 
 #. type: Content of: <section><para>
@@ -6437,29 +7585,34 @@ msgstr "Takip eden on bölüm on seçenek ve onlarla ilgili araçlar hakkındad�
 msgid ""
 "The last chapter is about some other Mageia tools, that cannot be chosen in "
 "any of the MCC tabs."
-msgstr "Son bölüm MDM sekmelerinden seçilebilmesi mümkün olmayan bazı diğer Mageia araçları hakkındadır, "
+msgstr ""
+"Son bölüm MDM sekmelerinden seçilebilmesi mümkün olmayan bazı diğer Mageia "
+"araçları hakkındadır, "
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:12
 msgid ""
 "The titles of the pages will often be the same as the titles of the tool "
 "screens."
-msgstr "Sayfaların başlıkları çoğunlukla araç ekranının başlıkları ile aynı olacaktır."
+msgstr ""
+"Sayfaların başlıkları çoğunlukla araç ekranının başlıkları ile aynı "
+"olacaktır."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:14
 msgid ""
 "There is also a search bar available, which you can access by clicking on "
 "the \"Search\" tab in the left column."
-msgstr "Ayrıca, sol tarafta \"Ara\" sekmesine tıklayarak erişebileceğiniz arama çubuğu vardır."
+msgstr ""
+"Ayrıca, sol tarafta \"Ara\" sekmesine tıklayarak erişebileceğiniz arama "
+"çubuğu vardır."
 
 #. type: Content of: <section><orderedlist><title>
 #: en/mcc-localdisks.xml:6 en/mcc-localdisks.xml:17
 msgid "Local disks"
 msgstr "Yerel diskler"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-localdisks.xml:11
 msgid "mcc-localdisks.png"
 msgstr "mcc-localdisks.png"
@@ -6469,7 +7622,10 @@ msgstr "mcc-localdisks.png"
 msgid ""
 "In this screen you can choose between several tools to manage or share your "
 "local disks. Click on a link below to learn more."
-msgstr "Bu ekranda yerel diskinizi yönetmeniz veya paylaşmanız için bir çok araç arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
+msgstr ""
+"Bu ekranda yerel diskinizi yönetmeniz veya paylaşmanız için bir çok araç "
+"arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki "
+"bağlantıya tıklayın."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-localdisks.xml:18
@@ -6491,8 +7647,7 @@ msgstr "<xref linkend=\"diskdrake--fileshare\"></xref>"
 msgid "Network Services"
 msgstr "Ağ Hizmetleri"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-networkservices.xml:9
 msgid "mcc-networkservices.png"
 msgstr "mcc-networkservices.png"
@@ -6500,11 +7655,16 @@ msgstr "mcc-networkservices.png"
 #. type: Content of: <section><para>
 #: en/mcc-networkservices.xml:15
 msgid ""
-"This screen and the one for <emphasis>Sharing</emphasis> are only visible if"
-" the <emphasis>drakwizard</emphasis> package is installed. You can choose "
+"This screen and the one for <emphasis>Sharing</emphasis> are only visible if "
+"the <emphasis>drakwizard</emphasis> package is installed. You can choose "
 "between several tools to set up different servers. Click on a link below or "
 "on <xref linkend=\"mcc-sharing\"/>to learn more."
-msgstr "Bu ekran ve <emphasis>Paylaşım</emphasis> için olanı sadece <emphasis>drakwizard</emphasis> paketi kurulu ise görünebilirdir. Farklı sunucuları ayarlamak için bir çok araç arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya veya <xref linkend=\"mcc-sharing\"/> tıklayınız."
+msgstr ""
+"Bu ekran ve <emphasis>Paylaşım</emphasis> için olanı sadece "
+"<emphasis>drakwizard</emphasis> paketi kurulu ise görünebilirdir. Farklı "
+"sunucuları ayarlamak için bir çok araç arasından seçim yapabilirsiniz. Daha "
+"fazlasını öğrenmek için aşağıdaki bağlantıya veya <xref linkend=\"mcc-sharing"
+"\"/> tıklayınız."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-networkservices.xml:19
@@ -6536,8 +7696,7 @@ msgstr "<xref linkend=\"drakwizard_sshd\"/>"
 msgid "Network Sharing"
 msgstr "Ağ Paylaşımı"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-networksharing.xml:9
 msgid "mcc-networksharing.png"
 msgstr "mcc-networksharing.png"
@@ -6547,40 +7706,41 @@ msgstr "mcc-networksharing.png"
 msgid ""
 "In this screen you can choose between several tools for sharing drives and "
 "directories. Click on a link below to learn more."
-msgstr "Bu ekranda sürücüleri ve dizinleri paylaşmak için bir çok araç arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
+msgstr ""
+"Bu ekranda sürücüleri ve dizinleri paylaşmak için bir çok araç arasından "
+"seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya "
+"tıklayın."
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-networksharing.xml:17
 msgid "Configure Windows(R) shares"
 msgstr "Windows(R) paylaşımlarını yapılandırın"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-networksharing.xml:18
 msgid "<xref linkend=\"diskdrake--smb\"></xref>"
 msgstr "<xref linkend=\"diskdrake--smb\"></xref>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-networksharing.xml:19
 msgid ""
 "<xref linkend=\"draksambashare\"></xref><emphasis> = Share drives and "
 "directories with Windows (SMB) systems</emphasis>"
-msgstr "<xref linkend=\"draksambashare\"></xref><emphasis> = Windows (SMB) sistemleri ile sürücü ve dizinleri paylaşın</emphasis>"
+msgstr ""
+"<xref linkend=\"draksambashare\"></xref><emphasis> = Windows (SMB) "
+"sistemleri ile sürücü ve dizinleri paylaşın</emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-networksharing.xml:22
 msgid "Configure NFS shares"
 msgstr "NFS paylaşımlarını yapılandırın"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-networksharing.xml:23
 msgid "<xref linkend=\"diskdrake--nfs\"></xref>"
 msgstr "<xref linkend=\"diskdrake--nfs\"></xref>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-networksharing.xml:24
 msgid "<xref linkend=\"draknfs\"></xref>"
 msgstr "<xref linkend=\"draknfs\"></xref>"
@@ -6590,8 +7750,7 @@ msgstr "<xref linkend=\"draknfs\"></xref>"
 msgid "Configure WebDAV shares"
 msgstr "WebDAV paylaşımlarını yapılandırın"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-networksharing.xml:28
 msgid "<xref linkend=\"diskdrake--dav\"></xref>"
 msgstr "<xref linkend=\"diskdrake--dav\"></xref>"
@@ -6601,8 +7760,7 @@ msgstr "<xref linkend=\"diskdrake--dav\"></xref>"
 msgid "Network and Internet"
 msgstr "Ağ ve İnternet"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-network.xml:8
 msgid "mcc-network.png"
 msgstr "mcc-network.png"
@@ -6610,29 +7768,28 @@ msgstr "mcc-network.png"
 #. type: Content of: <section><para>
 #: en/mcc-network.xml:12
 msgid ""
-"In this screen you can choose between several network tools. Click on a link"
-" below to learn more."
-msgstr "Bu ekranda bir çok ağ aracı arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
+"In this screen you can choose between several network tools. Click on a link "
+"below to learn more."
+msgstr ""
+"Bu ekranda bir çok ağ aracı arasından seçim yapabilirsiniz. Daha fazlasını "
+"öğrenmek için aşağıdaki bağlantıya tıklayın."
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-network.xml:18
 msgid "Manage your network devices"
 msgstr "Ağ aygıtlarınızı yönetin"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-network.xml:21
 msgid "<xref linkend=\"draknetcenter\"/>"
 msgstr "<xref linkend=\"draknetcenter\"/>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-network.xml:25
 msgid "<xref linkend=\"drakconnect\"/>"
 msgstr "<xref linkend=\"drakconnect\"/>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-network.xml:29
 msgid "<xref linkend=\"drakconnect--del\"/>"
 msgstr "<xref linkend=\"drakconnect--del\"/>"
@@ -6642,32 +7799,27 @@ msgstr "<xref linkend=\"drakconnect--del\"/>"
 msgid "Personalize and Secure your network"
 msgstr "Ağınızı Kişiselleştirin ve Güvenli hale getirin"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-network.xml:39
 msgid "<xref linkend=\"drakproxy\"/>"
 msgstr "<xref linkend=\"drakproxy\"/>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-network.xml:43
 msgid "<xref linkend=\"drakgw\"/>"
 msgstr "<xref linkend=\"drakgw\"/>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-network.xml:47
 msgid "<xref linkend=\"draknetprofile\"/>"
 msgstr "<xref linkend=\"draknetprofile\"/>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-network.xml:51
 msgid "<xref linkend=\"drakvpn\"/>"
 msgstr "<xref linkend=\"drakvpn\"/>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-network.xml:61
 msgid "<xref linkend=\"drakhosts\"/>"
 msgstr "<xref linkend=\"drakhosts\"/>"
@@ -6677,8 +7829,7 @@ msgstr "<xref linkend=\"drakhosts\"/>"
 msgid "Security"
 msgstr "Güvenlik"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-security.xml:10
 msgid "mcc-security.png"
 msgstr "mcc-security.png"
@@ -6688,14 +7839,18 @@ msgstr "mcc-security.png"
 msgid ""
 "In this screen you can choose between several security tools. Click on a "
 "link below to learn more."
-msgstr "Bu ekranda bir çok güvenlik aracı arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
+msgstr ""
+"Bu ekranda bir çok güvenlik aracı arasından seçim yapabilirsiniz. Daha "
+"fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-security.xml:20
 msgid ""
 "<xref linkend=\"msecgui\"/><emphasis> = Configure system security, "
 "permissions and audit</emphasis>"
-msgstr "<xref linkend=\"msecgui\"/><emphasis> = Sistem güvenliğini, izinleri ve yetkileri yapılandır</emphasis>"
+msgstr ""
+"<xref linkend=\"msecgui\"/><emphasis> = Sistem güvenliğini, izinleri ve "
+"yetkileri yapılandır</emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-security.xml:25
@@ -6722,8 +7877,7 @@ msgstr "<xref linkend=\"drakguard\"/>"
 msgid "Sharing"
 msgstr "Paylaşım"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-sharing.xml:9
 msgid "mcc-sharing.png"
 msgstr "mcc-sharing.png"
@@ -6732,10 +7886,15 @@ msgstr "mcc-sharing.png"
 #: en/mcc-sharing.xml:15
 msgid ""
 "This screen and the one for <emphasis>Network Services</emphasis> are only "
-"visible if the <emphasis>drakwizard</emphasis> package is installed. You can"
-" choose between several tools to set up different servers. Click on a link "
+"visible if the <emphasis>drakwizard</emphasis> package is installed. You can "
+"choose between several tools to set up different servers. Click on a link "
 "below or on <xref linkend=\"mcc-networkservices\"/>to learn more."
-msgstr "Bu ekran ve <emphasis>Ağ Hizmetleri</emphasis> için olanı sadece <emphasis>drakwizard</emphasis> paketi kurulu ise görünebilirdir. Farklı sunucuları ayarlamak için bir çok araç arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya veya <xref linkend=\"mcc-networkservices\"/> tıklayınız."
+msgstr ""
+"Bu ekran ve <emphasis>Ağ Hizmetleri</emphasis> için olanı sadece "
+"<emphasis>drakwizard</emphasis> paketi kurulu ise görünebilirdir. Farklı "
+"sunucuları ayarlamak için bir çok araç arasından seçim yapabilirsiniz. Daha "
+"fazlasını öğrenmek için aşağıdaki bağlantıya veya <xref linkend=\"mcc-"
+"networkservices\"/> tıklayınız."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-sharing.xml:19
@@ -6752,8 +7911,7 @@ msgstr "<xref linkend=\"drakwizard_apache2\"/>"
 msgid "System"
 msgstr "Sistem"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mcc-system.xml:9
 msgid "mcc-system.png"
 msgstr "mcc-system.png"
@@ -6763,27 +7921,26 @@ msgstr "mcc-system.png"
 msgid ""
 "In this screen you can choose between several system and administration "
 "tools. Click on a link below to learn more."
-msgstr "Bu ekranda bir çok sistem ve yönetim araçları arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
+msgstr ""
+"Bu ekranda bir çok sistem ve yönetim araçları arasından seçim "
+"yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><title>
 #: en/mcc-system.xml:18
 msgid "Manage system services"
 msgstr "Sistem hizmetlerini yönetin"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:20
 msgid "<xref linkend=\"drakauth\"></xref>"
 msgstr "<xref linkend=\"drakauth\"></xref>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:24
 msgid "<xref linkend=\"drakxservices\"></xref>"
 msgstr "<xref linkend=\"drakxservices\"></xref>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:28
 msgid "<xref linkend=\"drakfont\"></xref>"
 msgstr "<xref linkend=\"drakfont\"></xref>"
@@ -6793,14 +7950,12 @@ msgstr "<xref linkend=\"drakfont\"></xref>"
 msgid "Localization"
 msgstr "Yerelleştirme"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:37
 msgid "<xref linkend=\"drakclock\"></xref>"
 msgstr "<xref linkend=\"drakclock\"></xref>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:41
 msgid "<xref linkend=\"localedrake\"></xref>"
 msgstr "<xref linkend=\"localedrake\"></xref>"
@@ -6810,34 +7965,31 @@ msgstr "<xref linkend=\"localedrake\"></xref>"
 msgid "Administration tools"
 msgstr "Yönetim araçları"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:50
 msgid "<xref linkend=\"logdrake\"></xref>"
 msgstr "<xref linkend=\"logdrake\"></xref>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:54
 msgid "<xref linkend=\"drakconsole\"></xref>"
 msgstr "<xref linkend=\"drakconsole\"></xref>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:58
 msgid ""
-"<xref linkend=\"userdrake\"></xref><emphasis> = Manage users on "
-"system</emphasis>"
-msgstr "<xref linkend=\"userdrake\"></xref><emphasis> = Sistemdeki kullanıcıları yönetin</emphasis>"
+"<xref linkend=\"userdrake\"></xref><emphasis> = Manage users on system</"
+"emphasis>"
+msgstr ""
+"<xref linkend=\"userdrake\"></xref><emphasis> = Sistemdeki kullanıcıları "
+"yönetin</emphasis>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:62
 msgid "<xref linkend=\"transfugdrake\"></xref>"
 msgstr "<xref linkend=\"transfugdrake\"></xref>"
 
-#. type: Content of:
-#. <section><orderedlist><listitem><orderedlist><listitem><para>
+#. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:66
 msgid "<xref linkend=\"draksnapshot-config\"></xref>"
 msgstr "<xref linkend=\"draksnapshot-config\"></xref>"
@@ -6851,25 +8003,35 @@ msgstr "Mageia Denetim Merkezi"
 #: en/MCC.xml:6
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
-msgstr "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 ""
+"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>."
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:9
 msgid ""
-"This manual was produced with the help of the <link "
-"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
-"ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>."
-msgstr "Bu belge <link ns6:href=\"http://www.calenco.com\">Calenco CMS</link> yardımlarıyla üretilmiş <link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link> tarafından geliştirilmiştir."
+"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 ""
+"Bu belge <link ns6:href=\"http://www.calenco.com\">Calenco CMS</link> "
+"yardımlarıyla üretilmiş <link ns6:href=\"http://www.neodoc.biz\">NeoDoc</"
+"link> tarafından geliştirilmiştir."
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:11
 msgid ""
-"It was written by volunteers in their free time. Please contact <link "
-"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
-"Team</link>, if you would like to help improve this manual."
-msgstr "Gönüllüler tarafından onların boş zamanlarında yazılmıştır. Bu kılavuzun geliştirilmesine yardım etmek için lütfen <link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Belgelendirme Takımı</link> ile iletişime geçin. "
+"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 ""
+"Gönüllüler tarafından onların boş zamanlarında yazılmıştır. Bu kılavuzun "
+"geliştirilmesine yardım etmek için lütfen <link ns6:href=\"https://wiki."
+"mageia.org/en/Documentation_team\">Belgelendirme Takımı</link> ile iletişime "
+"geçin. "
 
 #. type: Content of: <section><info><title>
 #: en/mgaapplet-config.xml:3
@@ -6881,8 +8043,7 @@ msgstr "Güncelleme sıklığını yapılandırın"
 msgid "mgaapplet-config"
 msgstr "mgaapplet-config"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mgaapplet-config.xml:10
 msgid "mgaapplet-config.png"
 msgstr "mgaapplet-config.png"
@@ -6890,28 +8051,37 @@ msgstr "mgaapplet-config.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/mgaapplet-config.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">mgaapplet-config</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">mgaapplet-config</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">mgaapplet-config</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">mgaapplet-"
+"config</emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
-"Control Center under the tab <emphasis role=\"bold\">Software "
-"management</emphasis>. It is also available by a <guimenu>right click / "
-"Updates configuration</guimenu> on the red icon <placeholder "
-"type=\"inlinemediaobject\" id=\"1\"/> in the system tray."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezi <emphasis role=\"bold\">Yazılım yönetimi</emphasis> sekmesi altında bulunur. Ayrıca görev çubuğunda kırmızı simge üstünde <placeholder type=\"inlinemediaobject\" id=\"1\"/> <guimenu>sağ tık / Yapılandırmayı güncelle</guimenu>  ile erişilebilir."
+"Control Center under the tab <emphasis role=\"bold\">Software management</"
+"emphasis>. It is also available by a <guimenu>right click / Updates "
+"configuration</guimenu> on the red icon <placeholder type=\"inlinemediaobject"
+"\" id=\"1\"/> in the system tray."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezi "
+"<emphasis role=\"bold\">Yazılım yönetimi</emphasis> sekmesi altında bulunur. "
+"Ayrıca görev çubuğunda kırmızı simge üstünde <placeholder type="
+"\"inlinemediaobject\" id=\"1\"/> <guimenu>sağ tık / Yapılandırmayı güncelle</"
+"guimenu>  ile erişilebilir."
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:27
 msgid ""
 "The first slider allows you to change how frequently Mageia will check for "
 "updates and the second the delay after booting before the first check.  The "
-"check box gives you the option to be warned when a new Mageia release is "
-"out."
-msgstr "İlk kayan ekran Mageia'nın güncellemeleri ne sıklıkta denetleyeceğini değiştirmenizi sağlar ve ikincisi ilk denetimden sonra önyükleme gecikmesi içindir."
+"check box gives you the option to be warned when a new Mageia release is out."
+msgstr ""
+"İlk kayan ekran Mageia'nın güncellemeleri ne sıklıkta denetleyeceğini "
+"değiştirmenizi sağlar ve ikincisi ilk denetimden sonra önyükleme gecikmesi "
+"içindir."
 
 #. type: Content of: <section><info><title>
 #: en/mousedrake.xml:3
@@ -6923,8 +8093,7 @@ msgstr "İşaretleme aracı (fare, touchpad) yapılandır"
 msgid "mousedrake"
 msgstr "mousedrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/mousedrake.xml:11
 msgid "mousedrake.png"
 msgstr "mousedrake.png"
@@ -6932,23 +8101,30 @@ msgstr "mousedrake.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/mousedrake.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">mousedrake</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">mousedrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">mousedrake</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">mousedrake</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/mousedrake.xml:15
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
 "Control Center under the tab <emphasis role=\"bold\">Hardware</emphasis>."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde <emphasis role=\"bold\">Donanım</emphasis> sekmesinde bulunur."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
+"<emphasis role=\"bold\">Donanım</emphasis> sekmesinde bulunur."
 
 #. type: Content of: <section><para>
 #: en/mousedrake.xml:20
 msgid ""
-"As you must have a mouse to install Mageia, that one is already installed by"
-" Drakinstall. This tool allows installation of another mouse."
-msgstr "Mageia'yı kurmak için fareniz olması gerektiğinden, bu halihazırda Drakinstall tarafından kurulmuştur. Bu araç başka bir farenin kurulumunu sağlar."
+"As you must have a mouse to install Mageia, that one is already installed by "
+"Drakinstall. This tool allows installation of another mouse."
+msgstr ""
+"Mageia'yı kurmak için fareniz olması gerektiğinden, bu halihazırda "
+"Drakinstall tarafından kurulmuştur. Bu araç başka bir farenin kurulumunu "
+"sağlar."
 
 #. type: Content of: <section><para>
 #: en/mousedrake.xml:23
@@ -6957,7 +8133,11 @@ msgid ""
 "and click on <guibutton>OK</guibutton>. Most of the time \"Universal / Any "
 "PS/2 &amp; USB mice\" is suitable for a recent mouse. The new mouse is "
 "immediately taken into account."
-msgstr "Fareler bağlantı türüne göre ve sonra modeline göre sıralıdırlar. Farenizi seçin ve <guibutton>TAMAM</guibutton>a tıklayın. Çoğu zaman \"Universal / Any PS/2 &amp; USB mice\" yeni fareler için uygundur. Yeni fare hemen devreye girer."
+msgstr ""
+"Fareler bağlantı türüne göre ve sonra modeline göre sıralıdırlar. Farenizi "
+"seçin ve <guibutton>TAMAM</guibutton>a tıklayın. Çoğu zaman \"Universal / "
+"Any PS/2 &amp; USB mice\" yeni fareler için uygundur. Yeni fare hemen "
+"devreye girer."
 
 #. type: Content of: <section><info><title>
 #: en/msecgui.xml:3
@@ -6969,8 +8149,7 @@ msgstr "MSEC: Sistem Güvenliği ve Denetimi"
 msgid "msecgui"
 msgstr "msecgui"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:13
 msgid "msecgui.png"
 msgstr "msecgui.png"
@@ -6978,40 +8157,53 @@ msgstr "msecgui.png"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/msecgui.xml:21
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">msecgui</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak  <emphasis role=\"bold\">msecgui</emphasis> yazarak başlatabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">msecgui</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak  <emphasis role=\"bold\">msecgui</"
+"emphasis> yazarak başlatabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/msecgui.xml:21
 msgid ""
-"msecgui<placeholder type=\"footnote\" id=\"0\"/> is a graphic user interface"
-" for msec that allows to configure your system security according to two "
+"msecgui<placeholder type=\"footnote\" id=\"0\"/> is a graphic user interface "
+"for msec that allows to configure your system security according to two "
 "approaches:"
-msgstr "msecgui<placeholder type=\"footnote\" id=\"0\"/> msec için, sistem güvenliğini iki yaklaşıma göre yapılandırmaya izin veren bir grafik kullanıcı arayüzüdür:"
+msgstr ""
+"msecgui<placeholder type=\"footnote\" id=\"0\"/> msec için, sistem "
+"güvenliğini iki yaklaşıma göre yapılandırmaya izin veren bir grafik "
+"kullanıcı arayüzüdür:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:28
 msgid ""
 "It sets the system behaviour, msec imposes modifications to the system to "
 "make it more secure."
-msgstr "Bu, sistem davranışını ayarlar, msec sistemi daha güvenli olması için değişiklik yapmaya zorlar."
+msgstr ""
+"Bu, sistem davranışını ayarlar, msec sistemi daha güvenli olması için "
+"değişiklik yapmaya zorlar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:33
 msgid ""
 "It carries on periodic checks automatically on the system in order to warn "
 "you if something seems dangerous."
-msgstr "Bu, bir şeylerin tehlikeli görünmesi durumunda sizi uyarmak için, periyodik denetimleri sürdürür."
+msgstr ""
+"Bu, bir şeylerin tehlikeli görünmesi durumunda sizi uyarmak için, periyodik "
+"denetimleri sürdürür."
 
 #. type: Content of: <section><section><para>
 #: en/msecgui.xml:38
 msgid ""
-"msec uses the concept of \"security levels\" which are intended to configure"
-" a set of system permissions, which can be audited for changes or "
-"enforcement. Several of them are proposed by Mageia, but you can define your"
-" own customised security levels."
-msgstr "msec, bir dizi sistem izinlerini yapılandırma amacıyla, değşiklikler veya zorlamalar için denetim olabilecek \"güvenlik seviyeleri\" kavramını kullanır. Bunların bikaçı Mageia tarafından önerilir, fakat kendi özelleştirilmiş güvenlik seviyelerinizi tanımlayabilirsiniz."
+"msec uses the concept of \"security levels\" which are intended to configure "
+"a set of system permissions, which can be audited for changes or "
+"enforcement. Several of them are proposed by Mageia, but you can define your "
+"own customised security levels."
+msgstr ""
+"msec, bir dizi sistem izinlerini yapılandırma amacıyla, değşiklikler veya "
+"zorlamalar için denetim olabilecek \"güvenlik seviyeleri\" kavramını "
+"kullanır. Bunların bikaçı Mageia tarafından önerilir, fakat kendi "
+"özelleştirilmiş güvenlik seviyelerinizi tanımlayabilirsiniz."
 
 #. type: Content of: <section><section><title>
 #: en/msecgui.xml:45
@@ -7028,43 +8220,48 @@ msgstr "Aşağıdaki ekran görüntüsüne bakınız"
 msgid ""
 "The first tab takes up the list of the different security tools with a "
 "button on the right side to configure them:"
-msgstr "İlk sekme farklı güvenlik araçları listesini sağ tarafta onları yapılandırmak için bir düğmeyle alır:"
+msgstr ""
+"İlk sekme farklı güvenlik araçları listesini sağ tarafta onları "
+"yapılandırmak için bir düğmeyle alır:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:54
 msgid ""
 "Firewall, also found in the MCC / Security / Set up your personal firewall"
-msgstr "Güvenlik duvarı ayrıca MDM / Güvenlik / Kişisel güvenlik duvarınızı kurun içinde bulunabilir."
+msgstr ""
+"Güvenlik duvarı ayrıca MDM / Güvenlik / Kişisel güvenlik duvarınızı kurun "
+"içinde bulunabilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:59
 msgid "Updates, also found in MCC / Software Management / Update your system"
-msgstr "Güncellemeler, ayrıca MDM / Yazılım Yönetimi / Sisteminizi güncelleyin içinde bulunabilir."
+msgstr ""
+"Güncellemeler, ayrıca MDM / Yazılım Yönetimi / Sisteminizi güncelleyin "
+"içinde bulunabilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:64
 msgid "msec itself with some information:"
 msgstr "bazı bilgilerle msec'in kendisi:"
 
-#. type: Content of:
-#. <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/msecgui.xml:68
 msgid "enabled or not"
 msgstr "etkinleştir ya da etknleştirme"
 
-#. type: Content of:
-#. <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/msecgui.xml:72
 msgid "the configured Base security level"
 msgstr "Yapılandırılmış Temel güvenlik seviyesi"
 
-#. type: Content of:
-#. <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/msecgui.xml:76
 msgid ""
 "the date of the last Periodic checks and a button to see a detailed report "
 "and another button to execute the checks just now."
-msgstr "Son periyodik denetimin tarihi ve detaylı rapor için bir düğme ve denetimleri hemen gerçekleştiren bir başka düğme bulunur."
+msgstr ""
+"Son periyodik denetimin tarihi ve detaylı rapor için bir düğme ve "
+"denetimleri hemen gerçekleştiren bir başka düğme bulunur."
 
 #. type: Content of: <section><section><title>
 #: en/msecgui.xml:86
@@ -7074,13 +8271,13 @@ msgstr "Güvenlik ayarları sekmesi"
 #. type: Content of: <section><section><para>
 #: en/msecgui.xml:88
 msgid ""
-"A click on the second tab or on the Security "
-"<guibutton>Configure</guibutton> button leads to the same screen shown "
-"below."
-msgstr "İkinci sekmede veya Güvenlik <guibutton>Yapılandır</guibutton> düğmesine tıklama aşağıda gösterilen aynı ekrana götürür."
+"A click on the second tab or on the Security <guibutton>Configure</"
+"guibutton> button leads to the same screen shown below."
+msgstr ""
+"İkinci sekmede veya Güvenlik <guibutton>Yapılandır</guibutton> düğmesine "
+"tıklama aşağıda gösterilen aynı ekrana götürür."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:94
 msgid "msecgui2.png"
 msgstr "msecgui2.png"
@@ -7098,22 +8295,32 @@ msgstr "<emphasis role=\"underline\">Güvenlik seviyeleri:</emphasis>"
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:106
 msgid ""
-"After having checked the box <guilabel>Enable MSEC tool</guilabel>, this tab"
-" allows you by a double click to choose the security level that appears then"
-" in bold. If the box is not checked, the level « none » is applied. The "
+"After having checked the box <guilabel>Enable MSEC tool</guilabel>, this tab "
+"allows you by a double click to choose the security level that appears then "
+"in bold. If the box is not checked, the level « none » is applied. The "
 "following levels are available:"
-msgstr "<guilabel>MSEC aracını etkinleştir</guilabel> kutusunu işaretledikten sonra, bu sekme güvenlik seviyesini çift tıklayarak ve sonra kalın olarak göstererek seçmenizi sağlar. Eğer kutu işaretlenmiş değilse, « hiçbir » seviyesi uygulanır. Aşağıdaki seviyeler uygulanabilir:"
+msgstr ""
+"<guilabel>MSEC aracını etkinleştir</guilabel> kutusunu işaretledikten sonra, "
+"bu sekme güvenlik seviyesini çift tıklayarak ve sonra kalın olarak "
+"göstererek seçmenizi sağlar. Eğer kutu işaretlenmiş değilse, « hiçbir » "
+"seviyesi uygulanır. Aşağıdaki seviyeler uygulanabilir:"
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:113
 msgid ""
-"Level <emphasis role=\"bold\">none</emphasis>. This level is intended if you"
-" do not want to use msec to control system security, and prefer tuning it on"
-" your own. It disables all security checks and puts no restrictions or "
-"constraints on system configuration and settings. Please use this level only"
-" if you are knowing what you are doing, as it would leave your system "
+"Level <emphasis role=\"bold\">none</emphasis>. This level is intended if you "
+"do not want to use msec to control system security, and prefer tuning it on "
+"your own. It disables all security checks and puts no restrictions or "
+"constraints on system configuration and settings. Please use this level only "
+"if you are knowing what you are doing, as it would leave your system "
 "vulnerable to attack."
-msgstr "<emphasis role=\"bold\">hiçbir</emphasis> seviyesi. Bu seviye eğer sistem güvenliğini denetlemek için msec kullanmak istemiyorsanız, ve bunu kendi başınıza ayrlamak istiyorsanız kullanılır. Bütün güvenlik denetimlerini kaldırır ve sistem yapılandırması ve ayarları üzerinde hiçbir sınırlandırma ve baskı uygulamaz. Lütfen bu seviyeyi, sisteminizi zarar verici saldırılara karşı açık bırakacağında, ne yaptığınızı biliyorsanız kullanınız."
+msgstr ""
+"<emphasis role=\"bold\">hiçbir</emphasis> seviyesi. Bu seviye eğer sistem "
+"güvenliğini denetlemek için msec kullanmak istemiyorsanız, ve bunu kendi "
+"başınıza ayrlamak istiyorsanız kullanılır. Bütün güvenlik denetimlerini "
+"kaldırır ve sistem yapılandırması ve ayarları üzerinde hiçbir sınırlandırma "
+"ve baskı uygulamaz. Lütfen bu seviyeyi, sisteminizi zarar verici saldırılara "
+"karşı açık bırakacağında, ne yaptığınızı biliyorsanız kullanınız."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:122
@@ -7124,27 +8331,43 @@ msgid ""
 "detect changes in system files, system accounts, and vulnerable directory "
 "permissions. (This level is similar to levels 2 and 3 from past msec "
 "versions)."
-msgstr "<emphasis role=\"bold\">standard</emphasis> seviyesi. Bu kurulduğunda varsıyılan yapılandırmadır ve genel kullanıcılar içindir. Pek çok sistem ayarlarını sınırlar ve dosya sisteminde, sistem hesaplarında ve savunmasız dizin izinlerindeki değişimleri algılayan günlük güvenlik denetimleri gerçekleştirir. (Bu seviye önceki msec sürümündeki seviye 2 ve 3 ile benzerdir)."
+msgstr ""
+"<emphasis role=\"bold\">standard</emphasis> seviyesi. Bu kurulduğunda "
+"varsıyılan yapılandırmadır ve genel kullanıcılar içindir. Pek çok sistem "
+"ayarlarını sınırlar ve dosya sisteminde, sistem hesaplarında ve savunmasız "
+"dizin izinlerindeki değişimleri algılayan günlük güvenlik denetimleri "
+"gerçekleştirir. (Bu seviye önceki msec sürümündeki seviye 2 ve 3 ile "
+"benzerdir)."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:131
 msgid ""
-"Level <emphasis role=\"bold\">secure</emphasis>. This level is intended when"
-" you want to ensure your system is secure, yet usable.  It further restricts"
-" system permissions and executes more periodic checks. Moreover, access to "
-"the system is more restricted. (This level is similar to levels 4 (High) and"
-" 5 (Paranoid) from old msec versions)."
-msgstr "<emphasis role=\"bold\">güvenli</emphasis> eviyesi. Bu seviye sistemin güvenli olduğundan emin ve hala kullanılabilir olmasını istediğiniz durumlarda kullanılır. Sistem sınırlandırmalarını destekler ve daha çok periyodik denetimler yapar. Dahası, sisteme erişim daha çok sınırlandırılmıştır. (Bu seviye eski msec sürümlerindeki seviye 4 (Yüksek) ve seviye 5 (Paronoid) ile benzerdir)."
+"Level <emphasis role=\"bold\">secure</emphasis>. This level is intended when "
+"you want to ensure your system is secure, yet usable.  It further restricts "
+"system permissions and executes more periodic checks. Moreover, access to "
+"the system is more restricted. (This level is similar to levels 4 (High) and "
+"5 (Paranoid) from old msec versions)."
+msgstr ""
+"<emphasis role=\"bold\">güvenli</emphasis> eviyesi. Bu seviye sistemin "
+"güvenli olduğundan emin ve hala kullanılabilir olmasını istediğiniz "
+"durumlarda kullanılır. Sistem sınırlandırmalarını destekler ve daha çok "
+"periyodik denetimler yapar. Dahası, sisteme erişim daha çok "
+"sınırlandırılmıştır. (Bu seviye eski msec sürümlerindeki seviye 4 (Yüksek) "
+"ve seviye 5 (Paronoid) ile benzerdir)."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:140
 msgid ""
 "Besides those levels, different task-oriented security are also provided, "
-"such as the <emphasis role=\"bold\">fileserver </emphasis>, <emphasis "
-"role=\"bold\">webserver</emphasis> and <emphasis "
-"role=\"bold\">netbook</emphasis> levels. Such levels attempt to pre-"
-"configure system security according to the most common use cases."
-msgstr "Bu güvenlik seviyelerinin yanında, <emphasis role=\"bold\">dosyasunucu </emphasis>, <emphasis role=\"bold\">websunucu</emphasis> ve <emphasis role=\"bold\">netbook</emphasis> seviyeleri gibi farklı görev-odaklı güvenlik ayrıca sağlanır."
+"such as the <emphasis role=\"bold\">fileserver </emphasis>, <emphasis role="
+"\"bold\">webserver</emphasis> and <emphasis role=\"bold\">netbook</emphasis> "
+"levels. Such levels attempt to pre-configure system security according to "
+"the most common use cases."
+msgstr ""
+"Bu güvenlik seviyelerinin yanında, <emphasis role=\"bold\">dosyasunucu </"
+"emphasis>, <emphasis role=\"bold\">websunucu</emphasis> ve <emphasis role="
+"\"bold\">netbook</emphasis> seviyeleri gibi farklı görev-odaklı güvenlik "
+"ayrıca sağlanır."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:149
@@ -7152,25 +8375,36 @@ msgid ""
 "The last two levels called <emphasis role=\"bold\">audit_daily </emphasis> "
 "and <emphasis role=\"bold\">audit_weekly</emphasis> are not really security "
 "levels but rather tools for periodic checks only."
-msgstr "<emphasis role=\"bold\">günlük_denetim </emphasis> ve <emphasis role=\"bold\">aylık_denetim</emphasis> denen son iki seviye aslında gerçek güvenlik seviyelerinden ziyade sadece periyodik denetim için araçlardır."
+msgstr ""
+"<emphasis role=\"bold\">günlük_denetim </emphasis> ve <emphasis role=\"bold"
+"\">aylık_denetim</emphasis> denen son iki seviye aslında gerçek güvenlik "
+"seviyelerinden ziyade sadece periyodik denetim için araçlardır."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:156
 msgid ""
-"These levels are saved in "
-"<filename>etc/security/msec/level.&lt;levelname></filename>. You can define "
-"your own customised security levels, saving them into specific files called "
-"<filename>level.&lt;levelname></filename>, placed into the folder "
-"<filename>etc/security/msec/.</filename> This function is intended for power"
-" users which require a customised or more secure system configuration."
-msgstr "Bu seviyeler <filename>etc/security/msec/level.&lt;levelname></filename> içine kaydedilirler. Kendi özelleştirilmiş güvenlik seviyelerinizi tanımlayabilir, onları <filename>seviye.&lt;seviyeismi></filename> içine kaydedip, <filename>etc/security/msec/.</filename> içine yerleştirebilirsiniz. Bu işlem özelleştirilmiş ve daha güvenli sistem yapılandırması isteyen güçlü kullanıcılar içindir. "
+"These levels are saved in <filename>etc/security/msec/level.&lt;levelname></"
+"filename>. You can define your own customised security levels, saving them "
+"into specific files called <filename>level.&lt;levelname></filename>, placed "
+"into the folder <filename>etc/security/msec/.</filename> This function is "
+"intended for power users which require a customised or more secure system "
+"configuration."
+msgstr ""
+"Bu seviyeler <filename>etc/security/msec/level.&lt;levelname></filename> "
+"içine kaydedilirler. Kendi özelleştirilmiş güvenlik seviyelerinizi "
+"tanımlayabilir, onları <filename>seviye.&lt;seviyeismi></filename> içine "
+"kaydedip, <filename>etc/security/msec/.</filename> içine "
+"yerleştirebilirsiniz. Bu işlem özelleştirilmiş ve daha güvenli sistem "
+"yapılandırması isteyen güçlü kullanıcılar içindir. "
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:165
 msgid ""
 "Keep in mind that user-modified parameters take precedence over default "
 "level settings."
-msgstr "kullanıcı tarafından değiştirilen parametrelerin varsayılan seviye üzerinde bulunduğunu aklınızdan çıkarmayın."
+msgstr ""
+"kullanıcı tarafından değiştirilen parametrelerin varsayılan seviye üzerinde "
+"bulunduğunu aklınızdan çıkarmayın."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:170
@@ -7180,23 +8414,34 @@ msgstr "<emphasis role=\"underline\">Güvenlik ikazları:</emphasis>"
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:173
 msgid ""
-"If you check the box <guibutton>Send security alerts by email "
-"to:</guibutton>, the security alerts generated by msec are going to be sent "
-"by local e-mail to the security administrator named in the nearby field. You"
-" can fill either a local user or a complete e-mail address (the local e-mail"
-" and the e-mail manager must be set accordingly). At last, you can receive "
+"If you check the box <guibutton>Send security alerts by email to:</"
+"guibutton>, the security alerts generated by msec are going to be sent by "
+"local e-mail to the security administrator named in the nearby field. You "
+"can fill either a local user or a complete e-mail address (the local e-mail "
+"and the e-mail manager must be set accordingly). At last, you can receive "
 "the security alerts directly on your desktop.  Check the relevant box to "
 "enable it."
-msgstr "Eğer <guibutton>Güvenlik ikazlarını e-posta ile gönder :</guibutton> kutusunu işaretlerseniz, msec tarafından oluşturulan güvenlik ikazları alanın yanındaki güvenlik yöneticisi yerel e-posta adresine gönderilir. Yerel bir kullanıcı ya da tam e-posta adresi (yerel e-posta adresi ve e-posta yöneticisi uygun bir şekilde ayarlanmalıdır) girebilirsiniz. En azından, güvenlik ikazlarını doğrudan masaüstünde alabilirsiniz. Bunu etkinleştirmek için ilgili kutuyu işaretleyin. "
+msgstr ""
+"Eğer <guibutton>Güvenlik ikazlarını e-posta ile gönder :</guibutton> "
+"kutusunu işaretlerseniz, msec tarafından oluşturulan güvenlik ikazları "
+"alanın yanındaki güvenlik yöneticisi yerel e-posta adresine gönderilir. "
+"Yerel bir kullanıcı ya da tam e-posta adresi (yerel e-posta adresi ve e-"
+"posta yöneticisi uygun bir şekilde ayarlanmalıdır) girebilirsiniz. En "
+"azından, güvenlik ikazlarını doğrudan masaüstünde alabilirsiniz. Bunu "
+"etkinleştirmek için ilgili kutuyu işaretleyin. "
 
 #. type: Content of: <section><section><section><important><para>
 #: en/msecgui.xml:182
 msgid ""
 "It is strongly advisable to enable the security alerts option in order to "
-"immediately inform the security administrator of possible security problems."
-" If not, the administrator will have to regularly check the logs files "
+"immediately inform the security administrator of possible security problems. "
+"If not, the administrator will have to regularly check the logs files "
 "available in <filename>/var/log/security.</filename>"
-msgstr "Güvenlik ikazları seçeneğinin işaretlenmesi muhtemel güvenlik sorunlarının güvenlik yöneticisine hemen gönderilmesi için şiddetle tavsiye edilir. Eğer öyle değilse, yönetici <filename>/var/log/security.</filename> içinden erişilebilen günlük dosyalarını düzenli olarak denetlemek zorundadır."
+msgstr ""
+"Güvenlik ikazları seçeneğinin işaretlenmesi muhtemel güvenlik sorunlarının "
+"güvenlik yöneticisine hemen gönderilmesi için şiddetle tavsiye edilir. Eğer "
+"öyle değilse, yönetici <filename>/var/log/security.</filename> içinden "
+"erişilebilen günlük dosyalarını düzenli olarak denetlemek zorundadır."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:188
@@ -7207,12 +8452,18 @@ msgstr "<emphasis role=\"underline\">Güvenlik seçenekleri:</emphasis>"
 #: en/msecgui.xml:190
 msgid ""
 "Creating a customised level is not the only way to customise the computer "
-"security, it is also possible to use the tabs presented here after to change"
-" any option you want. Current configuration for msec is stored in "
-"<filename>/etc/security/msec/security.conf</filename>. This file contains "
-"the current security level name and the list of all the modifications done "
-"to the options."
-msgstr "Özelleştirilmiş bir güvenlik seviyesi oluşturmak bilgisayar güvenliğini özelleştirmek için tek yol değildir, burada bulunan sekmelerive istediğiniz seçenekleri değiştirmek de ayrıca mümkündür. msec için aktif yapılandırma <filename>/etc/security/msec/security.conf</filename> içinde saklanır. Bu dosya aktif güvenlik seviyesi ismini ve seçeneklerde yapılan tüm değişiklerin bir listesini içerir. "
+"security, it is also possible to use the tabs presented here after to change "
+"any option you want. Current configuration for msec is stored in <filename>/"
+"etc/security/msec/security.conf</filename>. This file contains the current "
+"security level name and the list of all the modifications done to the "
+"options."
+msgstr ""
+"Özelleştirilmiş bir güvenlik seviyesi oluşturmak bilgisayar güvenliğini "
+"özelleştirmek için tek yol değildir, burada bulunan sekmelerive istediğiniz "
+"seçenekleri değiştirmek de ayrıca mümkündür. msec için aktif yapılandırma "
+"<filename>/etc/security/msec/security.conf</filename> içinde saklanır. Bu "
+"dosya aktif güvenlik seviyesi ismini ve seçeneklerde yapılan tüm "
+"değişiklerin bir listesini içerir. "
 
 #. type: Content of: <section><section><section><title>
 #: en/msecgui.xml:199
@@ -7223,12 +8474,13 @@ msgstr "Sistem güvenlik sekmesi"
 #: en/msecgui.xml:201
 msgid ""
 "This tab displays all the security options on the left side column, a "
-"description in the centre column, and their current values on the right side"
-" column."
-msgstr "Bu sekme tüm güvenlik seçeneklerini sol taraftaki sütunda, tanımı merkez sütunda ve aktif değerini sağ sütunda gösterir."
+"description in the centre column, and their current values on the right side "
+"column."
+msgstr ""
+"Bu sekme tüm güvenlik seçeneklerini sol taraftaki sütunda, tanımı merkez "
+"sütunda ve aktif değerini sağ sütunda gösterir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:207
 msgid "msecgui3.png"
 msgstr "msecgui3.png"
@@ -7241,10 +8493,14 @@ msgid ""
 "actual and default values, and a drop down list where the new value can be "
 "selected. Click on the <guibutton>OK</guibutton> button to validate the "
 "choice."
-msgstr "Bir seçeneği değiştirmek için, üzerine çift tıklanır ve yeni bir pencere açılır (aşağıdaki ekran görüntüsüne bakınız). Bu, seçenek ismini, kısa bir tanımını, aktif ve varsayılan değerleri, ve yeni değerin seçilebileceği açılır bir listeyi görüntüler. Seçimleri doğrulamak için <guibutton>TAMAM</guibutton> düğmesine tıklayın."
+msgstr ""
+"Bir seçeneği değiştirmek için, üzerine çift tıklanır ve yeni bir pencere "
+"açılır (aşağıdaki ekran görüntüsüne bakınız). Bu, seçenek ismini, kısa bir "
+"tanımını, aktif ve varsayılan değerleri, ve yeni değerin seçilebileceği "
+"açılır bir listeyi görüntüler. Seçimleri doğrulamak için <guibutton>TAMAM</"
+"guibutton> düğmesine tıklayın."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:219
 msgid "msecgui11.png"
 msgstr "msecgui11.png"
@@ -7256,10 +8512,13 @@ msgid ""
 "using the menu <guimenu>File -> Save the configuration</guimenu>. If you "
 "have changed the settings, msecgui allows you to preview the changes before "
 "saving them."
-msgstr "msecgui'den çıkarken <guimenu>Dosya -> Yapılandırmayı kaydet</guimenu> yolulya yapılandırmanızı kaydetmeyi unutmayın. Eğer ayarlarda değişiklik yapyıysanız, msecgui kaydetmeden önce değşiklikleri önizleme yapmanızı sağlar."
+msgstr ""
+"msecgui'den çıkarken <guimenu>Dosya -> Yapılandırmayı kaydet</guimenu> "
+"yolulya yapılandırmanızı kaydetmeyi unutmayın. Eğer ayarlarda değişiklik "
+"yapyıysanız, msecgui kaydetmeden önce değşiklikleri önizleme yapmanızı "
+"sağlar."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:232
 msgid "msecgui10.png"
 msgstr "msecgui10.png"
@@ -7275,8 +8534,7 @@ msgid ""
 "This tab displays all the network options and works like the previous tab"
 msgstr "Bu sekme tüm ağ seçeneklerini gösterir ve önceki sekme gibi çalışır"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:245
 msgid "msecgui4.png"
 msgstr "msecgui4.png"
@@ -7291,7 +8549,10 @@ msgstr "Periyodik kontroller sekmesi"
 msgid ""
 "Periodic checks aim to inform the security administrator by means of "
 "security alerts of all situations msec thinks potentially dangerous."
-msgstr "Periyodik denetimler güvenlik yöneticisini msec'in potansiyel olarak tehlikeli olduğunu düşündüğü güvenlik ikazları için bilgilendirmesini amaçlar."
+msgstr ""
+"Periyodik denetimler güvenlik yöneticisini msec'in potansiyel olarak "
+"tehlikeli olduğunu düşündüğü güvenlik ikazları için bilgilendirmesini "
+"amaçlar."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:257
@@ -7299,10 +8560,12 @@ msgid ""
 "This tab displays all the periodic checks done by msec and their frequency "
 "if the box <guibutton>Enable periodic security checks</guibutton> is "
 "checked. Changes are done like in the previous tabs."
-msgstr "Bu sekme msec tarafından gerçekleştirilen ve eğer <guibutton>Periyodik güvenlik denetimlerini etkinleştir</guibutton> işaretli ise bunların sıklığını gösterir. Değişiklikler önceki sekmede olduğu gibi yapılır."
+msgstr ""
+"Bu sekme msec tarafından gerçekleştirilen ve eğer <guibutton>Periyodik "
+"güvenlik denetimlerini etkinleştir</guibutton> işaretli ise bunların "
+"sıklığını gösterir. Değişiklikler önceki sekmede olduğu gibi yapılır."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:264
 msgid "msecgui5.png"
 msgstr "msecgui5.png"
@@ -7316,14 +8579,18 @@ msgstr "İstisnalar sekmesi"
 #: en/msecgui.xml:272
 msgid ""
 "Sometimes alert messages are due to well known and wanted situations. In "
-"these cases they are useless and wasted time for the administrator. This tab"
-" allows you to create as many exceptions as you want to avoid unwanted alert"
-" messages. It is obviously empty at the first msec start. The screenshot "
+"these cases they are useless and wasted time for the administrator. This tab "
+"allows you to create as many exceptions as you want to avoid unwanted alert "
+"messages. It is obviously empty at the first msec start. The screenshot "
 "below shows four exceptions."
-msgstr "Bazen ikaz mesajları iyi bilinen ve istenen durumlardan kaynaklanır. Bu durumlarda bunlar kullanışsızdırlar ve sistem yöneticisinin zamanını harcarlar. Bu sekme istenmeyen mesajlardan kurtulmak için pek çok istisna oluşturmanıza izin verir. Açıktır ki msec ilk çalıştırıldığında boştur. Aşağıdaki ekran görüntüsü dört istina gösterir."
+msgstr ""
+"Bazen ikaz mesajları iyi bilinen ve istenen durumlardan kaynaklanır. Bu "
+"durumlarda bunlar kullanışsızdırlar ve sistem yöneticisinin zamanını "
+"harcarlar. Bu sekme istenmeyen mesajlardan kurtulmak için pek çok istisna "
+"oluşturmanıza izin verir. Açıktır ki msec ilk çalıştırıldığında boştur. "
+"Aşağıdaki ekran görüntüsü dört istina gösterir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:280
 msgid "msecgui6.png"
 msgstr "msecgui6.png"
@@ -7331,12 +8598,12 @@ msgstr "msecgui6.png"
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:284
 msgid ""
-"To create an exception, click on the <guibutton>Add a rule</guibutton> "
-"button"
-msgstr "Bir istisna oluşturmak için <guibutton>Bir kural ekle</guibutton> düğmesine tıklayınız"
+"To create an exception, click on the <guibutton>Add a rule</guibutton> button"
+msgstr ""
+"Bir istisna oluşturmak için <guibutton>Bir kural ekle</guibutton> düğmesine "
+"tıklayınız"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:289
 msgid "msecgui7.png"
 msgstr "msecgui7.png"
@@ -7345,12 +8612,16 @@ msgstr "msecgui7.png"
 #: en/msecgui.xml:293
 msgid ""
 "Select the wanted periodic check in the drop down list called "
-"<guilabel>Check</guilabel> and then, enter the "
-"<guilabel>Exception</guilabel> in the text area. Adding an exception is "
-"obviously not definitive, you can either delete it using the "
-"<guibutton>Delete</guibutton> button of the <guilabel>Exceptions</guilabel> "
-"tab or modify it with a double clicK."
-msgstr "İstenen periyodik denetimi <guilabel>Denetle</guilabel> ismindeki aşağı açılır listeden seçin ve sonra metin alanında <guilabel>İstisna</guilabel>yı giriniz. Bir istisna eklemek açıktır ki değiştirilmez değildir, bunu <guilabel>İstisnalar</guilabel> sekmesinin <guibutton>Sil</guibutton> düğmesini kullanarak veya çift tıklamayla düzenleyerek silebilirsiniz."
+"<guilabel>Check</guilabel> and then, enter the <guilabel>Exception</"
+"guilabel> in the text area. Adding an exception is obviously not definitive, "
+"you can either delete it using the <guibutton>Delete</guibutton> button of "
+"the <guilabel>Exceptions</guilabel> tab or modify it with a double clicK."
+msgstr ""
+"İstenen periyodik denetimi <guilabel>Denetle</guilabel> ismindeki aşağı "
+"açılır listeden seçin ve sonra metin alanında <guilabel>İstisna</guilabel>yı "
+"giriniz. Bir istisna eklemek açıktır ki değiştirilmez değildir, bunu "
+"<guilabel>İstisnalar</guilabel> sekmesinin <guibutton>Sil</guibutton> "
+"düğmesini kullanarak veya çift tıklamayla düzenleyerek silebilirsiniz."
 
 #. type: Content of: <section><section><section><title>
 #: en/msecgui.xml:303
@@ -7374,13 +8645,22 @@ msgid ""
 "the folder <filename>etc/security/msec/</filename> . This function is "
 "intended for power users which require a customised configuration. It is "
 "also possible to use the tab presented here after to change any permission "
-"you want. Current configuration is stored in "
-"<filename>/etc/security/msec/perms.conf.</filename> This file contains the "
-"list of all the modifications done to the permissions."
-msgstr "Pek çok güvenlik için olduğu gibi, msec farklı izin seviyelerine (standard, güvenli, ...) sahiptir, bunlar seçilen güvenlik seviyelerine bağlı olarak etkinleştirilir. Kendi özelleştirilmiş izin seviyelerinizi, onları <filename>etc/security/msec/</filename> dizini içinde bulunan <filename>izin.&lt;seviyeismi> </filename> ismindeki dosyaya yazarak oluşturabilirsiniz. Bu fonksiyon özelleştirilmiş yapılandırmaya ihtiyacı olan güçlü kullanıcılar içindir. Burada gösterilen sekmeyi istediğiniz herhangi bir izini değiştirmek için kullanmanız da mümkündür. Aktif yapılandırma <filename>/etc/security/msec/perms.conf.</filename> içinde saklanır. Bu dosya izinlerde yapılan  tüm değişikliklerin listesini içerir."
-
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+"you want. Current configuration is stored in <filename>/etc/security/msec/"
+"perms.conf.</filename> This file contains the list of all the modifications "
+"done to the permissions."
+msgstr ""
+"Pek çok güvenlik için olduğu gibi, msec farklı izin seviyelerine (standard, "
+"güvenli, ...) sahiptir, bunlar seçilen güvenlik seviyelerine bağlı olarak "
+"etkinleştirilir. Kendi özelleştirilmiş izin seviyelerinizi, onları "
+"<filename>etc/security/msec/</filename> dizini içinde bulunan <filename>izin."
+"&lt;seviyeismi> </filename> ismindeki dosyaya yazarak oluşturabilirsiniz. Bu "
+"fonksiyon özelleştirilmiş yapılandırmaya ihtiyacı olan güçlü kullanıcılar "
+"içindir. Burada gösterilen sekmeyi istediğiniz herhangi bir izini "
+"değiştirmek için kullanmanız da mümkündür. Aktif yapılandırma <filename>/etc/"
+"security/msec/perms.conf.</filename> içinde saklanır. Bu dosya izinlerde "
+"yapılan  tüm değişikliklerin listesini içerir."
+
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:318
 msgid "msecgui8.png"
 msgstr "msecgui8.png"
@@ -7389,18 +8669,25 @@ msgstr "msecgui8.png"
 #: en/msecgui.xml:321
 msgid ""
 "Default permissions are visible as a list of rules (a rule per line). You "
-"can see on the left side, the file or folder concerned by the rule, then the"
-" owner, then the group and then the permissions given by the rule. If, for a"
-" given rule:"
-msgstr "Varsayılan izinler bir kurallar listesi olarak (satır başına bir kural) gösterilir. Sol tarafta kural ile ilgili dosya veya dizini, ayrıca sahibi, ayrıca grubu ve kural tarafından verilen izini görebilirsiniz. Eğer, verilmiş bir kural için:"
+"can see on the left side, the file or folder concerned by the rule, then the "
+"owner, then the group and then the permissions given by the rule. If, for a "
+"given rule:"
+msgstr ""
+"Varsayılan izinler bir kurallar listesi olarak (satır başına bir kural) "
+"gösterilir. Sol tarafta kural ile ilgili dosya veya dizini, ayrıca sahibi, "
+"ayrıca grubu ve kural tarafından verilen izini görebilirsiniz. Eğer, "
+"verilmiş bir kural için:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:327
 msgid ""
-"the box <guilabel>Enforce</guilabel> is not checked, msec only checks if the"
-" defined permissions for this rule are respected and sends an alert message "
+"the box <guilabel>Enforce</guilabel> is not checked, msec only checks if the "
+"defined permissions for this rule are respected and sends an alert message "
 "if not, but does not change anything."
-msgstr "<guilabel>Zorla</guilabel> kutusu işaretlenmiş değilse, msec sadece bu kural için tanımlı izinlerin itibarlı olup olmadığını denetler ve değilse ikaz mesajı gönderir, fakat herhangi bir şeyi deiştirmez."
+msgstr ""
+"<guilabel>Zorla</guilabel> kutusu işaretlenmiş değilse, msec sadece bu kural "
+"için tanımlı izinlerin itibarlı olup olmadığını denetler ve değilse ikaz "
+"mesajı gönderir, fakat herhangi bir şeyi deiştirmez."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:333
@@ -7408,25 +8695,32 @@ msgid ""
 "the box <guilabel>Enforce</guilabel> is checked, then msec will rule the "
 "permissions respect at the first periodic check and overwrite the "
 "permissions."
-msgstr "<guilabel>Zorla</guilabel> düğmesi işaretli, öyleyse msec ilk periyodik denetimde izinleri yönetecek ve izinlerin üzerine yazacaktır."
+msgstr ""
+"<guilabel>Zorla</guilabel> düğmesi işaretli, öyleyse msec ilk periyodik "
+"denetimde izinleri yönetecek ve izinlerin üzerine yazacaktır."
 
 #. type: Content of: <section><section><section><important><para>
 #: en/msecgui.xml:337
 msgid ""
-"For this to work, the option CHECK_PERMS in the <emphasis "
-"role=\"bold\">Periodic check tab</emphasis> must be configured accordingly."
-msgstr "Bunun çalışması için <emphasis role=\"bold\">Periyodik denetim sekmesi</emphasis> içinde CHECK_PERMS seçeneği uygun bir şekilde yapılandırılmalı."
+"For this to work, the option CHECK_PERMS in the <emphasis role=\"bold"
+"\">Periodic check tab</emphasis> must be configured accordingly."
+msgstr ""
+"Bunun çalışması için <emphasis role=\"bold\">Periyodik denetim sekmesi</"
+"emphasis> içinde CHECK_PERMS seçeneği uygun bir şekilde yapılandırılmalı."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:339
 msgid ""
-"To create a new rule, click on the <guibutton> Add a rule</guibutton> button"
-" and fill the fields as shown in the example below. The joker * is allowed "
-"in the <guilabel>File</guilabel> field. “current” means no modification."
-msgstr "Yeni bir kural oluşturmak için, <guibutton> Kural ekle</guibutton> düğmesine tıklayın ve aşağıdaki örnekte gösterildiği gibi alanları doldurun. <guilabel>Dosya</guilabel> alanında * joker karakterine izin verilir. \"aktif\" hiç değişiklik olmaması anlamında gelir."
+"To create a new rule, click on the <guibutton> Add a rule</guibutton> button "
+"and fill the fields as shown in the example below. The joker * is allowed in "
+"the <guilabel>File</guilabel> field. “current” means no modification."
+msgstr ""
+"Yeni bir kural oluşturmak için, <guibutton> Kural ekle</guibutton> düğmesine "
+"tıklayın ve aşağıdaki örnekte gösterildiği gibi alanları doldurun. "
+"<guilabel>Dosya</guilabel> alanında * joker karakterine izin verilir. \"aktif"
+"\" hiç değişiklik olmaması anlamında gelir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:345
 msgid "msecgui9.png"
 msgstr "msecgui9.png"
@@ -7438,26 +8732,40 @@ msgid ""
 "not forget when leaving to save definitively your configuration using the "
 "menu <guimenu>File -> Save the configuration</guimenu>. If you have changed "
 "the settings, msecgui allows you to preview the changes before saving them."
-msgstr "Seçimi doğrulamak için <guibutton>OK</guibutton> düğmesine tıklayın ve çıkarken <guimenu>Dosya -> Yapılandırmayı kaydet</guimenu> yolulya yapılandırmanızı kaydetmeyi unutmayın. Eğer ayarlarda değişiklik yapyıysanız, msecgui kaydetmeden önce değşiklikleri önizleme yapmanızı sağlar."
+msgstr ""
+"Seçimi doğrulamak için <guibutton>OK</guibutton> düğmesine tıklayın ve "
+"çıkarken <guimenu>Dosya -> Yapılandırmayı kaydet</guimenu> yolulya "
+"yapılandırmanızı kaydetmeyi unutmayın. Eğer ayarlarda değişiklik "
+"yapyıysanız, msecgui kaydetmeden önce değşiklikleri önizleme yapmanızı "
+"sağlar."
 
 #. type: Content of: <section><section><section><note><para>
 #: en/msecgui.xml:353
 msgid ""
 "It is also possible to create or modify the rules by editing the "
 "configuration file <filename>/etc/security/msec/perms.conf</filename>."
-msgstr "<filename>/etc/security/msec/perms.conf</filename> dosyasını düzenleyerek de kural oluşturmak veya değiştirmek mümkündür."
+msgstr ""
+"<filename>/etc/security/msec/perms.conf</filename> dosyasını düzenleyerek de "
+"kural oluşturmak veya değiştirmek mümkündür."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:356
 msgid ""
 "Changes in the <emphasis role=\"bold\">Permission tab</emphasis> (or "
 "directly in the configuration file) are taken into account at the first "
-"periodic check (see the option CHECK_PERMS in the <emphasis "
-"role=\"bold\">Periodic checks tab</emphasis>). If you want them to be taken "
-"immediately into account, use the msecperms command in a console with root "
-"rights. You can use before, the msecperms -p command to know the permissions"
-" that will be changed by msecperms."
-msgstr "<emphasis role=\"bold\">İzin sekmesi</emphasis>ndeki değişiklikler (veya doğrudan yapılandırma dosyasındaki) ilk periyodik denetimde hesaba katılır  (bakınız <emphasis role=\"bold\">Periyodik denetimler sekmesi</emphasis> içinde CHECK_PERMS seçeneği). Bunların hemen hesaba katılmasını istiyorsanız, root hakları ile uç birimde msecperms komutunu kullanınız. Öncesinde  msecperms tarafından değiştirilecek izinleri öğrenmek için msecperms -p komutunu kullanabilirsiniz."
+"periodic check (see the option CHECK_PERMS in the <emphasis role=\"bold"
+"\">Periodic checks tab</emphasis>). If you want them to be taken immediately "
+"into account, use the msecperms command in a console with root rights. You "
+"can use before, the msecperms -p command to know the permissions that will "
+"be changed by msecperms."
+msgstr ""
+"<emphasis role=\"bold\">İzin sekmesi</emphasis>ndeki değişiklikler (veya "
+"doğrudan yapılandırma dosyasındaki) ilk periyodik denetimde hesaba katılır  "
+"(bakınız <emphasis role=\"bold\">Periyodik denetimler sekmesi</emphasis> "
+"içinde CHECK_PERMS seçeneği). Bunların hemen hesaba katılmasını "
+"istiyorsanız, root hakları ile uç birimde msecperms komutunu kullanınız. "
+"Öncesinde  msecperms tarafından değiştirilecek izinleri öğrenmek için "
+"msecperms -p komutunu kullanabilirsiniz."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:363
@@ -7468,7 +8776,13 @@ msgid ""
 "write the old permissions back after a while, accordingly to the "
 "configuration of the options CHECK_PERMS and CHECK_PERMS_ENFORCE in the "
 "<emphasis role=\"bold\">Periodic Checks tab </emphasis>."
-msgstr "Unutmayın, bir izini uç birimden veya bir dosya yöneticisi ile değiştirirseniz, <emphasis role=\"bold\">İzinler sekmesi </emphasis> içinde <guilabel>Zorla </guilabel> kutusu işaretli bir dosya için, msecgui bir süre sonra <emphasis role=\"bold\">Periyodik Denetimler Sekmesi </emphasis> içindeki CHECK_PERMS ve CHECK_PERMS_ENFORCE seçeneklerinin yapılandırmasına bağlı olarak eski izinleri geri yazacktır, "
+msgstr ""
+"Unutmayın, bir izini uç birimden veya bir dosya yöneticisi ile "
+"değiştirirseniz, <emphasis role=\"bold\">İzinler sekmesi </emphasis> içinde "
+"<guilabel>Zorla </guilabel> kutusu işaretli bir dosya için, msecgui bir süre "
+"sonra <emphasis role=\"bold\">Periyodik Denetimler Sekmesi </emphasis> "
+"içindeki CHECK_PERMS ve CHECK_PERMS_ENFORCE seçeneklerinin yapılandırmasına "
+"bağlı olarak eski izinleri geri yazacktır, "
 
 #. type: Content of: <section><info><title>
 #: en/otherMageiaTools.xml:4
@@ -7479,9 +8793,12 @@ msgstr "Diğer Mageia Araçları"
 #: en/otherMageiaTools.xml:7
 msgid ""
 "There are more Mageia tools than those that can be started in the Mageia "
-"Control Center. Click on a link below to learn more, or continue reading the"
-" next pages."
-msgstr "Mageia Denetim Merkezinden başlatılabilen araçlardan daha fazla Mageia aracı bulunur. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın ya da sonraki sayfayı okumaya devam edin."
+"Control Center. Click on a link below to learn more, or continue reading the "
+"next pages."
+msgstr ""
+"Mageia Denetim Merkezinden başlatılabilen araçlardan daha fazla Mageia aracı "
+"bulunur. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın ya da "
+"sonraki sayfayı okumaya devam edin."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/otherMageiaTools.xml:11
@@ -7518,8 +8835,7 @@ msgstr "Yazılım Yönetimi (Yazılım Kurun veya Kaldırın)"
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/rpmdrake.xml:11
 msgid "rpmdrake.png"
 msgstr "rpmdrake.png"
@@ -7532,9 +8848,11 @@ msgstr "rpmdrake'e giriş"
 #. type: Content of: <section><section><para><footnote><para>
 #: en/rpmdrake.xml:21
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">rpmdrake</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">rpmdrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">rpmdrake</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">rpmdrake</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/rpmdrake.xml:20
@@ -7548,269 +8866,341 @@ msgid ""
 "certain types of packages: you may display only installed applications (by "
 "default), or only available updates. You can also view only not installed "
 "packages. You can also search by the name of a package, or in the summaries "
-"of descriptions or in the full descriptions of packages or in the file names"
-" included in the packages."
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/>, ayrıca drakrpm olarak bilinir, paketleri kurmak, kaldırmak ve güncellemek için kullanılan bir programdır. URPMI'nin grafik kullanıcı arayüzüdür. Her açılışta, Mageia'nın resmi sunucularından indirilen çevrimiçi paket listesini ('ortam' denir) kontrol edecektir, ve bilgisayarınız için uygun en son paket ve uygulamaları gösterecektir. Bir filtreleme sistemi sadece belirli türdeki paketleri görüntülemenizi sağlar: sadece kurulu olan paketleri (varsayılan), veya sadece uygun güncellemeleri görüntüleyebilirsiniz. Ayrıca sadece kurulu olmayan paketleri de görüntüleyebilirsiniz. Ayrıca, bir paketin ismi ile, veya tanımlamaların özetinde veya paketlerin tam tanımlamaları içinde ya da pakete dahil dosyaların içinde arama yapabilirsiniz."
+"of descriptions or in the full descriptions of packages or in the file names "
+"included in the packages."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/>, ayrıca drakrpm olarak "
+"bilinir, paketleri kurmak, kaldırmak ve güncellemek için kullanılan bir "
+"programdır. URPMI'nin grafik kullanıcı arayüzüdür. Her açılışta, Mageia'nın "
+"resmi sunucularından indirilen çevrimiçi paket listesini ('ortam' denir) "
+"kontrol edecektir, ve bilgisayarınız için uygun en son paket ve uygulamaları "
+"gösterecektir. Bir filtreleme sistemi sadece belirli türdeki paketleri "
+"görüntülemenizi sağlar: sadece kurulu olan paketleri (varsayılan), veya "
+"sadece uygun güncellemeleri görüntüleyebilirsiniz. Ayrıca sadece kurulu "
+"olmayan paketleri de görüntüleyebilirsiniz. Ayrıca, bir paketin ismi ile, "
+"veya tanımlamaların özetinde veya paketlerin tam tanımlamaları içinde ya da "
+"pakete dahil dosyaların içinde arama yapabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/rpmdrake.xml:35
 msgid ""
-"To work, rpmdrake needs the repositories to be configured with <xref linkend"
-"=\"drakrpm-edit-media\"/> ."
-msgstr "Çalışması için, rpmdrake <xref linkend=\"drakrpm-edit-media\"/> ile yapılandırılacak depolara ihtiyaç duyar."
+"To work, rpmdrake needs the repositories to be configured with <xref linkend="
+"\"drakrpm-edit-media\"/> ."
+msgstr ""
+"Çalışması için, rpmdrake <xref linkend=\"drakrpm-edit-media\"/> ile "
+"yapılandırılacak depolara ihtiyaç duyar."
+
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+#, fuzzy
+msgid "rpmdrake8.png"
+msgstr "rpmdrake.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "Ekranın ana bölümleri"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Paket türü filtresi:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
 "interface. You can display either all the packages and all their "
-"dependencies and libraries or only package groups such as applications only,"
-" updates only or backported packages from newer versions of Mageia."
-msgstr "Bu filtre sadece belirli türdeki paketleri görüntülemenizi sağlar. Yöneticiyi ilk kez çalıştırdığınızda, sadece grafik arayüzlü uygulamaları gösterir. Tüm paketleri veya, onların tüm bağımlılıklarını ve kütüphanelerini ya da sadece uygulamalar, sadece güncellemeler veya Mageianın daha yeni sürümünden düzeltilmiş paketler gibi grupları görüntüleyebilirsiniz."
+"dependencies and libraries or only package groups such as applications only, "
+"updates only or backported packages from newer versions of Mageia."
+msgstr ""
+"Bu filtre sadece belirli türdeki paketleri görüntülemenizi sağlar. "
+"Yöneticiyi ilk kez çalıştırdığınızda, sadece grafik arayüzlü uygulamaları "
+"gösterir. Tüm paketleri veya, onların tüm bağımlılıklarını ve "
+"kütüphanelerini ya da sadece uygulamalar, sadece güncellemeler veya "
+"Mageianın daha yeni sürümünden düzeltilmiş paketler gibi grupları "
+"görüntüleyebilirsiniz."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
-"probably do not want command line or specialist tools.  Since you're reading"
-" this documentation, you're obviously interested in improving your knowledge"
-" of Mageia, so it is best to set this filter to \"All\"."
-msgstr "Varsayılan filtre ayarı Linux veya Mageia ile yeni tanışanlar içindir, ki bunlar komut satırı ve uzman araçları istemezler. Bu belgeyi okuduğunuza göre açıkça Mageia bilginizi geliştirmek istiyorsunuz, bu yüzden bu filtreyi \"Tümü\" yapmak en iyisidir."
+"probably do not want command line or specialist tools.  Since you're reading "
+"this documentation, you're obviously interested in improving your knowledge "
+"of Mageia, so it is best to set this filter to \"All\"."
+msgstr ""
+"Varsayılan filtre ayarı Linux veya Mageia ile yeni tanışanlar içindir, ki "
+"bunlar komut satırı ve uzman araçları istemezler. Bu belgeyi okuduğunuza "
+"göre açıkça Mageia bilginizi geliştirmek istiyorsunuz, bu yüzden bu filtreyi "
+"\"Tümü\" yapmak en iyisidir."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
-"<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> "
-"</firstterm>"
-msgstr "<firstterm> <emphasis role=\"bold\">Paket durumu filtresi:</emphasis> </firstterm>"
+"<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
+"firstterm>"
+msgstr ""
+"<firstterm> <emphasis role=\"bold\">Paket durumu filtresi:</emphasis> </"
+"firstterm>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
 "not installed."
-msgstr "Bu filtre sadece kurulu olan paketleri, kurulu olmayan paketleri veya kurulu veya kurulu olmayan tüm paketleri görmenizi sağlar, "
+msgstr ""
+"Bu filtre sadece kurulu olan paketleri, kurulu olmayan paketleri veya kurulu "
+"veya kurulu olmayan tüm paketleri görmenizi sağlar, "
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr "<emphasis role=\"bold\">Arama modu:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
 "in the packages."
-msgstr "Paket isimleri, özetleri, tam tanımlamaları veya paketin içerdiği dosyalar arasında arama yapmak için bu simgeye tıklayın. "
+msgstr ""
+"Paket isimleri, özetleri, tam tanımlamaları veya paketin içerdiği dosyalar "
+"arasında arama yapmak için bu simgeye tıklayın. "
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr "<emphasis role=\"bold\">\"Ara\" kutusu:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
 "\"xine\" at the same time type 'mplayer | xine'."
-msgstr "Buraya bir ya da daha fazla anahtar kelime girin. Arama için birden fazla anahtar kelime girmek istiyorsanız anahtar kelimeler arasında '|' kullanın, örn. Aynı anda \"mplayer\" ve \"xine\" aramak için 'mplayer | xine' yazın. "
+msgstr ""
+"Buraya bir ya da daha fazla anahtar kelime girin. Arama için birden fazla "
+"anahtar kelime girmek istiyorsanız anahtar kelimeler arasında '|' kullanın, "
+"örn. Aynı anda \"mplayer\" ve \"xine\" aramak için 'mplayer | xine' yazın. "
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr "<emphasis role=\"bold\">Tümünü sil:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
-msgstr "Bu simge \"Ara\" kutusuna girilmiş anahtar kelimeleri tek tıklamayla temizleyebilir."
+msgstr ""
+"Bu simge \"Ara\" kutusuna girilmiş anahtar kelimeleri tek tıklamayla "
+"temizleyebilir."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr "<emphasis role=\"bold\">Kategori listesi:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
-"This side bar groups all applications and packages into clear categories and"
-" sub categories."
-msgstr "Bu kenar çubuğu tüm uygulamaları ve paketleri net bir şekilde kategoriler ve alt kategoriler halinde gruplandırır. "
+"This side bar groups all applications and packages into clear categories and "
+"sub categories."
+msgstr ""
+"Bu kenar çubuğu tüm uygulamaları ve paketleri net bir şekilde kategoriler ve "
+"alt kategoriler halinde gruplandırır. "
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr "<emphasis role=\"bold\">Açıklama paneli:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
-"description. It displays many useful elements about the selected package. It"
-" can also show precise details about the package, the files included in the "
+"description. It displays many useful elements about the selected package. It "
+"can also show precise details about the package, the files included in the "
 "package as well as a list of the last changes made by the maintainer."
-msgstr "Bu panel paketin ismini, özetini ve tam tanımlamalarını gösterir. Seçilen paketle ilgili bir çok kullanışlı öğeler gösterir. Ayrıca paket ile ilgili tam detayları, pakete dahil edilmiş dosyalarla birlikte bakımcının yaptığı son değişikliği de gösterir. "
+msgstr ""
+"Bu panel paketin ismini, özetini ve tam tanımlamalarını gösterir. Seçilen "
+"paketle ilgili bir çok kullanışlı öğeler gösterir. Ayrıca paket ile ilgili "
+"tam detayları, pakete dahil edilmiş dosyalarla birlikte bakımcının yaptığı "
+"son değişikliği de gösterir. "
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "Durum sütunu"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
 "list of packages fulfilling your query and, don't forget, the chosen medium "
 "is shown with different status markers according to whether each package is "
 "installed/not installed/an update... To change this status, just check or "
-"uncheck the box before the package name and click on "
-"<guibutton>Apply</guibutton>."
-msgstr "Bir kez filtreyi doğru bir şekilde ayarladığınızda, yazılımınızı ya kategori (yukarıda alan 6) ya da alan 4 isim/özet/tanım yoluyla bulabilirsiniz. Sorgunuzu karşılayan bir paketler listesi ve unutmayın seçilen ortam her paketin kurulu/kurulu değil/güncelleme... durumuna bağlı olarak farklı durum işaretçisi ile gösterilir. Bu durumu değiştirmek için sadece paket isminin önündeki kutuyu işaretleyin ve <guibutton>Uygula</guibutton> butonuna tıklayın."
-
-#. type: Content of:
-#. <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+"uncheck the box before the package name and click on <guibutton>Apply</"
+"guibutton>."
+msgstr ""
+"Bir kez filtreyi doğru bir şekilde ayarladığınızda, yazılımınızı ya kategori "
+"(yukarıda alan 6) ya da alan 4 isim/özet/tanım yoluyla bulabilirsiniz. "
+"Sorgunuzu karşılayan bir paketler listesi ve unutmayın seçilen ortam her "
+"paketin kurulu/kurulu değil/güncelleme... durumuna bağlı olarak farklı durum "
+"işaretçisi ile gösterilir. Bu durumu değiştirmek için sadece paket isminin "
+"önündeki kutuyu işaretleyin ve <guibutton>Uygula</guibutton> butonuna "
+"tıklayın."
+
+#. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Simge"
 
-#. type: Content of:
-#. <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr "Gösterge"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "rpmdrake2.png"
 
-#. type: Content of:
-#. <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr "Bu paket zaten kurulu"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "rpmdrake3.png"
 
-#. type: Content of:
-#. <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr "Bu paket kurulacak"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "rpmdrake4.png"
 
-#. type: Content of:
-#. <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr "Bu paket değiştirilemez"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "rpmdrake5.png"
 
-#. type: Content of:
-#. <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr "Bu paket bir güncelleştirme"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "rpmdrake6.png"
 
-#. type: Content of:
-#. <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr "Bu paket kaldırılacak"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr "Yukarıdaki ekran görüntüsündeki örnekler:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
 "on <guibutton>Apply</guibutton>."
-msgstr "Eğer digikam  seçimini kaldırırsam (yeşil ok bize kurulu olduğunu söyler), durum simgesi kırmızı yukarı ok olur ve <guibutton>Uygula</guibutton> düğmesine tıkladığımızda kaldırılır."
+msgstr ""
+"Eğer digikam  seçimini kaldırırsam (yeşil ok bize kurulu olduğunu söyler), "
+"durum simgesi kırmızı yukarı ok olur ve <guibutton>Uygula</guibutton> "
+"düğmesine tıkladığımızda kaldırılır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
 "clicking on <guibutton>Apply</guibutton>."
-msgstr "Eğer qdigidoc seçersem (kurulu değildir, duruma bakınız),turuncu  aşağı ok simgesi gözükür ve <guibutton>Uygula</guibutton> düğmesine tıkladığımızda kurulur."
+msgstr ""
+"Eğer qdigidoc seçersem (kurulu değildir, duruma bakınız),turuncu  aşağı ok "
+"simgesi gözükür ve <guibutton>Uygula</guibutton> düğmesine tıkladığımızda "
+"kurulur."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr "Bağımlılıklar"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
-"Some packages need other packages called dependencies in order to work. They"
-" are for example libraries or tools. In this case, Rpmdrake displays an "
+"Some packages need other packages called dependencies in order to work. They "
+"are for example libraries or tools. In this case, Rpmdrake displays an "
 "information window allowing you to choose whether to accept the selected "
 "dependencies, cancel the operation or get more information (see above). It "
 "may also happen that various packages are able to provide the needed "
 "library, in which case rpmdrake displays the list of alternatives with a "
-"button to get more information and another button to choose which package to"
-" install."
-msgstr "Bazı paketler çalışabilmeleri için bağımlılıklar denen paketlere ihtiyaç duyarlar. Örneğin bunlar kütüphanelerdir ya da araçlardır. Bu durumda, Rpmdrake seçilen bağımlılıkları kabul edip etmediğinizi soran, işlemi iptal etmenizi veya daha fazla bilgi almanızı sağlayan bir pencere gösterir (yukarıya bakınız). Bu ayrıca çeşitli paketler gerekli kütüphaneleri sağlayabilecekleri zaman meydana gelebilir, bu durumda rpmdrake alternatif listesini daha fazla bilgi veren bir düğme ve hangi paketlerin kurulacağını seçtiren bir düğme ile gösterir."
+"button to get more information and another button to choose which package to "
+"install."
+msgstr ""
+"Bazı paketler çalışabilmeleri için bağımlılıklar denen paketlere ihtiyaç "
+"duyarlar. Örneğin bunlar kütüphanelerdir ya da araçlardır. Bu durumda, "
+"Rpmdrake seçilen bağımlılıkları kabul edip etmediğinizi soran, işlemi iptal "
+"etmenizi veya daha fazla bilgi almanızı sağlayan bir pencere gösterir "
+"(yukarıya bakınız). Bu ayrıca çeşitli paketler gerekli kütüphaneleri "
+"sağlayabilecekleri zaman meydana gelebilir, bu durumda rpmdrake alternatif "
+"listesini daha fazla bilgi veren bir düğme ve hangi paketlerin kurulacağını "
+"seçtiren bir düğme ile gösterir."
 
 #. type: Content of: <section><info><title>
 #: en/scannerdrake.xml:10
@@ -7832,7 +9222,9 @@ msgstr "Kurulum"
 msgid ""
 "You can start this tool from the command line, by typing "
 "<emphasis>scannerdrake</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis>scannerdrake</emphasis> yazarak çalıştırabilirsiniz."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis>scannerdrake</emphasis> "
+"yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:21
@@ -7841,7 +9233,11 @@ msgid ""
 "a single scanner device or a multifunction device which includes scanning. "
 "It also allows you to share local devices connected to this computer with a "
 "remote computer or to access remote scanners."
-msgstr "Bu araç <placeholder type=\"footnote\" id=\"0\"/> bir tekil tarayıcıyı veya taramayı da içeren çok fonksiyonlu bir aygıtı yapılandırmanızı sağlar. Ayrıca bu bilgisayara uzaktan bağlı veya uzak tarayıcıya erişim için yerel aygıtları paylaşıma izin verir."
+msgstr ""
+"Bu araç <placeholder type=\"footnote\" id=\"0\"/> bir tekil tarayıcıyı veya "
+"taramayı da içeren çok fonksiyonlu bir aygıtı yapılandırmanızı sağlar. "
+"Ayrıca bu bilgisayara uzaktan bağlı veya uzak tarayıcıya erişim için yerel "
+"aygıtları paylaşıma izin verir."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:29
@@ -7854,7 +9250,9 @@ msgstr "Bu aracı ilk kez çalıştırdığınızda şu mesajı alabilirsiniz:"
 #: en/scannerdrake.xml:32
 msgid ""
 "<emphasis>\"SANE packages need to be installed to use scanners</emphasis>"
-msgstr "<emphasis>\"Tarayıcıların kullanılabilmesi için SANE paketlerinin kurulması gerekiyor</emphasis>"
+msgstr ""
+"<emphasis>\"Tarayıcıların kullanılabilmesi için SANE paketlerinin kurulması "
+"gerekiyor</emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:35
@@ -7866,10 +9264,11 @@ msgstr "<emphasis>SANE paketlerini kurmak istiyor musunuz?\"</emphasis>"
 msgid ""
 "Choose <emphasis>Yes</emphasis> to continue. It will install <code>scanner-"
 "gui</code> and <code>task-scanning</code> if they are not yet installed."
-msgstr "Devam etmek için <emphasis>Evet</emphasis>i seçiniz. Bu kurulu değillerse <code>scanner-gui</code>yi ve <code>task-scanning</code>i kuracaktır."
+msgstr ""
+"Devam etmek için <emphasis>Evet</emphasis>i seçiniz. Bu kurulu değillerse "
+"<code>scanner-gui</code>yi ve <code>task-scanning</code>i kuracaktır."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:44
 msgid "scannerdrake.png"
 msgstr "scannerdrake.png"
@@ -7880,15 +9279,22 @@ msgid ""
 "If your scanner is identified correctly, so if in the above screen you see "
 "the name of your scanner, the scanner is ready for use with, for instance, "
 "<emphasis>XSane</emphasis> or <emphasis>Simple Scan</emphasis>."
-msgstr "Eğer tarayıcınız doğru bir şekilde tanımlandıysa, ve böylece yukarıdaki ekranda tarayıcınızın ismini görüyorsanız, tarayıcı, örneğin, <emphasis>XSane</emphasis> veya <emphasis>Simple Scan</emphasis> ile kullanıma hazırdır."
+msgstr ""
+"Eğer tarayıcınız doğru bir şekilde tanımlandıysa, ve böylece yukarıdaki "
+"ekranda tarayıcınızın ismini görüyorsanız, tarayıcı, örneğin, "
+"<emphasis>XSane</emphasis> veya <emphasis>Simple Scan</emphasis> ile "
+"kullanıma hazırdır."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:55
 msgid ""
 "In that case, you might now want to want to configure the <emphasis>Scanner "
-"sharing</emphasis> option. You can read about it in the <xref "
-"linkend=\"scannersharing\"/>."
-msgstr "O durumda, <emphasis>Tarayıcı paylaşımı</emphasis> seçeneğini yapılandırmak isteyebilirsiniz. Bunun hakkında <xref linkend=\"scannersharing\"/> ı okuyabilirsiniz."
+"sharing</emphasis> option. You can read about it in the <xref linkend="
+"\"scannersharing\"/>."
+msgstr ""
+"O durumda, <emphasis>Tarayıcı paylaşımı</emphasis> seçeneğini yapılandırmak "
+"isteyebilirsiniz. Bunun hakkında <xref linkend=\"scannersharing\"/> ı "
+"okuyabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:59
@@ -7897,17 +9303,22 @@ msgid ""
 "cable(s) and power switch and then pressing <emphasis>Search for new "
 "scanners</emphasis> doesn't help, you'll need to press <emphasis>Add a "
 "scanner manually</emphasis>."
-msgstr "Diğer taraftan, tarayıcınız doğru bir şekilde tanımlanmamışsa, ve kablo(lar)ını, güç düğmesini kontrol etmek ve <emphasis>Yeni bir tarayıcı ara</emphasis> işe yaramadıysa, <emphasis>Elle bir tarayıcı ekle</emphasis> düğmesine basmanız gerekir."
+msgstr ""
+"Diğer taraftan, tarayıcınız doğru bir şekilde tanımlanmamışsa, ve "
+"kablo(lar)ını, güç düğmesini kontrol etmek ve <emphasis>Yeni bir tarayıcı "
+"ara</emphasis> işe yaramadıysa, <emphasis>Elle bir tarayıcı ekle</emphasis> "
+"düğmesine basmanız gerekir."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:64
 msgid ""
-"Choose the brand of your scanner in the list you see, then its type from the"
-" list for that brand and click <emphasis>Ok</emphasis>"
-msgstr "Gördüğünüz listede tarayıcınızın markasınız seçiniz, sonra o marka için türünü seçiniz ve <emphasis>Tamam</emphasis>a tıklayınız"
+"Choose the brand of your scanner in the list you see, then its type from the "
+"list for that brand and click <emphasis>Ok</emphasis>"
+msgstr ""
+"Gördüğünüz listede tarayıcınızın markasınız seçiniz, sonra o marka için "
+"türünü seçiniz ve <emphasis>Tamam</emphasis>a tıklayınız"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:69
 msgid "scannerdrake2.png"
 msgstr "scannerdrake2.png"
@@ -7915,59 +9326,74 @@ msgstr "scannerdrake2.png"
 #. type: Content of: <section><section><note><para>
 #: en/scannerdrake.xml:76
 msgid ""
-"If you can't find your scanner in the list, then click "
-"<emphasis>Cancel</emphasis>"
-msgstr "Tarayıcınızı listede göremiyorsanız <emphasis>İptal</emphasis> düğmesini tıklayın"
+"If you can't find your scanner in the list, then click <emphasis>Cancel</"
+"emphasis>"
+msgstr ""
+"Tarayıcınızı listede göremiyorsanız <emphasis>İptal</emphasis> düğmesini "
+"tıklayın"
 
 #. type: Content of: <section><section><note><para>
 #: en/scannerdrake.xml:79
 msgid ""
-"Please check whether your scanner is supported on the <link "
-"xlink:href=\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: "
-"Supported Devices</link> page and ask for help in the <link "
-"xlink:href=\"http://forums.mageia.org/en/\">forums</link>."
-msgstr "Lütfen tarayıcınızın <link xlink:href=\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: Desteklenen Cihazlar</link> sayfasında destekli olduğunu kontrol ediniz ve yardım için  <link xlink:href=\"http://forums.mageia.org/en/\">forumlar</link>ı kullanınız."
+"Please check whether your scanner is supported on the <link xlink:href="
+"\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: Supported "
+"Devices</link> page and ask for help in the <link xlink:href=\"http://forums."
+"mageia.org/en/\">forums</link>."
+msgstr ""
+"Lütfen tarayıcınızın <link xlink:href=\"http://www.sane-project.org/lists/"
+"sane-mfgs-cvs.html\">SANE: Desteklenen Cihazlar</link> sayfasında destekli "
+"olduğunu kontrol ediniz ve yardım için  <link xlink:href=\"http://forums."
+"mageia.org/en/\">forumlar</link>ı kullanınız."
 
 #. type: Content of: <section><section><figure><info><title>
 #: en/scannerdrake.xml:87
 msgid "Choose port"
 msgstr "Port seçin"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><figure><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><figure><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:91
 msgid "scannerdrake3.png"
 msgstr "scannerdrake3.png"
 
 #. type: Content of: <section><section><figure>
 #: en/scannerdrake.xml:86
-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><section><para>
 #: en/scannerdrake.xml:97
 msgid ""
-"You can leave this setting to <emphasis>Auto-detect available "
-"ports</emphasis> unless your scanner's interface is a parallel port. In that"
-" case, select <emphasis>/dev/parport0</emphasis> if you have only one."
-msgstr "Bu ayarı tarayıcınızın arayüzü paralel port değilse <emphasis>Uygun portları otomatik olarak algıla</emphasis> şeklinde bırakabilirsiniz. Diğer durumda, eğer sadece bir tane varsa <emphasis>/dev/parport0</emphasis> seçiniz."
+"You can leave this setting to <emphasis>Auto-detect available ports</"
+"emphasis> unless your scanner's interface is a parallel port. In that case, "
+"select <emphasis>/dev/parport0</emphasis> if you have only one."
+msgstr ""
+"Bu ayarı tarayıcınızın arayüzü paralel port değilse <emphasis>Uygun portları "
+"otomatik olarak algıla</emphasis> şeklinde bırakabilirsiniz. Diğer durumda, "
+"eğer sadece bir tane varsa <emphasis>/dev/parport0</emphasis> seçiniz."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:102
 msgid ""
 "After clicking <emphasis>Ok</emphasis>, in most cases you will see a screen "
 "similar to the one below."
-msgstr "<emphasis>Tamam</emphasis> düğmesini tıkladıktan sonra, pek çok durumda, aşağıdakine benzer bir ekran göreceksiniz."
+msgstr ""
+"<emphasis>Tamam</emphasis> düğmesini tıkladıktan sonra, pek çok durumda, "
+"aşağıdakine benzer bir ekran göreceksiniz."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:104
 msgid ""
-"If you don't get that screen, then please read the <xref "
-"linkend=\"scannerextrasteps\"/>."
-msgstr "Eğer o ekran gelmediyse lütfen <xref linkend=\"scannerextrasteps\"/> belgesini okuyun."
+"If you don't get that screen, then please read the <xref linkend="
+"\"scannerextrasteps\"/>."
+msgstr ""
+"Eğer o ekran gelmediyse lütfen <xref linkend=\"scannerextrasteps\"/> "
+"belgesini okuyun."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:108
 msgid "scannerdrake4.png"
 msgstr "scannerdrake4.png"
@@ -7977,8 +9403,7 @@ msgstr "scannerdrake4.png"
 msgid "Scannersharing"
 msgstr "Ekranpaylaşımı"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:122
 msgid "scannerdrake5.png"
 msgstr "scannerdrake5.png"
@@ -7986,11 +9411,15 @@ msgstr "scannerdrake5.png"
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:128
 msgid ""
-"Here you can choose whether the scanners connected to this machine should be"
-" accessible by remote machines and by which remote machines. You can also "
+"Here you can choose whether the scanners connected to this machine should be "
+"accessible by remote machines and by which remote machines. You can also "
 "decide here whether scanners on remote machines should be made available on "
 "this machine."
-msgstr "Burada, bu makineye bağlanan tarayıcılara uzak makinelerden erişilip erişilemeyeceğini ve hangi uzak makinelerden erişilebileceğini ayarlayabilirsiniz. Ayrıca uzaktaki makinedeki tarayıcıların bu makineden erişilebilir olup olmadığına karar verebilirsiniz."
+msgstr ""
+"Burada, bu makineye bağlanan tarayıcılara uzak makinelerden erişilip "
+"erişilemeyeceğini ve hangi uzak makinelerden erişilebileceğini "
+"ayarlayabilirsiniz. Ayrıca uzaktaki makinedeki tarayıcıların bu makineden "
+"erişilebilir olup olmadığına karar verebilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:133
@@ -7998,17 +9427,22 @@ msgid ""
 "Scanner sharing to hosts : name or IP address of hosts can be added or "
 "deleted from the list of hosts allowed to access the local device(s), on "
 "this computer."
-msgstr "Makineleretarayıcı paylaşımı : mekinelerin isim veya IP adresi bu bilgisayardaki yerel cihaz(lar)a erişim izni verilen mekineler listesine eklenebilir veya buradan silinebilir."
+msgstr ""
+"Makineleretarayıcı paylaşımı : mekinelerin isim veya IP adresi bu "
+"bilgisayardaki yerel cihaz(lar)a erişim izni verilen mekineler listesine "
+"eklenebilir veya buradan silinebilir."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:137
 msgid ""
 "Usage of remote scanners : name or IP address of hosts can added or deleted "
 "from the list of hosts which give access to a remote scanner."
-msgstr "Uzak tarayıcıların kullanımı : makinelerinisim veya IP adresi uzaktaki tarayıcılara erişim izni verilen mekinelerlistesine eklenebilir veya buradan silinebilir."
+msgstr ""
+"Uzak tarayıcıların kullanımı : makinelerinisim veya IP adresi uzaktaki "
+"tarayıcılara erişim izni verilen mekinelerlistesine eklenebilir veya buradan "
+"silinebilir."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:143
 msgid "scannerdrake6.png"
 msgstr "scannerdrake6.png"
@@ -8018,8 +9452,7 @@ msgstr "scannerdrake6.png"
 msgid "Scanner sharing to hosts: you can add host."
 msgstr "Makinelere tarayıcı paylaşımı: makine ekleyebilirsiniz."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:153
 msgid "scannerdrake7.png"
 msgstr "scannerdrake7.png"
@@ -8029,10 +9462,11 @@ msgstr "scannerdrake7.png"
 msgid ""
 "Scanner sharing to hosts: specify which host(s) to add, or allow all remote "
 "machines."
-msgstr "Makinelere tarayıcı paylaşımı: eklenecek makineleri veya tüm makinelere izin verileceğini belirtin."
+msgstr ""
+"Makinelere tarayıcı paylaşımı: eklenecek makineleri veya tüm makinelere izin "
+"verileceğini belirtin."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:164
 msgid "scannerdrake8.png"
 msgstr "scannerdrake8.png"
@@ -8042,8 +9476,7 @@ msgstr "scannerdrake8.png"
 msgid "\"All remote machines\" are allowed to access the local scanner."
 msgstr "\"Tüm uzak makinelerin\" yerel tarayıcıya erişmesine izin verilmiştir"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/scannerdrake.xml:175
 msgid "scannerdrake9.png"
 msgstr "scannerdrake9.png"
@@ -8053,7 +9486,9 @@ msgstr "scannerdrake9.png"
 msgid ""
 "If the package <emphasis>saned</emphasis> is not yet installed, the tool "
 "offers to do it."
-msgstr "Eğer <emphasis>saned</emphasis> paketi kurulu değilse araç bunu yapmanızı önerir."
+msgstr ""
+"Eğer <emphasis>saned</emphasis> paketi kurulu değilse araç bunu yapmanızı "
+"önerir."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:184
@@ -8075,14 +9510,18 @@ msgstr "<emphasis>/etc/sane.d/net.conf</emphasis>"
 msgid ""
 "<emphasis>/etc/sane.d/dll.conf </emphasis>to add or comment the directive "
 "\"net\""
-msgstr "<emphasis>/etc/sane.d/dll.conf </emphasis> \"net\" yönergesini eklemek veya kaldırmak için "
+msgstr ""
+"<emphasis>/etc/sane.d/dll.conf </emphasis> \"net\" yönergesini eklemek veya "
+"kaldırmak için "
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:193
 msgid ""
-"It will also configure <emphasis>saned</emphasis> and "
-"<emphasis>xinetd</emphasis> to be started on boot."
-msgstr "Bu ayrıca <emphasis>saned</emphasis> ve <emphasis>xinetd</emphasis> i önyüklemede başlatılacak şekilde yapılandıracak."
+"It will also configure <emphasis>saned</emphasis> and <emphasis>xinetd</"
+"emphasis> to be started on boot."
+msgstr ""
+"Bu ayrıca <emphasis>saned</emphasis> ve <emphasis>xinetd</emphasis> i "
+"önyüklemede başlatılacak şekilde yapılandıracak."
 
 #. type: Content of: <section><section><title>
 #: en/scannerdrake.xml:199 en/system-config-printer.xml:278
@@ -8099,9 +9538,13 @@ msgstr "Hewlett-Packard"
 msgid ""
 "Most HP scanners are managed from <emphasis>HP Device Manager</emphasis> "
 "(hplip) which also manages printers. In this case, this tool does not allow "
-"you to configure it and invites you to use <emphasis>HP Device "
-"Manager</emphasis>."
-msgstr "Bir çok HP tarayıcı ayrıca yazıcıları da yönetmeyi sağlayan <emphasis>HP Aygıt Yöneticisi</emphasis>nden (hplip)  yönetilir. Bu durumda, bu araç bunu onu yapılandırmanıza izin vermez ve sizi <emphasis>HP Aygıt Yöneticisi</emphasis> kullanmaya davet eder. "
+"you to configure it and invites you to use <emphasis>HP Device Manager</"
+"emphasis>."
+msgstr ""
+"Bir çok HP tarayıcı ayrıca yazıcıları da yönetmeyi sağlayan <emphasis>HP "
+"Aygıt Yöneticisi</emphasis>nden (hplip)  yönetilir. Bu durumda, bu araç bunu "
+"onu yapılandırmanıza izin vermez ve sizi <emphasis>HP Aygıt Yöneticisi</"
+"emphasis> kullanmaya davet eder. "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:214
@@ -8111,14 +9554,20 @@ msgstr "Epson"
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:216
 msgid ""
-"Drivers are available from <link "
-"xlink:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this"
-" page</link>. When indicated, you must install the <emphasis>iscan-"
-"data</emphasis> package first, then <emphasis>iscan</emphasis> (in this "
-"order). It is possible that the <emphasis>iscan</emphasis> package will "
-"generate a warning about a conflict with <emphasis>sane</emphasis>. Users "
-"have reported that this warning can be ignored."
-msgstr "Sürücüler <link xlink:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">bu sayfadan</link> edinilebilir. Tarayıcı tarafı için, ilk olarak <emphasis>iscan-data</emphasis> , sonra <emphasis>iscan</emphasis> paketini kurmalısınız (bu sırayla). <emphasis>iscan</emphasis> paketi <emphasis>sane</emphasis> paketi ile çakıştığı hakkında bir uyarı üretebilir. Kullanıcılar bu uyarının gözardı edilebileceğini bildirmişlerdir."
+"Drivers are available from <link xlink:href=\"http://download.ebz.epson.net/"
+"dsc/search/01/search/?OSC=LX\">this page</link>. When indicated, you must "
+"install the <emphasis>iscan-data</emphasis> package first, then "
+"<emphasis>iscan</emphasis> (in this order). It is possible that the "
+"<emphasis>iscan</emphasis> package will generate a warning about a conflict "
+"with <emphasis>sane</emphasis>. Users have reported that this warning can be "
+"ignored."
+msgstr ""
+"Sürücüler <link xlink:href=\"http://download.ebz.epson.net/dsc/search/01/"
+"search/?OSC=LX\">bu sayfadan</link> edinilebilir. Tarayıcı tarafı için, ilk "
+"olarak <emphasis>iscan-data</emphasis> , sonra <emphasis>iscan</emphasis> "
+"paketini kurmalısınız (bu sırayla). <emphasis>iscan</emphasis> paketi "
+"<emphasis>sane</emphasis> paketi ile çakıştığı hakkında bir uyarı "
+"üretebilir. Kullanıcılar bu uyarının gözardı edilebileceğini bildirmişlerdir."
 
 #. type: Content of: <section><section><info><title>
 #: en/scannerdrake.xml:231
@@ -8131,7 +9580,10 @@ msgid ""
 "It is possible that after selecting a port for your scanner in the <xref "
 "linkend=\"choosescannerport\"/> screen, you need to take one or more extra "
 "steps to correctly configure your scanner."
-msgstr "<xref linkend=\"choosescannerport\"/> ekranında tarayıcınız için port seçiminden sonra,tarayıcınızı doğru bir şekilde yapılandırmak için bir ya da iki ek adım olması mümkündür."
+msgstr ""
+"<xref linkend=\"choosescannerport\"/> ekranında tarayıcınız için port "
+"seçiminden sonra,tarayıcınızı doğru bir şekilde yapılandırmak için bir ya da "
+"iki ek adım olması mümkündür."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:239
@@ -8141,37 +9593,48 @@ msgid ""
 "after you installed it on your system. In this screen you can install the "
 "firmware from a CD or a Windows installation, or install the one you "
 "downloaded from an Internet site of the vendor."
-msgstr "Bazı durumlarda, tarayıcının her çalıştırıldığında kendi gömülü yazılımının yüklenmesinin gerektiğini biliyorsunuz. Bu araç, siteminize kurduktan sonra bunu aygıtın içine yüklemenizi sağlar. Bu ekranda gömülü yazılımı  CD'den veya Windows kurulumundankurabilirsiniz ya da üreticinin İnternet sitesinden indirerek kurabilirsiniz."
+msgstr ""
+"Bazı durumlarda, tarayıcının her çalıştırıldığında kendi gömülü yazılımının "
+"yüklenmesinin gerektiğini biliyorsunuz. Bu araç, siteminize kurduktan sonra "
+"bunu aygıtın içine yüklemenizi sağlar. Bu ekranda gömülü yazılımı  CD'den "
+"veya Windows kurulumundankurabilirsiniz ya da üreticinin İnternet sitesinden "
+"indirerek kurabilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:241
 msgid ""
 "When your device's firmware needs to be loaded, it can take a long time at "
 "each first usage, possibly more than one minute. So be patient."
-msgstr "Cihazınızın gömülü yazılımı yüklenmesi gerektiğinde, her ilk kullanımda çok zaman alabilir, muhtemelen bir dakikadan fazla. Bu yüzden sabırlı olun."
+msgstr ""
+"Cihazınızın gömülü yazılımı yüklenmesi gerektiğinde, her ilk kullanımda çok "
+"zaman alabilir, muhtemelen bir dakikadan fazla. Bu yüzden sabırlı olun."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:246
 msgid ""
-"Also, you may get a screen telling you to adjust the "
-"<emphasis>/etc/sane.d/\"name_of_your_SANE_backend\".conf file.</emphasis>"
-msgstr "Ayrıca <emphasis>/etc/sane.d/\"SANE_arkaucunuzun_ismi\".conf file.</emphasis> dosyasını ayarlamanızı söyleyen bir ekranla karşılaşabilirsiniz."
+"Also, you may get a screen telling you to adjust the <emphasis>/etc/sane.d/"
+"\"name_of_your_SANE_backend\".conf file.</emphasis>"
+msgstr ""
+"Ayrıca <emphasis>/etc/sane.d/\"SANE_arkaucunuzun_ismi\".conf file.</"
+"emphasis> dosyasını ayarlamanızı söyleyen bir ekranla karşılaşabilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:250
 msgid ""
 "Read those or other instructions you get carefully and if you don't know "
-"what to do, feel free to ask for help in the <link "
-"xlink:href=\"http://forums.mageia.org/en/\">forums</link>."
-msgstr "O ya da diğer yönergeleri dikkatlice okuyun ve ne yapacağınızı bilmiyorsanız <link xlink:href=\"http://forums.mageia.org/en/\">forumlar</link>a sormaya çekinmeyin."
+"what to do, feel free to ask for help in the <link xlink:href=\"http://"
+"forums.mageia.org/en/\">forums</link>."
+msgstr ""
+"O ya da diğer yönergeleri dikkatlice okuyun ve ne yapacağınızı bilmiyorsanız "
+"<link xlink:href=\"http://forums.mageia.org/en/\">forumlar</link>a sormaya "
+"çekinmeyin."
 
 #. type: Content of: <section><orderedlist><title>
 #: en/software-management.xml:5 en/software-management.xml:15
 msgid "Software Management"
 msgstr "Yazılım Yönetimi"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/software-management.xml:10
 msgid "software-management.png"
 msgstr "software-management.png"
@@ -8179,9 +9642,11 @@ msgstr "software-management.png"
 #. type: Content of: <section><para>
 #: en/software-management.xml:14
 msgid ""
-"In this screen you can choose between several tools for software management."
-" Click on a link below to learn more."
-msgstr "Bu ekranda çeşitli yazılım yönetim araçları arasından seçim yapabilirsiniz. Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
+"In this screen you can choose between several tools for software management. "
+"Click on a link below to learn more."
+msgstr ""
+"Bu ekranda çeşitli yazılım yönetim araçları arasından seçim yapabilirsiniz. "
+"Daha fazlasını öğrenmek için aşağıdaki bağlantıya tıklayın."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:17
@@ -8191,9 +9656,11 @@ msgstr "<xref linkend=\"rpmdrake\"></xref>"
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:20
 msgid ""
-"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Update your "
-"system</emphasis>"
-msgstr "<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Sisteminizi güncelleyin</emphasis>"
+"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Update your system</"
+"emphasis>"
+msgstr ""
+"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Sisteminizi güncelleyin</"
+"emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:23
@@ -8205,7 +9672,9 @@ msgstr "<xref linkend=\"mgaapplet-config\"></xref>"
 msgid ""
 "<xref linkend=\"drakrpm-edit-media\"></xref><emphasis> = Configure media "
 "sources for install and update</emphasis>"
-msgstr "<xref linkend=\"drakrpm-edit-media\"></xref><emphasis> = Kurulum ve güncelleme için ortam kaynaklarını yapılandırın</emphasis>"
+msgstr ""
+"<xref linkend=\"drakrpm-edit-media\"></xref><emphasis> = Kurulum ve "
+"güncelleme için ortam kaynaklarını yapılandırın</emphasis>"
 
 #. type: Content of: <section><info><title>
 #: en/system-config-printer.xml:8
@@ -8217,8 +9686,7 @@ msgstr "Bir yazıcı kur veya yapılandır"
 msgid "system-config-printer"
 msgstr "system-config-printer"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/system-config-printer.xml:16
 msgid "system-config-printer.png"
 msgstr "system-config-printer.png"
@@ -8232,30 +9700,42 @@ msgid ""
 "offers its own tool for installing printers called system-config-printer "
 "which is shared with other distributions such as Fedora, Mandriva, Ubuntu "
 "and openSUSE."
-msgstr "Mageia'da yazdırma CUPS isminde bir sunucu ile yönetilir. Web tarayıcı ile ulaşılabilen kendi <link ns2:title=\"CUPS\" ns2:href=\"http://localhost:631\">yapılandırma arayüzü</link> ne sahiptir, fakat Mageia yazıcıları kurmak için system-config-printer isminde, Fedora, Mandriva, Ubuntu ve openSUSE ile paylaşılan kendi aracını önerir."
+msgstr ""
+"Mageia'da yazdırma CUPS isminde bir sunucu ile yönetilir. Web tarayıcı ile "
+"ulaşılabilen kendi <link ns2:title=\"CUPS\" ns2:href=\"http://"
+"localhost:631\">yapılandırma arayüzü</link> ne sahiptir, fakat Mageia "
+"yazıcıları kurmak için system-config-printer isminde, Fedora, Mandriva, "
+"Ubuntu ve openSUSE ile paylaşılan kendi aracını önerir."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:30
 msgid ""
 "You should enable the non-free repository before proceeding with the "
 "installation, because some drivers may only be available in this way."
-msgstr "Kuruluma devam etmek için non-free depoları etkinleştirmelisiniz, çünkü bazı sürücüler sadece bu şekilde erişilebilir olabilir."
+msgstr ""
+"Kuruluma devam etmek için non-free depoları etkinleştirmelisiniz, çünkü bazı "
+"sürücüler sadece bu şekilde erişilebilir olabilir."
 
 #. type: Content of: <section><section><para><footnote><para>
 #: en/system-config-printer.xml:37
 msgid ""
 "You can start this tool from the command line, by typing <emphasis>system-"
 "config-printer</emphasis>. The root password will be asked for."
-msgstr "Bu aracı komut satırında <emphasis>system-config-printer</emphasis> yazarak çalıştırabilirsiniz. Bunun için size root parolası sorulacak."
+msgstr ""
+"Bu aracı komut satırında <emphasis>system-config-printer</emphasis> yazarak "
+"çalıştırabilirsiniz. Bunun için size root parolası sorulacak."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:34
 msgid ""
 "Printer installation is carried out in the <guilabel>Hardware</guilabel> "
 "section of the Mageia Control Centre. Select the <guilabel>Configure "
-"printing and scanning</guilabel> tool<placeholder type=\"footnote\" "
-"id=\"0\"/>."
-msgstr "Yazıcı kurulumu Mageia Denetim Merkezinin <guilabel>Donanım</guilabel> bölümünde halledilir.  <guilabel>Yazdırma ve taramayı yapılandır</guilabel> aracını seçiniz<placeholder type=\"footnote\" id=\"0\"/>."
+"printing and scanning</guilabel> tool<placeholder type=\"footnote\" id=\"0\"/"
+">."
+msgstr ""
+"Yazıcı kurulumu Mageia Denetim Merkezinin <guilabel>Donanım</guilabel> "
+"bölümünde halledilir.  <guilabel>Yazdırma ve taramayı yapılandır</guilabel> "
+"aracını seçiniz<placeholder type=\"footnote\" id=\"0\"/>."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:42
@@ -8277,7 +9757,9 @@ msgstr "task-printing-hp"
 msgid ""
 "It is necessary to accept this installation to continue. Up to 230MB of "
 "dependencies are needed."
-msgstr "Devam etmek için bu kurulumu kabul etmeniz gerekiyor. 230MBa kadar bağımlılıklar gerekli."
+msgstr ""
+"Devam etmek için bu kurulumu kabul etmeniz gerekiyor. 230MBa kadar "
+"bağımlılıklar gerekli."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:53
@@ -8287,7 +9769,12 @@ msgid ""
 "printer connected to a parallel port. If a printer is detected, such as a "
 "printer on a USB port, it will be displayed on the first line.  The window "
 "will also attempt to configure a network printer."
-msgstr "Bir yazıcı ekleme için, yazıcı \"Ekle\" düğmesini seçin. Sistem herhangi bir yazıcı algılamayı mümkün portu bulmayı deneyecek. Ekran görüntüsü bir paralel porta bağlı bir yazıcıyı gösterir. Eğer bir yazıcı algılanırsa, USB portundaki bir yazıcı gibi, bu ilk satırda gösterilir. Pencere ayrıca bir ağ yazıcısını yapılandırmaya çalışır."
+msgstr ""
+"Bir yazıcı ekleme için, yazıcı \"Ekle\" düğmesini seçin. Sistem herhangi bir "
+"yazıcı algılamayı mümkün portu bulmayı deneyecek. Ekran görüntüsü bir "
+"paralel porta bağlı bir yazıcıyı gösterir. Eğer bir yazıcı algılanırsa, USB "
+"portundaki bir yazıcı gibi, bu ilk satırda gösterilir. Pencere ayrıca bir ağ "
+"yazıcısını yapılandırmaya çalışır."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:61
@@ -8298,20 +9785,25 @@ msgstr "Otomatik olarak algılanan yazıcılar"
 #: en/system-config-printer.xml:63
 msgid ""
 "This usually refers to USB printers. The utility automatically finds the "
-"name of the printer and displays it. Select the printer and then click "
-"\"Next\". If there is a known driver associated for the printer, it will be "
+"name of the printer and displays it. Select the printer and then click \"Next"
+"\". If there is a known driver associated for the printer, it will be "
 "automatically installed. If there is more than one driver or no known "
-"drivers, a window will ask you to select or furnish one, as explained in the"
-" next paragraph. Continue with <xref linkend=\"terminate\"/>"
-msgstr "Bu genellikle USB yazıcıyı içerir. Araç otomatik olarak yazıcının ismini bulur ve bunu görüntüler. Yazıcıyı seçin ve \"Sonraki\" e tıklayın. Yazıcı için bilinen bir sürücü varsa otomatik olarak kurulacaktır. Eğer birden fazla sürücü varsa ya da hiç sürücü yoksa, bir sonraki paragrafta açıklandığı gibi, bir pencere sizden seçmenizi ya da tedarik etmenizi ister. <xref linkend=\"terminate\"/> ile devam ediniz"
+"drivers, a window will ask you to select or furnish one, as explained in the "
+"next paragraph. Continue with <xref linkend=\"terminate\"/>"
+msgstr ""
+"Bu genellikle USB yazıcıyı içerir. Araç otomatik olarak yazıcının ismini "
+"bulur ve bunu görüntüler. Yazıcıyı seçin ve \"Sonraki\" e tıklayın. Yazıcı "
+"için bilinen bir sürücü varsa otomatik olarak kurulacaktır. Eğer birden "
+"fazla sürücü varsa ya da hiç sürücü yoksa, bir sonraki paragrafta "
+"açıklandığı gibi, bir pencere sizden seçmenizi ya da tedarik etmenizi ister. "
+"<xref linkend=\"terminate\"/> ile devam ediniz"
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:72
 msgid "No automatically detected printer"
 msgstr "Otomatik olarak algılanan yazıcı yok"
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/system-config-printer.xml:76
 msgid "printer3.png"
 msgstr "printer3.png"
@@ -8319,10 +9811,12 @@ msgstr "printer3.png"
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:80
 msgid ""
-"When you select a port, the system loads a driver list and displays a window"
-" to select a driver. The choice can be made through one of the following "
+"When you select a port, the system loads a driver list and displays a window "
+"to select a driver. The choice can be made through one of the following "
 "options."
-msgstr "Bir port seçtiğinizde, sistem bir sürücü listesi yükler ve bir sürücü seçmeniz biçin bir pencere gösterir."
+msgstr ""
+"Bir port seçtiğinizde, sistem bir sürücü listesi yükler ve bir sürücü "
+"seçmeniz biçin bir pencere gösterir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:86
@@ -8347,7 +9841,11 @@ msgid ""
 "driver is suggested, select one which is recommended, unless you have "
 "encountered some problems with that one before, in this case select the one "
 "which know to work."
-msgstr "Veritabanından seçerek, pencere ilk olarak bir yazıcı üreticisi önerir, ve sonra bir aygıt ve bir sürücü onunla ilişkilendirilir. Eğer birden fazla sürücü önerilirse, eğer daha önce onunla sorun yaşamadıysanız tavsiye edileni seçiniz, bu durumda çalışıtığını bilineni seçiniz."
+msgstr ""
+"Veritabanından seçerek, pencere ilk olarak bir yazıcı üreticisi önerir, ve "
+"sonra bir aygıt ve bir sürücü onunla ilişkilendirilir. Eğer birden fazla "
+"sürücü önerilirse, eğer daha önce onunla sorun yaşamadıysanız tavsiye "
+"edileni seçiniz, bu durumda çalışıtığını bilineni seçiniz."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:110
@@ -8363,7 +9861,12 @@ msgid ""
 "available printers. The installer then suggests printing a test page. After "
 "this step, the printer is added and appears in the list of available "
 "printers."
-msgstr "Sürücü eçiminden sonra, bir pencere sistemin yazıcıyı tasarlaması ve tanıması için bazı bilgiler ister. İlk satır aygıtın uygulamaların içinde erişilebilir yazıcılar listesinde gözüken ismidir. Kurulum programı sonra bir test sayfası yazdırmayı önerir.  Bu adımdan sonra, yazıcı eklenmiştir ve erişilebilir yazıcılar listesinde görünür. "
+msgstr ""
+"Sürücü eçiminden sonra, bir pencere sistemin yazıcıyı tasarlaması ve "
+"tanıması için bazı bilgiler ister. İlk satır aygıtın uygulamaların içinde "
+"erişilebilir yazıcılar listesinde gözüken ismidir. Kurulum programı sonra "
+"bir test sayfası yazdırmayı önerir.  Bu adımdan sonra, yazıcı eklenmiştir ve "
+"erişilebilir yazıcılar listesinde görünür. "
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:121
@@ -8374,41 +9877,60 @@ msgstr "Ağ yazıcısı"
 #: en/system-config-printer.xml:123
 msgid ""
 "Network printers are printers that are attached directly to a wired or "
-"wireless network, that are attached to a printserver or that are attached to"
-" another workstation that serves as printserver."
-msgstr "Ağ yazıcıları doğrudan kablolu ya da kablosuz ağlara bağlanmış yazıcılardır, ki bunlar bir yazma sunucusuna veya yazma sunucusu hizmeti veren bir iş istasyonuna bağlanmıştır."
+"wireless network, that are attached to a printserver or that are attached to "
+"another workstation that serves as printserver."
+msgstr ""
+"Ağ yazıcıları doğrudan kablolu ya da kablosuz ağlara bağlanmış yazıcılardır, "
+"ki bunlar bir yazma sunucusuna veya yazma sunucusu hizmeti veren bir iş "
+"istasyonuna bağlanmıştır."
 
 #. type: Content of: <section><section><note><para>
 #: en/system-config-printer.xml:128
 msgid ""
-"Often, it is better to configure the DHCP server to always associate a fixed"
-" IP address with the printer's MAC-address. Of course that should be the "
-"same as the IP address the printer of printserver is set to, if it has a "
-"fixed one."
-msgstr "Genellikle, DHCP sunucuyu yazıcının MAC-adresi ile daima ayrılmış bir IP adresi ile eşleştirme şeklinde yapılandırmak daha iyidir. Tabii ki bu yazdırmasunucunun yazıcısının IP adresi ile aynı olmalıdır."
+"Often, it is better to configure the DHCP server to always associate a fixed "
+"IP address with the printer's MAC-address. Of course that should be the same "
+"as the IP address the printer of printserver is set to, if it has a fixed "
+"one."
+msgstr ""
+"Genellikle, DHCP sunucuyu yazıcının MAC-adresi ile daima ayrılmış bir IP "
+"adresi ile eşleştirme şeklinde yapılandırmak daha iyidir. Tabii ki bu "
+"yazdırmasunucunun yazıcısının IP adresi ile aynı olmalıdır."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:134
 msgid ""
 "The printer's Mac-address is a serial number given to the printer or "
 "printserver or computer it is attached to, that can be obtained from a "
-"configuration page printed by the printer or which may be written on a label"
-" on the printer or printserver. If your shared printer is attached to a "
+"configuration page printed by the printer or which may be written on a label "
+"on the printer or printserver. If your shared printer is attached to a "
 "Mageia system, you can run <emphasis><code>ifconfig</code></emphasis> on it "
 "as root to find the MAC-address. It is the sequence of numbers and letters "
 "after \"HWaddr\"."
-msgstr "Yazıcının Mac-adresi yazıcıya veya yazdırma sunucuya ya da bağlandığı bilgisayara verilen bir rakam dizisidir, yazıcı tarafından yazdırılan yapılandırma sayfasından veya yazıcı veya yazdırma sunucusu üzerindeki etiketten elde edilebilir. Eğer paylaşılan yazıcınız Mageia sistemine bağlıysa, üzerinde root olarak <emphasis><code>ifconfig</code></emphasis> yazarak Mac-adresini bulabilirsiniz. Bu \"HWaddr\" ardından gelen rakamlar ve harfler dizisidir."
+msgstr ""
+"Yazıcının Mac-adresi yazıcıya veya yazdırma sunucuya ya da bağlandığı "
+"bilgisayara verilen bir rakam dizisidir, yazıcı tarafından yazdırılan "
+"yapılandırma sayfasından veya yazıcı veya yazdırma sunucusu üzerindeki "
+"etiketten elde edilebilir. Eğer paylaşılan yazıcınız Mageia sistemine "
+"bağlıysa, üzerinde root olarak <emphasis><code>ifconfig</code></emphasis> "
+"yazarak Mac-adresini bulabilirsiniz. Bu \"HWaddr\" ardından gelen rakamlar "
+"ve harfler dizisidir."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:142
 msgid ""
-"You can add your network printer by choosing the protocol it uses to talk to"
-" your computer over the network. If you don't know which protocol to choose,"
-" you can try the <guilabel>Network Printer</guilabel> - <guilabel>Find "
+"You can add your network printer by choosing the protocol it uses to talk to "
+"your computer over the network. If you don't know which protocol to choose, "
+"you can try the <guilabel>Network Printer</guilabel> - <guilabel>Find "
 "Network Printer</guilabel> option in the <guilabel>Devices</guilabel> menu "
 "and give the IP address of the printer in the box on the right, where it "
 "says \"host\"."
-msgstr "Ağ yazıcınızı bilgisayarınızla ağ üzerinden konuşmak için kullandığı protokolü seçerek ekleyebilirsiniz. Eğer hangi protokolü seçeceğinizi bilmiyorsanız, <guilabel>Aygıtlar</guilabel> menüsünden <guilabel>Ağ yazıcısı</guilabel> - <guilabel>Ağ Yazıcısı Bul</guilabel> seçeneğini deneyebilirsiniz ve sağ tarafta, \"makineler\" denen yerde yazıcının IP adresini veriniz."
+msgstr ""
+"Ağ yazıcınızı bilgisayarınızla ağ üzerinden konuşmak için kullandığı "
+"protokolü seçerek ekleyebilirsiniz. Eğer hangi protokolü seçeceğinizi "
+"bilmiyorsanız, <guilabel>Aygıtlar</guilabel> menüsünden <guilabel>Ağ "
+"yazıcısı</guilabel> - <guilabel>Ağ Yazıcısı Bul</guilabel> seçeneğini "
+"deneyebilirsiniz ve sağ tarafta, \"makineler\" denen yerde yazıcının IP "
+"adresini veriniz."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:149
@@ -8416,14 +9938,20 @@ msgid ""
 "If the tool recognises your printer or printserver, it will propose a "
 "protocol and a queue, but you can choose a more appropriate one from the "
 "list below it or give the correct queue name if it isn't in the list."
-msgstr "Eğer araç yazıcınızı veya yazıcı sunucunuzu algılarsa, bir protokol ve bir kuyruk önerir, fakat aşağıdaki listeden daha uygun birini seçebilirsiniz ya da listede değilse doğru kuyruk ismini girebilirsiniz."
+msgstr ""
+"Eğer araç yazıcınızı veya yazıcı sunucunuzu algılarsa, bir protokol ve bir "
+"kuyruk önerir, fakat aşağıdaki listeden daha uygun birini seçebilirsiniz ya "
+"da listede değilse doğru kuyruk ismini girebilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:154
 msgid ""
-"Look in the documentation that came with your printer or printserver to find"
-" which protocol(s) it supports and for possible specific queue names."
-msgstr "Yazıcınızın veya yazıcı sunucunuzun muhtemel belirli kuruk isimleri için hangi protokolleri desteklediğini bulmak için bunlarla beraber gelen belgelere bakınız."
+"Look in the documentation that came with your printer or printserver to find "
+"which protocol(s) it supports and for possible specific queue names."
+msgstr ""
+"Yazıcınızın veya yazıcı sunucunuzun muhtemel belirli kuruk isimleri için "
+"hangi protokolleri desteklediğini bulmak için bunlarla beraber gelen "
+"belgelere bakınız."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:160
@@ -8439,10 +9967,18 @@ msgid ""
 "known on the network. This technique is also used inside some ADSL-routers "
 "which contain an USB port to connect the printer. In this case, the IP-"
 "address is that of the router. Note that the tool \"Hp Device manager\" can "
-"manage dynamically configured IP-adress, setting an URI like "
-"<emphasis>hp:/net/&lt;name-of-the-printer></emphasis> . In this case, fixed "
-"IP-adress is not required."
-msgstr "Bir teknik  Hewlett-Packard tarafından geliştirilmiştir ve JetDirect olarak bilinir. Bu bir yazıcıya doğrudan ağa bağlı bir ethernet portu yolula erişimi sağlar. Yazıcının ağdaki IP adresini bilmelisiniz. Bu teknik ayrıca bazı yazıcı bağlanabilen USB portları olan ADSL-yönelticileri içinde kullanılır. Bu durumda, IP-adresi yönelticininkidir. \"Hp Device manager\"in dinamik olarak yapılandırılmış IP-areslerini <emphasis>hp:/net/&lt;name-of-the-printer></emphasis> şeklinde bir URI ayarı ile yönetebileceğine dikkat edin. Bu durumda sabir IP-adresi gerekli değildir."
+"manage dynamically configured IP-adress, setting an URI like <emphasis>hp:/"
+"net/&lt;name-of-the-printer></emphasis> . In this case, fixed IP-adress is "
+"not required."
+msgstr ""
+"Bir teknik  Hewlett-Packard tarafından geliştirilmiştir ve JetDirect olarak "
+"bilinir. Bu bir yazıcıya doğrudan ağa bağlı bir ethernet portu yolula "
+"erişimi sağlar. Yazıcının ağdaki IP adresini bilmelisiniz. Bu teknik ayrıca "
+"bazı yazıcı bağlanabilen USB portları olan ADSL-yönelticileri içinde "
+"kullanılır. Bu durumda, IP-adresi yönelticininkidir. \"Hp Device manager\"in "
+"dinamik olarak yapılandırılmış IP-areslerini <emphasis>hp:/net/&lt;name-of-"
+"the-printer></emphasis> şeklinde bir URI ayarı ile yönetebileceğine dikkat "
+"edin. Bu durumda sabir IP-adresi gerekli değildir."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:172
@@ -8450,12 +9986,15 @@ msgid ""
 "Choose the option <guilabel>AppSocket/HP JetDirect</guilabel> as the "
 "protocol and set the address in <guilabel>Host:</guilabel>, do not change "
 "the <guilabel>Port Number</guilabel>, unless you know that it needs to be "
-"changed. After the selection of the protocol, the selection of the driver is"
-" the same as above."
-msgstr "Protokol olarak <guilabel>AppSocket/HP JetDirect</guilabel> seçiniz ve <guilabel>Makine:</guilabel> içindeki adresi giriniz, değiştirlecek olduğunu bilmiyorsanız <guilabel>Port Numarası</guilabel>nı değiştirmeyiniz. Protokolün seçiminden sonra, sürücünün seçimi yukarıdakiyle aynıdır."
+"changed. After the selection of the protocol, the selection of the driver is "
+"the same as above."
+msgstr ""
+"Protokol olarak <guilabel>AppSocket/HP JetDirect</guilabel> seçiniz ve "
+"<guilabel>Makine:</guilabel> içindeki adresi giriniz, değiştirlecek olduğunu "
+"bilmiyorsanız <guilabel>Port Numarası</guilabel>nı değiştirmeyiniz. "
+"Protokolün seçiminden sonra, sürücünün seçimi yukarıdakiyle aynıdır."
 
-#. type: Attribute 'fileref' of:
-#. <section><section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/system-config-printer.xml:180
 msgid "printer5.png"
 msgstr "printer5.png"
@@ -8472,7 +10011,11 @@ msgid ""
 "be accessed on a TCP/IP network via the IPP protocol, for example a printer "
 "connected to a station using CUPS. This protocol may also be used also by "
 "some ADSL-routers."
-msgstr "<emphasis>Internet Yazdırma Protokolü (ipp)</emphasis>: TCP/IP üzerinden IPP yoluyla erişilebilen bir yazıcıdır, örneğin CUPS kullanılarak bir istasyona bağlanmış bir yazıcı. Bu protokol ayrıca bazı ADSL-yönelticiler tarafından kullanılabilir."
+msgstr ""
+"<emphasis>Internet Yazdırma Protokolü (ipp)</emphasis>: TCP/IP üzerinden IPP "
+"yoluyla erişilebilen bir yazıcıdır, örneğin CUPS kullanılarak bir istasyona "
+"bağlanmış bir yazıcı. Bu protokol ayrıca bazı ADSL-yönelticiler tarafından "
+"kullanılabilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:197
@@ -8480,14 +10023,19 @@ msgid ""
 "<emphasis>Internet Printing Protocol (https): </emphasis>the same as ipp, "
 "but using http transport and with TLS secured protocol.  The port has to be "
 "defined. By default, the port 631 is used."
-msgstr "<emphasis>Internet Yazdırma Protokolü (https): </emphasis> ipp ile aynı, fakat TLS güvenli protokol ile http iletimi kullanılır. Port tanımlanmış olmalıdır. Varsayılan olarak, 631 portu kullanılır."
+msgstr ""
+"<emphasis>Internet Yazdırma Protokolü (https): </emphasis> ipp ile aynı, "
+"fakat TLS güvenli protokol ile http iletimi kullanılır. Port tanımlanmış "
+"olmalıdır. Varsayılan olarak, 631 portu kullanılır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:205
 msgid ""
-"<emphasis>Internet Printing Protocol (ipps): </emphasis>the same as ipp, but"
-" with TLS secured protocol."
-msgstr "<emphasis>Internet Yazdırma Protokolü (ipps): </emphasis>ippile aynı, fakat TLS güvenlikli protokol."
+"<emphasis>Internet Printing Protocol (ipps): </emphasis>the same as ipp, but "
+"with TLS secured protocol."
+msgstr ""
+"<emphasis>Internet Yazdırma Protokolü (ipps): </emphasis>ippile aynı, fakat "
+"TLS güvenlikli protokol."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:212
@@ -8495,21 +10043,28 @@ msgid ""
 "<emphasis>LPD/LPR host or Printer</emphasis>: a printer which can be "
 "accessed on a TCP/IP network via the LPD protocol, for example a printer "
 "connected to a station using LPD."
-msgstr "<emphasis>LPD/LPR konağı veya Yazıcı</emphasis>: LPD protokolü yoluyla TCP/IP üzerinden erişilebilen bir yazıcı, örneğin LPD kullanılarak bir istasyona bağlanmış bir yazıcı."
+msgstr ""
+"<emphasis>LPD/LPR konağı veya Yazıcı</emphasis>: LPD protokolü yoluyla TCP/"
+"IP üzerinden erişilebilen bir yazıcı, örneğin LPD kullanılarak bir istasyona "
+"bağlanmış bir yazıcı."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:220
 msgid ""
 "<emphasis>Windows printer via SAMBA</emphasis>: a printer connected to a "
 "station running Windows or a SMB server and shared."
-msgstr "<emphasis>SAMBA yoluyla Windows yazıcı</emphasis>: bir Windows ya da SMB sunucu çalışan ve paylaşılmış bir istasyona bağlanmış bir yazıcı. "
+msgstr ""
+"<emphasis>SAMBA yoluyla Windows yazıcı</emphasis>: bir Windows ya da SMB "
+"sunucu çalışan ve paylaşılmış bir istasyona bağlanmış bir yazıcı. "
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:226
 msgid ""
 "The URI can also be added directly. Here are some examples on how to form "
 "the URI:"
-msgstr "Ayrıca URI doğrudan eklenebilir. Burada URI in nasıl biçimlendirildiğine dair bir örnek var:"
+msgstr ""
+"Ayrıca URI doğrudan eklenebilir. Burada URI in nasıl biçimlendirildiğine "
+"dair bir örnek var:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/system-config-printer.xml:231
@@ -8549,10 +10104,11 @@ msgstr "<uri>lpd://username@ip-address-or-hostname/queue</uri>"
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:251
 msgid ""
-"Additional information can be found in the <link "
-"ns2:href=\"http://www.cups.org/documentation.php/doc-1.5/network.html\">CUPS"
-" documentation.</link>"
-msgstr "Ek bilgiler <link ns2:href=\"http://www.cups.org/documentation.php/doc-1.5/network.html\">CUPS belgelendirmesi</link>nde bulunabilir."
+"Additional information can be found in the <link ns2:href=\"http://www.cups."
+"org/documentation.php/doc-1.5/network.html\">CUPS documentation.</link>"
+msgstr ""
+"Ek bilgiler <link ns2:href=\"http://www.cups.org/documentation.php/doc-1.5/"
+"network.html\">CUPS belgelendirmesi</link>nde bulunabilir."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:256
@@ -8563,13 +10119,18 @@ msgstr "Aygıt Özellikleri"
 #: en/system-config-printer.xml:258
 msgid ""
 "You can access the properties of the device. The menu allows access to "
-"parameters for the CUPS server. By default a CUPS server is launched on your"
-" system, but you can specify a different one with the "
-"<guimenu>Server</guimenu> | <guimenuitem>Connect...</guimenuitem> menu, "
-"another window which gives access to the tuning of other specific parameters"
-" of the server, following <guimenu>Server</guimenu> | "
-"<guimenuitem>Settings.</guimenuitem>"
-msgstr "Aygıtın özelliklerine erişebilirsiniz. Menü CUPS sunucu için olan parametrelere erişmenizi sağlar. Varsayılan olarak CUPS sunucu sisteminizden başlatılır, fakat <guimenu>Sunucu</guimenu> | <guimenuitem>Bağlan...</guimenuitem> ile farklı bir tane belirtebilirsiniz, sunucunun özel parametrelerini ayarlamak için başka bir pencere <guimenu>Sunucu</guimenu> | <guimenuitem>Ayarlar</guimenuitem> ile açılır."
+"parameters for the CUPS server. By default a CUPS server is launched on your "
+"system, but you can specify a different one with the <guimenu>Server</"
+"guimenu> | <guimenuitem>Connect...</guimenuitem> menu, another window which "
+"gives access to the tuning of other specific parameters of the server, "
+"following <guimenu>Server</guimenu> | <guimenuitem>Settings.</guimenuitem>"
+msgstr ""
+"Aygıtın özelliklerine erişebilirsiniz. Menü CUPS sunucu için olan "
+"parametrelere erişmenizi sağlar. Varsayılan olarak CUPS sunucu sisteminizden "
+"başlatılır, fakat <guimenu>Sunucu</guimenu> | <guimenuitem>Bağlan...</"
+"guimenuitem> ile farklı bir tane belirtebilirsiniz, sunucunun özel "
+"parametrelerini ayarlamak için başka bir pencere <guimenu>Sunucu</guimenu> | "
+"<guimenuitem>Ayarlar</guimenuitem> ile açılır."
 
 #. type: Content of: <section><section><title>
 #: en/system-config-printer.xml:268
@@ -8581,29 +10142,43 @@ msgstr "Sorun giderme"
 msgid ""
 "You can find some information on occurring errors during printing by "
 "inspecting <filename>/var/log/cups/error_log</filename>"
-msgstr "<filename>/var/log/cups/error_log</filename> dosyasını inceleyerek yazdırma sırasında oluşan hatalarla ilgili bilgiler bulabilirsiniz"
+msgstr ""
+"<filename>/var/log/cups/error_log</filename> dosyasını inceleyerek yazdırma "
+"sırasında oluşan hatalarla ilgili bilgiler bulabilirsiniz"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:273
 msgid ""
-"You can also access to a tool to diagnose problems using the "
-"<guimenu>Help</guimenu> | <guilabel>Troubleshoot</guilabel> menu."
-msgstr "<guimenu>Yardım</guimenu> | <guilabel>Hata Giderme</guilabel> menülerinden ayrıca problemleri teşhis eden bir araca erişebilirsiniz."
+"You can also access to a tool to diagnose problems using the <guimenu>Help</"
+"guimenu> | <guilabel>Troubleshoot</guilabel> menu."
+msgstr ""
+"<guimenu>Yardım</guimenu> | <guilabel>Hata Giderme</guilabel> menülerinden "
+"ayrıca problemleri teşhis eden bir araca erişebilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:280
 msgid ""
 "It is possible that some drivers for specific printers are not available in "
-"Mageia or are not functional. In this case, have a look at the <link "
-"ns2:href=\"http://openprinting.org/printers/\">openprinting</link> site to "
-"check if a driver for your device is available. If yes, check if the package"
-" is already present in Mageia and in this case install it manually. Then, "
-"redo the installation process to configure the printer. In all cases, report"
-" the problem in bugzilla or on the forum if you are comfortable with this "
-"tool and furnish the model and driver information and whether the printer "
-"works or not after installation. Here are some sources to find other up-to-"
-"date drivers or for more recent devices."
-msgstr "Belirli yazıcılar için bazı sürücülerin Mageia'da bulunmaması ya da işler olmaması mümkündür. Bu durumda aygıtınız için bir sürücü bulunup bulunmadığını kntrol etmek için <link ns2:href=\"http://openprinting.org/printers/\">openprinting</link> sitesine göz atınız. Eğer varsa, paketin Mageia'da bulunup bulunmadığını kontrol ediniz ve elle kurunuz. Sonra yazıcıyı yapılandırmak için kurulum işlemini tekrar yapınız. Her durumda hatayı bugzilla'da veya forumda, bu araca alışkınsanız ve modeli ve sürücü bilgisini sağlayabiliyorsanız ve kurulumdan sonra yazıcının çalışıp çalışmadığını raporlayınız. Burada diğer güncel sürücüler ya da daha yeni aygıtlar için bazı kaynaklar var."
+"Mageia or are not functional. In this case, have a look at the <link ns2:"
+"href=\"http://openprinting.org/printers/\">openprinting</link> site to check "
+"if a driver for your device is available. If yes, check if the package is "
+"already present in Mageia and in this case install it manually. Then, redo "
+"the installation process to configure the printer. In all cases, report the "
+"problem in bugzilla or on the forum if you are comfortable with this tool "
+"and furnish the model and driver information and whether the printer works "
+"or not after installation. Here are some sources to find other up-to-date "
+"drivers or for more recent devices."
+msgstr ""
+"Belirli yazıcılar için bazı sürücülerin Mageia'da bulunmaması ya da işler "
+"olmaması mümkündür. Bu durumda aygıtınız için bir sürücü bulunup "
+"bulunmadığını kntrol etmek için <link ns2:href=\"http://openprinting.org/"
+"printers/\">openprinting</link> sitesine göz atınız. Eğer varsa, paketin "
+"Mageia'da bulunup bulunmadığını kontrol ediniz ve elle kurunuz. Sonra "
+"yazıcıyı yapılandırmak için kurulum işlemini tekrar yapınız. Her durumda "
+"hatayı bugzilla'da veya forumda, bu araca alışkınsanız ve modeli ve sürücü "
+"bilgisini sağlayabiliyorsanız ve kurulumdan sonra yazıcının çalışıp "
+"çalışmadığını raporlayınız. Burada diğer güncel sürücüler ya da daha yeni "
+"aygıtlar için bazı kaynaklar var."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:292
@@ -8613,37 +10188,49 @@ msgstr "<emphasis role=\"bold\">Kardeş yazıcılar</emphasis>"
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:294
 msgid ""
-"<link "
-"ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/download_prn.html\">This"
-" page</link> give a list of drivers provided by Brother. Search the driver "
-"for your device, download the rpm(s) and install."
-msgstr "<link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/download_prn.html\">Bu sayfa</link> Brother tarafından sağlanan bir sürücü listesini verir. Aygıtınız için bir sürücü arayın, rpm(ler)i aratın ve kurun."
+"<link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/"
+"en/download_prn.html\">This page</link> give a list of drivers provided by "
+"Brother. Search the driver for your device, download the rpm(s) and install."
+msgstr ""
+"<link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/"
+"en/download_prn.html\">Bu sayfa</link> Brother tarafından sağlanan bir "
+"sürücü listesini verir. Aygıtınız için bir sürücü arayın, rpm(ler)i aratın "
+"ve kurun."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:298
 msgid ""
 "You should install Brother drivers before running the configuration utility."
-msgstr "Yapılandırma aracını çalıştırmadan önce Kardeş sürücüleri kurmalısınız. "
+msgstr ""
+"Yapılandırma aracını çalıştırmadan önce Kardeş sürücüleri kurmalısınız. "
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:301
 msgid ""
-"<emphasis role=\"bold\">Hewlett-Packard printers and All in one "
-"devices</emphasis>"
-msgstr "<emphasis role=\"bold\">Hewlett-Packard yaıcılar ve hepsi birarada cihazlar</emphasis>"
+"<emphasis role=\"bold\">Hewlett-Packard printers and All in one devices</"
+"emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Hewlett-Packard yaıcılar ve hepsi birarada cihazlar</"
+"emphasis>"
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:304
 msgid ""
 "These devices use the hplip tool. It is installed automatically after the "
 "detection or the selection of the printer. You can find other information "
-"<link ns2:href=\"http://hplipopensource.com/hplip-"
-"web/index.html\">here</link>.  The tool \"HP Device Manager\" is available "
-"in the <guilabel>System</guilabel> menu. Also view <link "
-"ns2:href=\"http://hplipopensource.com/hplip-"
+"<link ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">here</"
+"link>.  The tool \"HP Device Manager\" is available in the <guilabel>System</"
+"guilabel> menu. Also view <link ns2:href=\"http://hplipopensource.com/hplip-"
 "web/install/manual/hp_setup.html\">configuration</link> for the management "
 "of the printer."
-msgstr "Bu aygıtlar hplip aracını kullanırlar. Bu yazıcının algılanması ya da seçilmesinden sonra otomatik olarak kurulur.  Diğer bilgileri <link ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">burada</link>  bulabilirsiniz. \"HP Device Manager\" aracı <guilabel>Sistem</guilabel> menüsünden ulaşılabilir. Yazıcıların yönetimi için ayrıca <link ns2:href=\"http://hplipopensource.com/hplip-web/install/manual/hp_setup.html\">yapılandırma</link> ya bakınız."
+msgstr ""
+"Bu aygıtlar hplip aracını kullanırlar. Bu yazıcının algılanması ya da "
+"seçilmesinden sonra otomatik olarak kurulur.  Diğer bilgileri <link ns2:href="
+"\"http://hplipopensource.com/hplip-web/index.html\">burada</link>  "
+"bulabilirsiniz. \"HP Device Manager\" aracı <guilabel>Sistem</guilabel> "
+"menüsünden ulaşılabilir. Yazıcıların yönetimi için ayrıca <link ns2:href="
+"\"http://hplipopensource.com/hplip-web/install/manual/hp_setup.html"
+"\">yapılandırma</link> ya bakınız."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:311
@@ -8655,7 +10242,13 @@ msgid ""
 "picture on a memory card or USB stick inserted in the device.  Afterwards, "
 "open your favourite imaging software and load your picture from the memory "
 "card which is appeared in the /media folder."
-msgstr "Bir HP çok fonksiyonlu aygıtı bir yazıcı olarak eklenmeli ve tarayıcı özellikleri eklenmeli. Bazen dikkat edin, Xsane arayüzü filmleri veya slaytları (parlayan slayt işlemez) taramaya izin vermez. Bu durumda tek başına modu kullanarak taramak mümkündür, ve resim cihaza bağlı hafıza kartı veya USB belleğe kaydedilir. Sonra gözde resim düzenleme yazılımınızı açın ve /media dizini içindeki hafıza kartında bulunan resminizi yükleyin."
+msgstr ""
+"Bir HP çok fonksiyonlu aygıtı bir yazıcı olarak eklenmeli ve tarayıcı "
+"özellikleri eklenmeli. Bazen dikkat edin, Xsane arayüzü filmleri veya "
+"slaytları (parlayan slayt işlemez) taramaya izin vermez. Bu durumda tek "
+"başına modu kullanarak taramak mümkündür, ve resim cihaza bağlı hafıza kartı "
+"veya USB belleğe kaydedilir. Sonra gözde resim düzenleme yazılımınızı açın "
+"ve /media dizini içindeki hafıza kartında bulunan resminizi yükleyin."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:319
@@ -8665,10 +10258,12 @@ msgstr "<emphasis role=\"bold\">Samsung renkli yazıcı</emphasis>"
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:321
 msgid ""
-"For specific Samsung and Xerox colour printers, <link "
-"ns2:href=\"http://foo2qpdl.rkkda.com/\">this site provides drivers</link> "
-"for the QPDL protocol."
-msgstr "Belirli Samsung ve Zerox renkli yazıcılar için QPDL protokolü için <link ns2:href=\"http://foo2qpdl.rkkda.com/\">bu site sürücüler sağlar</link> "
+"For specific Samsung and Xerox colour printers, <link ns2:href=\"http://"
+"foo2qpdl.rkkda.com/\">this site provides drivers</link> for the QPDL "
+"protocol."
+msgstr ""
+"Belirli Samsung ve Zerox renkli yazıcılar için QPDL protokolü için <link ns2:"
+"href=\"http://foo2qpdl.rkkda.com/\">bu site sürücüler sağlar</link> "
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:324
@@ -8678,20 +10273,27 @@ msgstr "<emphasis role=\"bold\">Epson  yazıcılar ve tarayıcılar </emphasis>"
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:326
 msgid ""
-"Drivers for Epson printers are available from <link "
-"ns2:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this"
-" search page</link>. For the scanner part, you must install the \"iscan-"
-"data\" package first, then \"iscan\" (in this order). A iscan-plugin package"
-" can also be available and is to install. Choose the "
-"<emphasis>rpm</emphasis> packages according to your architecture."
-msgstr "Epson yazıcılar için sürücüler <link ns2:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">bu arama sayfasından</link> edinilebilir. Tarayıcı tarafı için, ilk olarak \"iscan-data\" , sonra \"iscan\" paketini kurmalısınız (bu sırayla). Bir iscan-plugin paketi ayrıca bulunur ve kurulur. Mimarinize uygun olan <emphasis>rpm</emphasis> paketlerini seçiniz."
+"Drivers for Epson printers are available from <link ns2:href=\"http://"
+"download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this search page</"
+"link>. For the scanner part, you must install the \"iscan-data\" package "
+"first, then \"iscan\" (in this order). A iscan-plugin package can also be "
+"available and is to install. Choose the <emphasis>rpm</emphasis> packages "
+"according to your architecture."
+msgstr ""
+"Epson yazıcılar için sürücüler <link ns2:href=\"http://download.ebz.epson."
+"net/dsc/search/01/search/?OSC=LX\">bu arama sayfasından</link> edinilebilir. "
+"Tarayıcı tarafı için, ilk olarak \"iscan-data\" , sonra \"iscan\" paketini "
+"kurmalısınız (bu sırayla). Bir iscan-plugin paketi ayrıca bulunur ve "
+"kurulur. Mimarinize uygun olan <emphasis>rpm</emphasis> paketlerini seçiniz."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:332
 msgid ""
 "It is possible that the iscan package will generate a warning about a "
 "conflict with sane. Users have reported that this warning can be ignored."
-msgstr "iscan paketinin sane ile çakışma hakkında bir uyarı üretmesi muhtemeldir. Kullanıcılar bu uyarının gözardı edilebileceğine dair bilgilendirilirler."
+msgstr ""
+"iscan paketinin sane ile çakışma hakkında bir uyarı üretmesi muhtemeldir. "
+"Kullanıcılar bu uyarının gözardı edilebileceğine dair bilgilendirilirler."
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:336
@@ -8703,7 +10305,9 @@ msgstr "<emphasis role=\"bold\">Canon yazıcılar</emphasis>"
 msgid ""
 "For Canon printers, it may be advisable to install a tool named turboprint "
 "<link ns2:href=\"http://www.turboprint.info/\">available here </link>."
-msgstr "Canon yazıcılar için, turboprint isminde bir aracın -<link ns2:href=\"http://www.turboprint.info/\">burada bulunabilir</link>- kurulması önerilebilir. "
+msgstr ""
+"Canon yazıcılar için, turboprint isminde bir aracın -<link ns2:href=\"http://"
+"www.turboprint.info/\">burada bulunabilir</link>- kurulması önerilebilir. "
 
 #. type: Content of: <section><info><title>
 #: en/transfugdrake.xml:9
@@ -8715,8 +10319,7 @@ msgstr "Windows (TM) belge ve ayarlarını aktar"
 msgid "transfugdrake"
 msgstr "transfugdrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:17
 msgid "transfugdrake.png"
 msgstr "transfugdrake.png"
@@ -8724,9 +10327,11 @@ msgstr "transfugdrake.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/transfugdrake.xml:22
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">transfugdrake</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">transfugdrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">transfugdrake</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">transfugdrake</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
@@ -8734,31 +10339,43 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
 "labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde <emphasis role=\"bold\">Sistem</emphasis> sekmesinde <guilabel>Windows(TM) belgelerini ve ayarlarını içe aktar</guilabel> etiketiyle bulunabilir"
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
+"<emphasis role=\"bold\">Sistem</emphasis> sekmesinde <guilabel>Windows(TM) "
+"belgelerini ve ayarlarını içe aktar</guilabel> etiketiyle bulunabilir"
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
 msgid ""
 "The tool allows an administrator to import the user documents and settings "
 "from a <trademark class=\"registered\">Windows</trademark> 2000, <trademark "
-"class=\"registered\">Windows</trademark> XP or <trademark "
-"class=\"registered\">Windows</trademark> <trademark>Vista</trademark> "
-"installation on the same computer as the Mageia installation."
-msgstr "Araç yöneticiye Mageia kurulumu ile aynı bilgisayarda olan <trademark class=\"registered\">Windows</trademark> 2000, <trademark class=\"registered\">Windows</trademark> XP veya <trademark class=\"registered\">Windows</trademark> <trademark>Vista</trademark> kurulumlarından kullanıcı belgelerinin ve ayarların içe aktarılmasına izin verir."
+"class=\"registered\">Windows</trademark> XP or <trademark class=\"registered"
+"\">Windows</trademark> <trademark>Vista</trademark> installation on the same "
+"computer as the Mageia installation."
+msgstr ""
+"Araç yöneticiye Mageia kurulumu ile aynı bilgisayarda olan <trademark class="
+"\"registered\">Windows</trademark> 2000, <trademark class=\"registered"
+"\">Windows</trademark> XP veya <trademark class=\"registered\">Windows</"
+"trademark> <trademark>Vista</trademark> kurulumlarından kullanıcı "
+"belgelerinin ve ayarların içe aktarılmasına izin verir."
 
 #. type: Content of: <section><warning><para>
 #: en/transfugdrake.xml:33
 msgid ""
 "Please note that all the changes will be applied by transfugdrake "
 "immediately after pressing <guibutton>Next</guibutton>."
-msgstr "Lütfen <guibutton>Sonraki</guibutton> düğmesine basar basmaz transfugdrake tarafından yapılan değişikliklerin uygulanacağına dikkat edin."
+msgstr ""
+"Lütfen <guibutton>Sonraki</guibutton> düğmesine basar basmaz transfugdrake "
+"tarafından yapılan değişikliklerin uygulanacağına dikkat edin."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:37
 msgid ""
 "After starting transfugdrake you will see the first wizard page with some "
 "explanation about the tool and import options."
-msgstr "transfugdrake'i başlattıktan sonra araç ve içe aktarma seçenekleri hakkında bazı açıklamaların bulunduğu ilk sihirbaz sayfasını göreceksiniz. "
+msgstr ""
+"transfugdrake'i başlattıktan sonra araç ve içe aktarma seçenekleri hakkında "
+"bazı açıklamaların bulunduğu ilk sihirbaz sayfasını göreceksiniz. "
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:40
@@ -8766,19 +10383,24 @@ msgid ""
 "As soon as you read and understand the instructions, press the "
 "<guibutton>Next</guibutton> button. This should run a detection of "
 "<trademark class=\"registered\">Windows</trademark> installation."
-msgstr "Yönergeleri okuduğunuzda ve anladığınızda, <guibutton>Sonraki</guibutton> düğmesine tıklayın. Bu <trademark class=\"registered\">Windows</trademark> kurulumu tespitini çalıştıracaktır."
+msgstr ""
+"Yönergeleri okuduğunuzda ve anladığınızda, <guibutton>Sonraki</guibutton> "
+"düğmesine tıklayın. Bu <trademark class=\"registered\">Windows</trademark> "
+"kurulumu tespitini çalıştıracaktır."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:44
 msgid ""
 "When the detection step is complete you will see a page which allows you to "
 "choose accounts in <trademark class=\"registered\">Windows</trademark> and "
-"Mageia for the import procedure. It is possible to choose other user account"
-" than yours own."
-msgstr "Tespit işlemi tamamlandığında <trademark class=\"registered\">Windows</trademark>dan Mageia'ya aktaracağınız hesapları seçebileceğiniz bir sayfa göreceksiniz. Kendi hesabınızdan farklı hesapları da seçmeniz münkün."
+"Mageia for the import procedure. It is possible to choose other user account "
+"than yours own."
+msgstr ""
+"Tespit işlemi tamamlandığında <trademark class=\"registered\">Windows</"
+"trademark>dan Mageia'ya aktaracağınız hesapları seçebileceğiniz bir sayfa "
+"göreceksiniz. Kendi hesabınızdan farklı hesapları da seçmeniz münkün."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:51
 msgid "transfugdrake1.png"
 msgstr "transfugdrake1.png"
@@ -8787,10 +10409,14 @@ msgstr "transfugdrake1.png"
 #: en/transfugdrake.xml:56
 msgid ""
 "Please take into account that due to migrate-assistant (the backend of "
-"transfugdrake) limitations <trademark "
-"class=\"registered\">Windows</trademark> user account names with special "
-"symbols can be displayed incorrectly."
-msgstr " <trademark class=\"registered\">Windows</trademark> kullanıcı hesapları ismi  özel karakterler içerip yanlış gösterilebileceği şeklindeki migrate-assistant (transfugdrake'in arka ucu) sınırlandırmaları olabilceğini hesaba katın. "
+"transfugdrake) limitations <trademark class=\"registered\">Windows</"
+"trademark> user account names with special symbols can be displayed "
+"incorrectly."
+msgstr ""
+" <trademark class=\"registered\">Windows</trademark> kullanıcı hesapları "
+"ismi  özel karakterler içerip yanlış gösterilebileceği şeklindeki migrate-"
+"assistant (transfugdrake'in arka ucu) sınırlandırmaları olabilceğini hesaba "
+"katın. "
 
 #. type: Content of: <section><note><para>
 #: en/transfugdrake.xml:62
@@ -8803,22 +10429,27 @@ msgstr "Belgeler dizinine bağlı olarak içe aktarma biraz zaman alabilir."
 msgid ""
 "Some <trademark class=\"registered\">Windows</trademark> applications "
 "(especially drivers) may create user accounts for different purposes. For "
-"example, NVidia drivers in <trademark "
-"class=\"registered\">Windows</trademark>are updated using "
-"<emphasis>UpdatusUser</emphasis>. Please do not use such accounts for the "
-"import purposes."
-msgstr "Bazı <trademark class=\"registered\">Windows</trademark> uygulamaları, (özellikle sürücüler) deişik amaçlarla kullanıcı oluşturabilirler. Örneğin <trademark class=\"registered\">Windows</trademark>daki NVidia sürücüleri <emphasis>UpdatusUser</emphasis> ile güncellenir. Lütfen içe aktarma amacıyla için böyle hesapları kullanmayınız. "
+"example, NVidia drivers in <trademark class=\"registered\">Windows</"
+"trademark>are updated using <emphasis>UpdatusUser</emphasis>. Please do not "
+"use such accounts for the import purposes."
+msgstr ""
+"Bazı <trademark class=\"registered\">Windows</trademark> uygulamaları, "
+"(özellikle sürücüler) deişik amaçlarla kullanıcı oluşturabilirler. Örneğin "
+"<trademark class=\"registered\">Windows</trademark>daki NVidia sürücüleri "
+"<emphasis>UpdatusUser</emphasis> ile güncellenir. Lütfen içe aktarma "
+"amacıyla için böyle hesapları kullanmayınız. "
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:74
 msgid ""
-"When you finished with the accounts selection press "
-"<guibutton>Next</guibutton> button. The next page is used to select a method"
-" to import documents:"
-msgstr "Hesap seçimlerini bitirdiğinizde <guibutton>Sonraki</guibutton> düğmesine basın. Sonraki sayfa belgeleri içe aktarmada yöntem seçimi için kullanılır:"
+"When you finished with the accounts selection press <guibutton>Next</"
+"guibutton> button. The next page is used to select a method to import "
+"documents:"
+msgstr ""
+"Hesap seçimlerini bitirdiğinizde <guibutton>Sonraki</guibutton> düğmesine "
+"basın. Sonraki sayfa belgeleri içe aktarmada yöntem seçimi için kullanılır:"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:80
 msgid "transfugdrake2.png"
 msgstr "transfugdrake2.png"
@@ -8826,23 +10457,29 @@ msgstr "transfugdrake2.png"
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:84
 msgid ""
-"Transfugdrake is designed to import <trademark "
-"class=\"registered\">Windows</trademark> data from <emphasis>My "
-"Documents</emphasis>, <emphasis>My Music</emphasis> and <emphasis>My "
-"Pictures</emphasis> folders. It is possible to skip import by selecting the "
-"appropriate item in this window."
-msgstr "Transfugdrake   <trademark class=\"registered\">Windows</trademark> verilerini <emphasis>Belgelerim</emphasis>, <emphasis>Müziklerim</emphasis> ve <emphasis>Resimlerim</emphasis> dizinlerinden içe aktarmak için tasarlanmıştır. Bu pencerede uygun öğeleri seçerek içe aktarmayı atamak mümkündür."
+"Transfugdrake is designed to import <trademark class=\"registered\">Windows</"
+"trademark> data from <emphasis>My Documents</emphasis>, <emphasis>My Music</"
+"emphasis> and <emphasis>My Pictures</emphasis> folders. It is possible to "
+"skip import by selecting the appropriate item in this window."
+msgstr ""
+"Transfugdrake   <trademark class=\"registered\">Windows</trademark> "
+"verilerini <emphasis>Belgelerim</emphasis>, <emphasis>Müziklerim</emphasis> "
+"ve <emphasis>Resimlerim</emphasis> dizinlerinden içe aktarmak için "
+"tasarlanmıştır. Bu pencerede uygun öğeleri seçerek içe aktarmayı atamak "
+"mümkündür."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:89
 msgid ""
 "When you finished with the document import method choosing press "
-"<guibutton>Next</guibutton> button. The next page is used to select a method"
-" to import bookmarks:"
-msgstr "Belge içe aktarma yöntemini seçtikten sonra <guibutton>Sonraki</guibutton> düğmesine basınız. Sonraki sayfa sık kullanılanların içe aktarılması yöntemini seçemk içindir:"
+"<guibutton>Next</guibutton> button. The next page is used to select a method "
+"to import bookmarks:"
+msgstr ""
+"Belge içe aktarma yöntemini seçtikten sonra <guibutton>Sonraki</guibutton> "
+"düğmesine basınız. Sonraki sayfa sık kullanılanların içe aktarılması "
+"yöntemini seçemk içindir:"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:95
 msgid "transfugdrake3.png"
 msgstr "transfugdrake3.png"
@@ -8853,22 +10490,26 @@ msgid ""
 "Transfugdrake can import <emphasis>Internet Explorer</emphasis> and "
 "<emphasis>Mozilla Firefox</emphasis> bookmarks into the bookmarks of Mageia "
 "<emphasis>Mozilla Firefox</emphasis> instance."
-msgstr "Transfugdrake <emphasis>Internet Explorer</emphasis> ve <emphasis>Mozilla Firefox</emphasis> sık kullanılanlarını Mageia <emphasis>Mozilla Firefox</emphasis> a aktarabilir."
+msgstr ""
+"Transfugdrake <emphasis>Internet Explorer</emphasis> ve <emphasis>Mozilla "
+"Firefox</emphasis> sık kullanılanlarını Mageia <emphasis>Mozilla Firefox</"
+"emphasis> a aktarabilir."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:103
 msgid ""
-"Choose the preferred import option and press the <guibutton>Next</guibutton>"
-" button."
-msgstr "Tercih edilen içe aktarma yöntemini seçin ve <guibutton>Sonraki</guibutton> düğmesine basın."
+"Choose the preferred import option and press the <guibutton>Next</guibutton> "
+"button."
+msgstr ""
+"Tercih edilen içe aktarma yöntemini seçin ve <guibutton>Sonraki</guibutton> "
+"düğmesine basın."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:112
 msgid "The next page allows you to import desktop background:"
 msgstr "Sonraki ekran masaüstü arkaplanını içe aktarmanızı sağlar:"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:116
 msgid "transfugdrake4.png"
 msgstr "transfugdrake4.png"
@@ -8876,19 +10517,21 @@ msgstr "transfugdrake4.png"
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:120
 msgid ""
-"Choose the preferred option and press the <guibutton>Next</guibutton> "
-"button."
-msgstr "Tercih edilen seçenekleri seçin ve <guibutton>Sonraki</guibutton> düğmesine basın."
+"Choose the preferred option and press the <guibutton>Next</guibutton> button."
+msgstr ""
+"Tercih edilen seçenekleri seçin ve <guibutton>Sonraki</guibutton> düğmesine "
+"basın."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:123
 msgid ""
 "The last page of wizard shows some congratulation message. Just press the "
 "<guibutton>Finish</guibutton> button."
-msgstr "Sihirbazın son sayfası bazı tebrik mesajlarını gösterir. <guibutton>Bitir</guibutton> düğmesine basmanız yeterli."
+msgstr ""
+"Sihirbazın son sayfası bazı tebrik mesajlarını gösterir. <guibutton>Bitir</"
+"guibutton> düğmesine basmanız yeterli."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/transfugdrake.xml:128
 msgid "transfugdrake5.png"
 msgstr "transfugdrake5.png"
@@ -8903,8 +10546,7 @@ msgstr "Kullanıcılar ve Gruplar"
 msgid "userdrake"
 msgstr "userdrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/userdrake.xml:18
 msgid "userdrake.png"
 msgstr "userdrake.png"
@@ -8912,9 +10554,11 @@ msgstr "userdrake.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/userdrake.xml:23
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">userdrake</emphasis> as root."
-msgstr "Bu aracı komut satırında root olarak <emphasis role=\"bold\">userdrake</emphasis> yazarak çalıştırabilirsiniz."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">userdrake</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında root olarak <emphasis role=\"bold\">userdrake</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:22
@@ -8922,23 +10566,33 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
 "labelled \"Manage users on system\""
-msgstr "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde <emphasis role=\"bold\">Sistem</emphasis> sekmesinde \"Sistemdeki kullanıcıları yönet\" etiketiyle bulunur."
+msgstr ""
+"Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
+"<emphasis role=\"bold\">Sistem</emphasis> sekmesinde \"Sistemdeki "
+"kullanıcıları yönet\" etiketiyle bulunur."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:27
 msgid ""
 "The tool allows an administrator to manage the users and the groups, this "
-"means to add or delete a user or group and to modify user and group settings"
-" (ID, shell, ...)"
-msgstr "Araç yöneticilerin kullanıcıları ve grupları yönetmesini sağlar, bu kullanıcı ve grupların eklenmesi ve kullanıcı ve grup ayarlarının değiştirilmesi anlamına gelir (ID, kabuk, ...)"
+"means to add or delete a user or group and to modify user and group settings "
+"(ID, shell, ...)"
+msgstr ""
+"Araç yöneticilerin kullanıcıları ve grupları yönetmesini sağlar, bu "
+"kullanıcı ve grupların eklenmesi ve kullanıcı ve grup ayarlarının "
+"değiştirilmesi anlamına gelir (ID, kabuk, ...)"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:31
 msgid ""
-"When userdrake is opened, all the users existing on the system are listed in"
-" the <guibutton>Users</guibutton> tab, and all the groups in the "
+"When userdrake is opened, all the users existing on the system are listed in "
+"the <guibutton>Users</guibutton> tab, and all the groups in the "
 "<guibutton>Groups</guibutton> tab. Both tabs operate the same way."
-msgstr "userdrake açıldığı zaman, sistemde bulunan tüm kullanıcılar <guibutton>Kullanıcılar sekmesinde ve </guibutton> tüm gruplar <guibutton>Grouplar</guibutton> sekmesinde listelenir. Her iki sekme de benzer şekilde çalışır."
+msgstr ""
+"userdrake açıldığı zaman, sistemde bulunan tüm kullanıcılar "
+"<guibutton>Kullanıcılar sekmesinde ve </guibutton> tüm gruplar "
+"<guibutton>Grouplar</guibutton> sekmesinde listelenir. Her iki sekme de "
+"benzer şekilde çalışır."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:35
@@ -8950,8 +10604,7 @@ msgstr "<guibutton>1 Kullanıcı Ekle</guibutton>"
 msgid "This button opens a new window with all fields shown empty:"
 msgstr "Bu düğme tüm alanlar boş olarak gösterilen bir pencere açar:"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/userdrake.xml:41
 msgid "userdrake1.png"
 msgstr "userdrake1.png"
@@ -8962,7 +10615,9 @@ msgid ""
 "The field <emphasis role=\"bold\">Full Name</emphasis> is intended for the "
 "entry of a family name and first name, but it is possible to write anything "
 "or nothing as well!"
-msgstr "<emphasis role=\"bold\">Tam İsim</emphasis> alanı soyisim ve isim girdisi içindir, fakat herhangi bir şey yazılabilir ya da hiçbir şey yazılmayabilir!"
+msgstr ""
+"<emphasis role=\"bold\">Tam İsim</emphasis> alanı soyisim ve isim girdisi "
+"içindir, fakat herhangi bir şey yazılabilir ya da hiçbir şey yazılmayabilir!"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:49
@@ -8972,19 +10627,26 @@ msgstr "<emphasis role=\"bold\">Oturum</emphasis> gerekli olan tek alandır."
 #. type: Content of: <section><para>
 #: en/userdrake.xml:52
 msgid ""
-"Setting a <emphasis role=\"bold\">Password</emphasis> is highly recommended."
-" There is a little shield on the right, if it is red, the password is weak, "
-"too short or is too similar to the login name. You should use figures, lower"
-" and upper case characters, punctuation marks, etc. The shield will turn "
+"Setting a <emphasis role=\"bold\">Password</emphasis> is highly recommended. "
+"There is a little shield on the right, if it is red, the password is weak, "
+"too short or is too similar to the login name. You should use figures, lower "
+"and upper case characters, punctuation marks, etc. The shield will turn "
 "orange and then green as the password strength improves."
-msgstr "Bir <emphasis role=\"bold\">Parola</emphasis> girmek şiddetle tavsiye edilir. Sağda küçük bir muhafaza bulunur, eğer kırmızı ise parola zayıf, çok kısa ya da oturum ismine çok benzerdir. Simgeleri, küçük ve büyük harflari, noktalama işaretlerini vb. kullanmalısınız. Muhafaza parola güçlülüğü yükseldikçe turuncu ve sonra da yeşil olacaktır."
+msgstr ""
+"Bir <emphasis role=\"bold\">Parola</emphasis> girmek şiddetle tavsiye "
+"edilir. Sağda küçük bir muhafaza bulunur, eğer kırmızı ise parola zayıf, çok "
+"kısa ya da oturum ismine çok benzerdir. Simgeleri, küçük ve büyük harflari, "
+"noktalama işaretlerini vb. kullanmalısınız. Muhafaza parola güçlülüğü "
+"yükseldikçe turuncu ve sonra da yeşil olacaktır."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:59
 msgid ""
-"<emphasis role=\"bold\">Confirm Password</emphasis> field is there to ensure"
-" you entered what you intended to."
-msgstr "<emphasis role=\"bold\">Parolayı onayla</emphasis> alanı girdiğiniz doğru bir şekilde yaptığınızdan emin olmak içindir."
+"<emphasis role=\"bold\">Confirm Password</emphasis> field is there to ensure "
+"you entered what you intended to."
+msgstr ""
+"<emphasis role=\"bold\">Parolayı onayla</emphasis> alanı girdiğiniz doğru "
+"bir şekilde yaptığınızdan emin olmak içindir."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:62
@@ -8992,7 +10654,10 @@ msgid ""
 "<emphasis role=\"bold\">Login Shell </emphasis>is a drop down list that "
 "allows you to change the shell used by the user you are adding, the options "
 "are Bash, Dash and Sh."
-msgstr "<emphasis role=\"bold\">Oturum Kabuğu </emphasis> eklediğiniz kullanıcının kullandığı kabuğu değiştirdiğiniz, seçenekleri Bash, Dash ve Sh olan bir aşağı açılır listedir."
+msgstr ""
+"<emphasis role=\"bold\">Oturum Kabuğu </emphasis> eklediğiniz kullanıcının "
+"kullandığı kabuğu değiştirdiğiniz, seçenekleri Bash, Dash ve Sh olan bir "
+"aşağı açılır listedir."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:66
@@ -9000,14 +10665,19 @@ msgid ""
 "<emphasis role=\"bold\">Create a private group for the user</emphasis>, if "
 "checked will automatically create a group with the same name and the new "
 "user as the only member (this may be edited)."
-msgstr "<emphasis role=\"bold\">Kullanıcı için özel grup oluştur</emphasis>, eğer işaretlenmişse otomatik olarak aynı isimde bir grup oluşturulur ve sadece bu kullanıcı bu gruba üye olur ( bu düzenlenebilir)."
+msgstr ""
+"<emphasis role=\"bold\">Kullanıcı için özel grup oluştur</emphasis>, eğer "
+"işaretlenmişse otomatik olarak aynı isimde bir grup oluşturulur ve sadece bu "
+"kullanıcı bu gruba üye olur ( bu düzenlenebilir)."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:70
 msgid ""
 "The other options should be obvious. The new user is created immediately "
 "after you click on <guibutton>OK</guibutton>."
-msgstr "Diğer seçenekler anlaşılır olmalı. <guibutton>TAMAM</guibutton> düğmesine tıklar tıklamaz yeni kullanıcı oluşturulur."
+msgstr ""
+"Diğer seçenekler anlaşılır olmalı. <guibutton>TAMAM</guibutton> düğmesine "
+"tıklar tıklamaz yeni kullanıcı oluşturulur."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:73
@@ -9019,7 +10689,8 @@ msgstr "<emphasis role=\"bold\">2 Grup Ekle</emphasis>"
 msgid ""
 "You only need to enter the new group name, and if required, the specific "
 "group ID."
-msgstr "Sadece yeni grup ismi ve gerekliyse belirli grup IDsi girmeniz gerekir."
+msgstr ""
+"Sadece yeni grup ismi ve gerekliyse belirli grup IDsi girmeniz gerekir."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:78
@@ -9031,15 +10702,16 @@ msgstr "<emphasis role=\"bold\">3 Düzenle</emphasis> (seçili bir kullanıcıy�
 msgid ""
 "<guibutton>User Data</guibutton>: Allows you to modify all the data given "
 "for the user at creation (the ID can't be changed)."
-msgstr "<guibutton>Kullanıcı Verisi</guibutton>: oluşturma sırasında kullanıcıya verilen tüm verileri değiştirmenizi sağlar (ID değiştirilemez)."
+msgstr ""
+"<guibutton>Kullanıcı Verisi</guibutton>: oluşturma sırasında kullanıcıya "
+"verilen tüm verileri değiştirmenizi sağlar (ID değiştirilemez)."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:83
 msgid "<emphasis role=\"bold\">Account Info</emphasis>:"
 msgstr "<emphasis role=\"bold\">Hesap Bilgisi</emphasis>:"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/userdrake.xml:87
 msgid "userdrake2.png"
 msgstr "userdrake2.png"
@@ -9050,14 +10722,18 @@ msgid ""
 "The first option is for setting an expiration date for the account.  "
 "Connection is impossible after this date. This is useful for temporary "
 "accounts."
-msgstr "İlk seçenek hesap için son kullanma tarihi için ayardır. Bu tarihten sonra bağlantı mümkün değildir. Bu geçici hesaplar için uygundur."
+msgstr ""
+"İlk seçenek hesap için son kullanma tarihi için ayardır. Bu tarihten sonra "
+"bağlantı mümkün değildir. Bu geçici hesaplar için uygundur."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:95
 msgid ""
 "The second option is to lock the account, connection is impossible as long "
 "as the account is locked."
-msgstr "İkinci seçenek hesabı klitlemedir, hesap kilitli kaldığı sürece bağlantı mümkün değildir."
+msgstr ""
+"İkinci seçenek hesabı klitlemedir, hesap kilitli kaldığı sürece bağlantı "
+"mümkün değildir."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:98
@@ -9070,10 +10746,12 @@ msgid ""
 "<emphasis role=\"bold\">Password Info</emphasis>: Allows you to set an "
 "expiration date for the password, this forces the user to change his "
 "password periodically."
-msgstr "<emphasis role=\"bold\">Parola Bilgisi</emphasis>: Parola için son kullanma tarihi ayarlamanızı sağlar, bu kullanıcıyı periyodik olarak parolasını değiştirmeye zorlar."
+msgstr ""
+"<emphasis role=\"bold\">Parola Bilgisi</emphasis>: Parola için son kullanma "
+"tarihi ayarlamanızı sağlar, bu kullanıcıyı periyodik olarak parolasını "
+"değiştirmeye zorlar."
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/userdrake.xml:106
 msgid "userdrake3.png"
 msgstr "userdrake3.png"
@@ -9083,14 +10761,18 @@ msgstr "userdrake3.png"
 msgid ""
 "<emphasis role=\"bold\">Group</emphasis>: Here you can select the groups "
 "that the user is a member of."
-msgstr "<emphasis role=\"bold\">Grup</emphasis>: Burada kullanıcının üyesi olacağı grubu seçebilirsiniz."
+msgstr ""
+"<emphasis role=\"bold\">Grup</emphasis>: Burada kullanıcının üyesi olacağı "
+"grubu seçebilirsiniz."
 
 #. type: Content of: <section><note><para>
 #: en/userdrake.xml:114
 msgid ""
 "If you are modifying a connected user account, modifications will not be "
 "effective until his/her next login."
-msgstr "Bağlı bir kullanıcıda değişiklik yaparsanız, değişiklikler bir sonraki oturumuna kadar geçerli olmaz."
+msgstr ""
+"Bağlı bir kullanıcıda değişiklik yaparsanız, değişiklikler bir sonraki "
+"oturumuna kadar geçerli olmaz."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:118
@@ -9102,14 +10784,18 @@ msgstr "<emphasis role=\"bold\">4 Düzenle</emphasis> (seçili bir grupla)"
 msgid ""
 "<emphasis role=\"bold\">Group Data</emphasis>: Allows you to modify the "
 "group name."
-msgstr "<emphasis role=\"bold\">Grup Verisi</emphasis>: Grup ismini değiştirmenizi sağlar."
+msgstr ""
+"<emphasis role=\"bold\">Grup Verisi</emphasis>: Grup ismini değiştirmenizi "
+"sağlar."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:123
 msgid ""
 "<emphasis role=\"bold\">Group Users</emphasis>: Here you can select the "
 "users who are members of the group"
-msgstr "<emphasis role=\"bold\">Grup Kullanıcıları</emphasis>: Burada grubun üyesi olacak kullanıcıları seçebilirsiniz"
+msgstr ""
+"<emphasis role=\"bold\">Grup Kullanıcıları</emphasis>: Burada grubun üyesi "
+"olacak kullanıcıları seçebilirsiniz"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:126
@@ -9119,11 +10805,15 @@ msgstr "<emphasis role=\"bold\">5 Sil</emphasis>"
 #. type: Content of: <section><para>
 #: en/userdrake.xml:128
 msgid ""
-"Select a user or a group and click on <emphasis "
-"role=\"bold\">Delete</emphasis> to remove it. For a user, a window appears "
-"to ask if home directory and mailbox must also be deleted. If a private "
-"group has been created for the user, it will be deleted as well."
-msgstr "Bir kullanıcı ya da grubu seçin ve kaldırmak için <emphasis role=\"bold\">Sil</emphasis> düğmesine tıklayın. Bir kullanıcı için, ev dizininin ve posta kurusunun silinip silinmeyeceğini soran bir pencere çıkar. Kullanıcı için oluşturulmuş özel bir grup varsa bu da silinir."
+"Select a user or a group and click on <emphasis role=\"bold\">Delete</"
+"emphasis> to remove it. For a user, a window appears to ask if home "
+"directory and mailbox must also be deleted. If a private group has been "
+"created for the user, it will be deleted as well."
+msgstr ""
+"Bir kullanıcı ya da grubu seçin ve kaldırmak için <emphasis role=\"bold"
+"\">Sil</emphasis> düğmesine tıklayın. Bir kullanıcı için, ev dizininin ve "
+"posta kurusunun silinip silinmeyeceğini soran bir pencere çıkar. Kullanıcı "
+"için oluşturulmuş özel bir grup varsa bu da silinir."
 
 #. type: Content of: <section><warning><para>
 #: en/userdrake.xml:133
@@ -9138,9 +10828,11 @@ msgstr "<emphasis role=\"bold\">6 Yenile</emphasis>"
 #. type: Content of: <section><para>
 #: en/userdrake.xml:138
 msgid ""
-"The User database can be changed outside of Userdrake. Click on this icon to"
-" refresh the display."
-msgstr "Kullanıcı veritabanı Userdrake dışından değiştirilebilir. Görüntüyü yenilemek için bu simgeye tıklayın."
+"The User database can be changed outside of Userdrake. Click on this icon to "
+"refresh the display."
+msgstr ""
+"Kullanıcı veritabanı Userdrake dışından değiştirilebilir. Görüntüyü "
+"yenilemek için bu simgeye tıklayın."
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:141
@@ -9153,11 +10845,17 @@ msgid ""
 "<emphasis role=\"bold\">guest</emphasis> is a special account. It is "
 "intended to give somebody temporary access to the system with total "
 "security. Login is xguest, there is no password, and it is impossible to "
-"make modifications to the system from this account. The personal directories"
-" are deleted at the end of the session. This account is enabled by default, "
+"make modifications to the system from this account. The personal directories "
+"are deleted at the end of the session. This account is enabled by default, "
 "to disable it, click in the menu on<guimenu> Actions -> Uninstall guest "
 "account</guimenu>."
-msgstr "<emphasis role=\"bold\">guest</emphasis> özel bir hesaptır. Herhangi bir kişiye geçici olarak tam güvenlik ile sisteme eriişm verilmesi içindir. Oturum açma xguestdir, parola yoktur, ve bu hesapla sistemde değişiklik yapmak mümkün değildir. Oturum sonunda kişisel dizinler silinir. Bu hesap varsayılan olarak etkindir, devre dışı bırakmak için menüde, <guimenu> Eylemler-> Misafir hesabını kaldr</guimenu>a tıklayın."
+msgstr ""
+"<emphasis role=\"bold\">guest</emphasis> özel bir hesaptır. Herhangi bir "
+"kişiye geçici olarak tam güvenlik ile sisteme eriişm verilmesi içindir. "
+"Oturum açma xguestdir, parola yoktur, ve bu hesapla sistemde değişiklik "
+"yapmak mümkün değildir. Oturum sonunda kişisel dizinler silinir. Bu hesap "
+"varsayılan olarak etkindir, devre dışı bırakmak için menüde, <guimenu> "
+"Eylemler-> Misafir hesabını kaldr</guimenu>a tıklayın."
 
 #. type: Content of: <section><info><title>
 #: en/XFdrake.xml:3
@@ -9169,8 +10867,7 @@ msgstr "Grafiksel sunucu ayarlayın"
 msgid "XFdrake"
 msgstr "XFdrake"
 
-#. type: Attribute 'fileref' of:
-#. <section><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/XFdrake.xml:10
 msgid "XFdrake.png"
 msgstr "XFdrake.png"
@@ -9178,19 +10875,25 @@ msgstr "XFdrake.png"
 #. type: Content of: <section><para><footnote><para>
 #: en/XFdrake.xml:17
 msgid ""
-"You can start this tool from the command line, by typing "
-"<emphasis>XFdrake</emphasis> as normal user or <emphasis>drakx11</emphasis> "
-"as root. Mind the capital letters."
-msgstr "Bu aracı komut satırındanormal kullanıcı ile <emphasis>XFdrake</emphasis> yazarak ya da root ile <emphasis>drakx11</emphasis> yazarak çalıştırabilirsiniz. Büyük harflere dikkat edin."
+"You can start this tool from the command line, by typing <emphasis>XFdrake</"
+"emphasis> as normal user or <emphasis>drakx11</emphasis> as root. Mind the "
+"capital letters."
+msgstr ""
+"Bu aracı komut satırındanormal kullanıcı ile <emphasis>XFdrake</emphasis> "
+"yazarak ya da root ile <emphasis>drakx11</emphasis> yazarak "
+"çalıştırabilirsiniz. Büyük harflere dikkat edin."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:14
 msgid ""
 "This tool is present in the Mageia Control Center under the tab <emphasis "
 "role=\"bold\">Hardware</emphasis>. Select <emphasis><guilabel>Set up the "
-"graphical server</guilabel></emphasis>.  <placeholder type=\"footnote\" "
-"id=\"0\"/>"
-msgstr "Bu araç Mageia Denetim Merkezi altında <emphasis role=\"bold\">Donanım</emphasis>sekmesinde bulunur. <emphasis><guilabel>Grafik sunucuları kur</guilabel></emphasis> seçiniz. <placeholder type=\"footnote\" id=\"0\"/>"
+"graphical server</guilabel></emphasis>.  <placeholder type=\"footnote\" id="
+"\"0\"/>"
+msgstr ""
+"Bu araç Mageia Denetim Merkezi altında <emphasis role=\"bold\">Donanım</"
+"emphasis>sekmesinde bulunur. <emphasis><guilabel>Grafik sunucuları kur</"
+"guilabel></emphasis> seçiniz. <placeholder type=\"footnote\" id=\"0\"/>"
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:23
@@ -9208,7 +10911,10 @@ msgid ""
 "The graphic card currently detected is displayed and the matching server "
 "configured. Click on this button to change to another server, for example "
 "one with a proprietary driver."
-msgstr "Şu anda tespit edilen grafik kartı gösterilirdi ve uygun sunucu yapılandırıldı.  Başka bir sunucuya değiştirmek için bu düğmeye tıklayın, örneğin özel bir sürücü ile."
+msgstr ""
+"Şu anda tespit edilen grafik kartı gösterilirdi ve uygun sunucu "
+"yapılandırıldı.  Başka bir sunucuya değiştirmek için bu düğmeye tıklayın, "
+"örneğin özel bir sürücü ile."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:31
@@ -9217,7 +10923,11 @@ msgid ""
 "manufacturer in alphabetical order and then by model also in alphabetical "
 "order. The free drivers are sorted by alphabetical order under<guilabel> "
 "Xorg</guilabel>."
-msgstr "Mümkün sunucular <guilabel>Satıcı</guilabel> altında üreticilerine göre alfabetik sırada ve sonra ayrıca modeline göre alfabetik sıralı olarak bulunur. Özgür sürücüler <guilabel> Xorg</guilabel> altında alfabetik olarak sıralıdır."
+msgstr ""
+"Mümkün sunucular <guilabel>Satıcı</guilabel> altında üreticilerine göre "
+"alfabetik sırada ve sonra ayrıca modeline göre alfabetik sıralı olarak "
+"bulunur. Özgür sürücüler <guilabel> Xorg</guilabel> altında alfabetik olarak "
+"sıralıdır."
 
 #. type: Content of: <section><para><note><para>
 #: en/XFdrake.xml:37
@@ -9225,7 +10935,10 @@ msgid ""
 "In case of problems, <emphasis>Xorg - Vesa</emphasis> will work with most "
 "graphic cards and give you time to find and install the right driver while "
 "in your Desktop Environment."
-msgstr "Problem olması durumunda <emphasis>Xorg - Vesa</emphasis> bir çok ekran kartı ile çalışacaktır ve size Masaüstü Ortamını kullanırken doğru sürücüyü bulup kurmanız için zaman kazandıracaktır. "
+msgstr ""
+"Problem olması durumunda <emphasis>Xorg - Vesa</emphasis> bir çok ekran "
+"kartı ile çalışacaktır ve size Masaüstü Ortamını kullanırken doğru sürücüyü "
+"bulup kurmanız için zaman kazandıracaktır. "
 
 #. type: Content of: <section><para><note><para>
 #: en/XFdrake.xml:38
@@ -9233,15 +10946,19 @@ msgid ""
 "If even Vesa doesn't work, choose <emphasis><guilabel>Xorg</guilabel> - "
 "<guilabel>fbdev</guilabel></emphasis>, which is used while installing "
 "Mageia, but doesn't allow you to change resolution or refresh rates."
-msgstr "Eğer Vesa çalışmasa bile, Mageia'yı kurarken kullanılan fakat çözünürlüğü ve tazeleme oranını değiştirmeye izin vermeyen <emphasis><guilabel>Xorg</guilabel> - <guilabel>fbdev</guilabel></emphasis> i seçiniz. "
+msgstr ""
+"Eğer Vesa çalışmasa bile, Mageia'yı kurarken kullanılan fakat çözünürlüğü ve "
+"tazeleme oranını değiştirmeye izin vermeyen <emphasis><guilabel>Xorg</"
+"guilabel> - <guilabel>fbdev</guilabel></emphasis> i seçiniz. "
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:39
 msgid ""
 "If you made your choice for a free driver, you may be asked if you want to "
-"use a proprietary driver instead with more features (3D effects for "
-"example)."
-msgstr "Eğer özgür bir sürücü seçimi yaptıysanız, daha fazla özellikli (3D etkiler örneğin) sahipli bir sürücü kullanmak isteyip istemediğiniz sorulabilir."
+"use a proprietary driver instead with more features (3D effects for example)."
+msgstr ""
+"Eğer özgür bir sürücü seçimi yaptıysanız, daha fazla özellikli (3D etkiler "
+"örneğin) sahipli bir sürücü kullanmak isteyip istemediğiniz sorulabilir."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:45
@@ -9252,10 +10969,14 @@ msgstr "<emphasis role=\"bold\">Ekran:</emphasis>"
 #: en/XFdrake.xml:47
 msgid ""
 "In the same way as above, the monitor currently detected is displayed and "
-"you can click on the button to change to another one. If the desired monitor"
-" isn't in the <guilabel>Vendor</guilabel> list, choose in the "
+"you can click on the button to change to another one. If the desired monitor "
+"isn't in the <guilabel>Vendor</guilabel> list, choose in the "
 "<guilabel>Generic</guilabel> list a monitor with the same features."
-msgstr "Yukarıdaki ile aynı şekilde, aktif olarak algılanan ekran gösterilir ve bir başkasıyla değiştirmek için düğmeye tıklayabilirsiniz. Eğer istenen ekran <guilabel>Üretici</guilabel> listesinde bulunmuyorsa, <guilabel>Genel</guilabel> listesinden aynı özelliklerde bir ekran seçiniz."
+msgstr ""
+"Yukarıdaki ile aynı şekilde, aktif olarak algılanan ekran gösterilir ve bir "
+"başkasıyla değiştirmek için düğmeye tıklayabilirsiniz. Eğer istenen ekran "
+"<guilabel>Üretici</guilabel> listesinde bulunmuyorsa, <guilabel>Genel</"
+"guilabel> listesinden aynı özelliklerde bir ekran seçiniz."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:54
@@ -9267,10 +10988,11 @@ msgstr "<emphasis role=\"bold\">Çözünürlük:</emphasis>"
 msgid ""
 "This button allows the choice of the resolution (number of pixels) and the "
 "colour depth (number of colours). It displays this screen:"
-msgstr "Bu düğme çöznünürlük (benek sayısı) ve renk derinliği (renk sayısı) seçeneğini sağlar. Şu ekranı görüntüler:"
+msgstr ""
+"Bu düğme çöznünürlük (benek sayısı) ve renk derinliği (renk sayısı) "
+"seçeneğini sağlar. Şu ekranı görüntüler:"
 
-#. type: Attribute 'fileref' of:
-#. <section><para><mediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <section><para><mediaobject><imageobject><imagedata>
 #: en/XFdrake.xml:61
 msgid "XFdrake1.png"
 msgstr "XFdrake1.png"
@@ -9280,31 +11002,42 @@ msgstr "XFdrake1.png"
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>The image of the monitor in the "
 "middle gives a preview with the chosen configuration."
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>Ortadaki ekran görüntüsü seçilen yapılandırma ile önizleme verir."
+msgstr ""
+"<placeholder type=\"mediaobject\" id=\"0\"/>Ortadaki ekran görüntüsü seçilen "
+"yapılandırma ile önizleme verir."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:66
 msgid ""
-"The first button shows the currently resolution, click to change for another"
-" one. The list gives all the possible choices according to the graphic card "
+"The first button shows the currently resolution, click to change for another "
+"one. The list gives all the possible choices according to the graphic card "
 "and the monitor, it is possible to click on <guilabel>Other</guilabel> to "
 "set other resolutions, but bear in mind that you can damage your monitor or "
 "select an uncomfortable setting."
-msgstr "İlk düğme aktif çözünürlüğü gösterir, bir diğeriyle değiştirmek için tıklayın. Liste ekran kartınıza ve ekranınıza bağlı olarak mümkün seçenekleri verir, <guilabel>Diğer</guilabel> e tıklayarak başka bir çözünürlük ayarlamak mümkündür, fakat ekranınıza zarar verebileceğinizi ve uygun olmayan bir ayar seçebileceğinizi aklınızdan çıkarmayın."
+msgstr ""
+"İlk düğme aktif çözünürlüğü gösterir, bir diğeriyle değiştirmek için "
+"tıklayın. Liste ekran kartınıza ve ekranınıza bağlı olarak mümkün "
+"seçenekleri verir, <guilabel>Diğer</guilabel> e tıklayarak başka bir "
+"çözünürlük ayarlamak mümkündür, fakat ekranınıza zarar verebileceğinizi ve "
+"uygun olmayan bir ayar seçebileceğinizi aklınızdan çıkarmayın."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:72
 msgid ""
-"The second button shows the currently colour depth, click to change this for"
-" another one."
-msgstr "İkinci düğme aktif renk derinliğini gösterir, bunu bir başkasıyla değiştirmek için tıklayın."
+"The second button shows the currently colour depth, click to change this for "
+"another one."
+msgstr ""
+"İkinci düğme aktif renk derinliğini gösterir, bunu bir başkasıyla "
+"değiştirmek için tıklayın."
 
 #. type: Content of: <section><para><note><para>
 #: en/XFdrake.xml:76
 msgid ""
 "Depending on the chosen resolution, it may be necessary to logout and "
 "restart the graphical environment for the settings to take effect."
-msgstr "Seçilen çözünürlüğe bağlı olarak, ayarların etkili olabilmesi için grafik ortamdan çıkıp yeniden başlatmanız gerekebilir."
+msgstr ""
+"Seçilen çözünürlüğe bağlı olarak, ayarların etkili olabilmesi için grafik "
+"ortamdan çıkıp yeniden başlatmanız gerekebilir."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:83
@@ -9317,15 +11050,21 @@ msgid ""
 "Once the configuration done, it is recommended to do a test before clicking "
 "on OK because it is easier to modify the settings now than later if the "
 "graphical environment doesn't work."
-msgstr "Yapılandırma tamamlandığında, TAMAM düğmesine tıklamadan önce test etmeniz önerilir çünkü grafik ekranın çalışmaması durumuna göre bunu burada değiştirmeniz daha kolaydır."
+msgstr ""
+"Yapılandırma tamamlandığında, TAMAM düğmesine tıklamadan önce test etmeniz "
+"önerilir çünkü grafik ekranın çalışmaması durumuna göre bunu burada "
+"değiştirmeniz daha kolaydır."
 
 #. type: Content of: <section><para><note><para>
 #: en/XFdrake.xml:90
 msgid ""
 "In case of a non working graphical environment, type Alt+Ctrl+F2 to open a "
-"text environment, connect as root and type XFdrake (with the caps) to to use"
-" XFdrake's text version."
-msgstr "Grafik ekranın çalışmaması durumunda, metin ortamı açmak için Alt+Ctrl+F2 tuşlayınız, root olarak XFdrake'in metin sürümünü kullanmak için XFdrake (büyük harfli) yazınız."
+"text environment, connect as root and type XFdrake (with the caps) to to use "
+"XFdrake's text version."
+msgstr ""
+"Grafik ekranın çalışmaması durumunda, metin ortamı açmak için Alt+Ctrl+F2 "
+"tuşlayınız, root olarak XFdrake'in metin sürümünü kullanmak için XFdrake "
+"(büyük harfli) yazınız."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:93
@@ -9333,7 +11072,11 @@ msgid ""
 "If the test fails, just wait until the end, if it works but you don't want "
 "to change after all, click on <guibutton>No</guibutton>, if everything is "
 "right, click on <guibutton role=\"bold\">OK</guibutton>."
-msgstr "Eğer test başarısız olursa, sona kadar bekleyin, eğer başarılı olursa fakat sonra değişiklik yapmak istemezseniz <guibutton>Hayır</guibutton> düğmesine tıklayın, eğer herşey doğruysa <guibutton role=\"bold\">TAMAM</guibutton> düğmesine tıklayın."
+msgstr ""
+"Eğer test başarısız olursa, sona kadar bekleyin, eğer başarılı olursa fakat "
+"sonra değişiklik yapmak istemezseniz <guibutton>Hayır</guibutton> düğmesine "
+"tıklayın, eğer herşey doğruysa <guibutton role=\"bold\">TAMAM</guibutton> "
+"düğmesine tıklayın."
 
 #. type: Content of: <section><orderedlist><title>
 #: en/XFdrake.xml:97
@@ -9346,29 +11089,45 @@ msgid ""
 "<guilabel>Global options</guilabel>: If <emphasis>Disable Ctrl-Alt-"
 "Backspace</emphasis> is checked, it will no longer be possible to restart X "
 "server using Ctrl+Alt+Backspace keys."
-msgstr "<guilabel>Global seçenekler</guilabel>: Eğer <emphasis>Ctrl-Alt-Backspace'i devre dışı bırak</emphasis> işaretlenmiş ise, Ctrl+Alt+Backspace tuşlarını X sunucuyu yeniden başlatmak için kullanmak artık mümkün olmayacak."
+msgstr ""
+"<guilabel>Global seçenekler</guilabel>: Eğer <emphasis>Ctrl-Alt-Backspace'i "
+"devre dışı bırak</emphasis> işaretlenmiş ise, Ctrl+Alt+Backspace tuşlarını X "
+"sunucuyu yeniden başlatmak için kullanmak artık mümkün olmayacak."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/XFdrake.xml:103
 msgid ""
 "<guilabel>Graphic card options</guilabel>: Allows you to enable or disable "
 "three specific features depending on the graphic card."
-msgstr "<guilabel>Ekran kartı seçenekleri</guilabel>: ekran kartına bağlı olarak üç belirli özelliği etkinleştirmeyi veya devre dışında bırakmayı sağlar."
+msgstr ""
+"<guilabel>Ekran kartı seçenekleri</guilabel>: ekran kartına bağlı olarak üç "
+"belirli özelliği etkinleştirmeyi veya devre dışında bırakmayı sağlar."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/XFdrake.xml:107
 msgid ""
 "<guilabel>Graphical interface at startup</guilabel>: Most of the time, "
-"<emphasis>Automatically start the graphical interface (Xorg) upon "
-"booting</emphasis> is checked to make the boot switch to graphical mode, it "
-"may be unchecked for a server."
-msgstr "<guilabel>Açılışta Grafik arayüz </guilabel>: Çoğu zaman <emphasis>Önyükleme ardından otomatik olarak grafik arayüzünü (Xorg) başlat</emphasis>, önyüklemenin grafik moduna geçmesi için  işaretlidir, sunucu için işaretlenmemiş olabilir."
+"<emphasis>Automatically start the graphical interface (Xorg) upon booting</"
+"emphasis> is checked to make the boot switch to graphical mode, it may be "
+"unchecked for a server."
+msgstr ""
+"<guilabel>Açılışta Grafik arayüz </guilabel>: Çoğu zaman <emphasis>Önyükleme "
+"ardından otomatik olarak grafik arayüzünü (Xorg) başlat</emphasis>, "
+"önyüklemenin grafik moduna geçmesi için  işaretlidir, sunucu için "
+"işaretlenmemiş olabilir."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:112
 msgid ""
-"After a click on the <guibutton>Quit</guibutton> button, the system will ask"
-" you to confirm.  There is still time to cancel everything and keep the "
+"After a click on the <guibutton>Quit</guibutton> button, the system will ask "
+"you to confirm.  There is still time to cancel everything and keep the "
 "previous configuration, or to accept. In this case, you have to disconnect "
 "and reconnect to activate the new configuration."
-msgstr "<guibutton>Çıkış</guibutton> düğmesine tıkladıktan sonra, sistem onaylamanızı isteyecektir. Hala herşeyi iptaledip önceki yapılandırmayı koruma veya kabul etme fırsatı vardır. Bu durumda, yeni yapılandırmanın etkili olabilmesi için bağlantıyı kapatıp yeniden bağlanmalısınız."
+msgstr ""
+"<guibutton>Çıkış</guibutton> düğmesine tıkladıktan sonra, sistem "
+"onaylamanızı isteyecektir. Hala herşeyi iptaledip önceki yapılandırmayı "
+"koruma veya kabul etme fırsatı vardır. Bu durumda, yeni yapılandırmanın "
+"etkili olabilmesi için bağlantıyı kapatıp yeniden bağlanmalısınız."
+
+#~ msgid "Another lesson learned."
+#~ msgstr "Bir başka ders öğrenildi."
diff --git a/docs/mcc-help/uk.po b/docs/mcc-help/uk.po
index defbae0f..3b6fc8cd 100644
--- a/docs/mcc-help/uk.po
+++ b/docs/mcc-help/uk.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia rpmdrake help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-03-06 22:18+0200\n"
-"PO-Revision-Date: 2014-03-07 12:41+0200\n"
+"POT-Creation-Date: 2014-05-02 12:04+0300\n"
+"PO-Revision-Date: 2014-05-02 12:05+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
@@ -57,8 +57,8 @@ msgstr ""
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
 #: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
-#: en/drakwizard_dhcp.xml:27 en/drakwizard_proftpd.xml:27
-#: en/drakwizard_squid.xml:27 en/keyboarddrake.xml:17
+#: en/drakwizard_dhcp.xml:45 en/drakwizard_proftpd.xml:27
+#: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Вступ"
@@ -887,8 +887,8 @@ msgstr "drakboot --boot"
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:15 en/drakboot--boot.xml:120
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot--boot.xml:15
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakboot --boot</emphasis> as root."
@@ -5200,9 +5200,9 @@ msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
 #: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
-#: en/rpmdrake.xml:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
-#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
-#: en/rpmdrake.xml:222
+#: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
+#: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
+#: en/rpmdrake.xml:238
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
@@ -5753,8 +5753,8 @@ msgid ""
 "Web server is the software that helps to deliver web content that can be "
 "accessed through the Internet. (From Wikipedia)"
 msgstr ""
-"Інтернет-сервер — це програмне забезпечення, яке допомагає оприлюднювати дані "
-"для доступу до них з інтернету (з Вікіпедії)."
+"Інтернет-сервер — це програмне забезпечення, яке допомагає оприлюднювати "
+"дані для доступу до них з інтернету (з Вікіпедії)."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_apache2.xml:21
@@ -5772,8 +5772,8 @@ msgid "drakwizard-web-step1.png"
 msgstr "drakwizard-web-step1.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:34
-#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:34
+#: en/drakwizard_apache2.xml:34 en/drakwizard_dhcp.xml:54
+#: en/drakwizard_proftpd.xml:34 en/drakwizard_squid.xml:55
 msgid ""
 "The first page is just an introduction, click <guibutton>Next</guibutton>."
 msgstr ""
@@ -5830,8 +5830,8 @@ msgid ""
 "The user needs to create and populate this directory, then the server will "
 "display it."
 msgstr ""
-"Користувачеві слід створити і заповнити даними цей каталог, тоді сервер зможе "
-"показувати його вміст."
+"Користувачеві слід створити і заповнити даними цей каталог, тоді сервер "
+"зможе показувати його вміст."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:71
@@ -5850,8 +5850,8 @@ msgstr ""
 "Тут можна налаштувати шлях до теки типових документів інтернет-сервера."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:60
-#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:104
+#: en/drakwizard_apache2.xml:82 en/drakwizard_dhcp.xml:90
+#: en/drakwizard_proftpd.xml:71 en/drakwizard_squid.xml:144
 #: en/drakwizard_sshd.xml:105
 msgid "Summary"
 msgstr "Резюме"
@@ -5862,8 +5862,8 @@ msgid "drakwizard-web-step6.png"
 msgstr "drakwizard-web-step6.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:67
-#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:111
+#: en/drakwizard_apache2.xml:89 en/drakwizard_dhcp.xml:99
+#: en/drakwizard_proftpd.xml:78 en/drakwizard_squid.xml:153
 #: en/drakwizard_sshd.xml:112
 msgid ""
 "Take a second to check these options, then click <guibutton>Next</guibutton>."
@@ -5873,7 +5873,7 @@ msgstr ""
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_apache2.xml:93 en/drakwizard_proftpd.xml:82
-#: en/drakwizard_squid.xml:126 en/drakwizard_sshd.xml:116
+#: en/drakwizard_squid.xml:173 en/drakwizard_sshd.xml:116
 msgid "Finish"
 msgstr "Завершення"
 
@@ -5884,7 +5884,7 @@ msgstr "drakwizard-web-step7.png"
 
 #. type: Content of: <section><section><procedure><step><para>
 #: en/drakwizard_apache2.xml:100 en/drakwizard_proftpd.xml:89
-#: en/drakwizard_squid.xml:133 en/drakwizard_sshd.xml:123
+#: en/drakwizard_squid.xml:183 en/drakwizard_sshd.xml:123
 msgid "You're done! Click <guibutton>Finish</guibutton>."
 msgstr "Ну ось і все! Натисніть кнопку <guibutton>Завершити</guibutton>."
 
@@ -5914,22 +5914,22 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:10
 msgid "Configure DHCP"
 msgstr "Налаштовування DHCP"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_dhcp.xml:3
+#: en/drakwizard_dhcp.xml:12
 msgid "drakwizard dhcp"
 msgstr "drakwizard dhcp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:8
+#: en/drakwizard_dhcp.xml:17
 msgid "drakwizard_dhcp.png"
 msgstr "drakwizard_dhcp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard dhcp</emphasis> as root."
@@ -5939,21 +5939,23 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_dhcp.xml:12
+#: en/drakwizard_dhcp.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"<acronym>DHCP</acronym> server."
+"<acronym>DHCP</acronym> server. It is a component of drakwizard which should "
+"be installed before you can access to it."
 msgstr ""
 "Ця програма<placeholder type=\"footnote\" id=\"0\"/> може допомогти вам у "
-"налаштовуванні сервера <acronym>DHCP</acronym>."
+"налаштовуванні сервера <acronym>DHCP</acronym>. Цей компонент drakwizard "
+"слід встановити до того, як ви зможете ним скористатися."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:15
+#: en/drakwizard_dhcp.xml:30
 msgid "What is DHCP?"
 msgstr "Що таке DHCP?"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:17
+#: en/drakwizard_dhcp.xml:32
 msgid ""
 "The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) is a "
 "standardized networking protocol used on IP networks that dynamically "
@@ -5961,126 +5963,219 @@ msgid ""
 "communication. (From Wikipedia)"
 msgstr ""
 "Протокол динамічного налаштовування вузлів (Dynamic Host Configuration "
-"Protocol або <acronym>DHCP</acronym>) — це стандартизований протокол роботи у "
-"мережі, що використовується у IP-мережах для динамічного визначення IP-адрес "
-"та інших даних, які потрібні для обміну даними у інтернеті (з Вікіпедії)."
+"Protocol або <acronym>DHCP</acronym>) — це стандартизований протокол роботи "
+"у мережі, що використовується у IP-мережах для динамічного визначення IP-"
+"адрес та інших даних, які потрібні для обміну даними у інтернеті (з "
+"Вікіпедії)."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_dhcp.xml:21
-msgid "Setting up DHCP server with drakwizard dhcp"
+#: en/drakwizard_dhcp.xml:39
+msgid "Setting up a DHCP server with drakwizard dhcp"
 msgstr "Налаштовування сервера DHCP за допомогою drakwizard dhcp"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_dhcp.xml:23
+#: en/drakwizard_dhcp.xml:41
 msgid "Welcome to the DHCP server wizard."
 msgstr "Ласкаво просимо до майстра налаштовування сервера DHCP."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:30
+#: en/drakwizard_dhcp.xml:49
 msgid "drakwizard-dhcp-step1.png"
 msgstr "drakwizard-dhcp-step1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:38
+#: en/drakwizard_dhcp.xml:59
 msgid "Selecting Adaptor"
 msgstr "Вибір адаптора"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:41
+#: en/drakwizard_dhcp.xml:63
 msgid "drakwizard-dhcp-step2.png"
 msgstr "drakwizard-dhcp-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:45
+#: en/drakwizard_dhcp.xml:68
 msgid ""
-"Choose network interface connected to the subnet DHCP will assign IPs for, "
-"then click <guibutton>Next</guibutton>."
+"Choose the network interface, which is connected to the subnet, and for "
+"which DHCP will assign IP addresses, and then click <guibutton>Next</"
+"guibutton>."
 msgstr ""
-"Виберіть інтерфейс мережі, з’єднаний з підмережею DHCP, у якій "
-"відбуватиметься призначення IP-адрес, і натисніть кнопку <guibutton>Далі<"
-"/guibutton>."
+"Виберіть інтерфейс мережі, з’єднаний з підмережею, у якій відбуватиметься "
+"призначення IP-адрес, і натисніть кнопку <guibutton>Далі</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:49
+#: en/drakwizard_dhcp.xml:74
 msgid "Select IP range"
 msgstr "Вибір діапазону IP-адрес"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:52
+#: en/drakwizard_dhcp.xml:78
 msgid "drakwizard-dhcp-step3.png"
 msgstr "drakwizard-dhcp-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:56
+#: en/drakwizard_dhcp.xml:83
 msgid ""
 "Select the beginning and ending IP addresses of the range of IPs you want "
 "the server to offer, along with the IP of the gateway machine connecting to "
-"someplace outside the local net, hopeful close to the Internet, then click "
-"<guibutton>Next</guibutton>."
+"some place outside the local network, hopefully close to the Internet, then "
+"click <guibutton>Next</guibutton>."
 msgstr ""
 "Виберіть початкову і кінцеву IP-адреси діапазону адрес, які має надавати "
 "сервер, а також IP-адресу шлюзу, комп’ютера, який з’єднуватиметься із "
 "зовнішніми комп’ютерами поза локальною мережею, бажано безпосередньо з "
-"комп’ютерами у інтернеті. Натисніть кнопку "
-"<guibutton>Далі</guibutton>."
+"комп’ютерами у інтернеті. Натисніть кнопку <guibutton>Далі</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:63
+#: en/drakwizard_dhcp.xml:94
 msgid "drakwizard-dhcp-step4.png"
 msgstr "drakwizard-dhcp-step4.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:71
+#: en/drakwizard_dhcp.xml:104
 msgid "Hold on..."
 msgstr "Чекайте..."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:74
+#: en/drakwizard_dhcp.xml:108
 msgid "drakwizard-dhcp-step5.png"
 msgstr "drakwizard-dhcp-step5.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:78
+#: en/drakwizard_dhcp.xml:113
 msgid ""
 "This can be fixed. Click <guibutton>Previous</guibutton> a few times and "
-"change things around. Don't keep track."
+"change things around."
 msgstr ""
-"З цією проблемою можна впоратися. Натисніть кнопку <guibutton>Назад<"
-"/guibutton> декілька разів і внесіть якісь зміни. Далі, поверніться до цієї "
-"сторінки."
+"З цією проблемою можна впоратися. Натисніть кнопку <guibutton>Назад</"
+"guibutton> декілька разів і внесіть якісь зміни."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_dhcp.xml:82
+#: en/drakwizard_dhcp.xml:118
 msgid "Hours later..."
 msgstr "Згодом..."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_dhcp.xml:85
+#: en/drakwizard_dhcp.xml:122
 msgid "drakwizard-dhcp-step6.png"
 msgstr "drakwizard-dhcp-step6.png"
 
-#. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_dhcp.xml:89
-msgid "Another lesson learned."
-msgstr "Ну, ось ми і навчилися чогось."
+#. type: Content of: <section><section><title>
+#: en/drakwizard_dhcp.xml:131 en/drakwizard_ntp.xml:87
+#: en/drakwizard_squid.xml:189
+msgid "What is done"
+msgstr "Дії, які виконує інструмент"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:135
+msgid "Installing the package dhcp-server if needed;"
+msgstr "встановлення пакунка dhcp-server, якщо його ще не встановлено;"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:139
+msgid ""
+"Saving <code>/etc/dhcpd.conf</code> in <code>/etc/dhcpd.conf.orig;</code>"
+msgstr ""
+"збереження <code>/etc/dhcpd.conf</code> під назвою <code>/etc/dhcpd.conf."
+"orig</code>;"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:144
+msgid ""
+"Creating a new <code>dhcpd.conf</code> starting from <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> and adding the new "
+"parameters:"
+msgstr ""
+"створення нового файла <code>dhcpd.conf</code> на основі <code>/usr/share/"
+"wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> і додавання до нього "
+"нових параметрів:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:150
+msgid "<code>hname</code>"
+msgstr "<code>hname</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:154
+msgid "<code>dns</code>"
+msgstr "<code>dns</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:158
+msgid "net"
+msgstr "net"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:162
+msgid "ip"
+msgstr "ip"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:166
+msgid "<code>mask</code>"
+msgstr "<code>mask</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:170
+msgid "<code>rng1</code>"
+msgstr "<code>rng1</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:174
+msgid "<code>rng2</code>"
+msgstr "<code>rng2</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:178
+msgid "<code>dname</code>"
+msgstr "<code>dname</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:182
+msgid "<code>gateway</code>"
+msgstr "<code>gateway</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:186
+msgid "<code>tftpserverip</code>"
+msgstr "<code>tftpserverip</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:190
+msgid "<code>dhcpd_interface</code>"
+msgstr "<code>dhcpd_interface</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:196
+msgid ""
+"Also modifying Webmin configuration file <code>/etc/webmin/dhcpd/config</"
+"code>"
+msgstr ""
+"Також буде внесено зміни до файла налаштувань Webmin <code>/etc/webmin/dhcpd/"
+"config</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_dhcp.xml:201
+msgid "Restarting <code>dhcpd.</code>"
+msgstr "Перезапуск <code>dhcpd</code>."
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_ntp.xml:3
+#: en/drakwizard_ntp.xml:10
 msgid "Configure time"
 msgstr "Налаштовування часу"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_ntp.xml:5
+#: en/drakwizard_ntp.xml:12
 msgid "drakwizard ntp"
 msgstr "drakwizard ntp"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:12
+#: en/drakwizard_ntp.xml:19
 msgid "drakwizard_ntp.png"
 msgstr "drakwizard_ntp.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_ntp.xml:17
+#: en/drakwizard_ntp.xml:25
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard ntp</emphasis> as root."
@@ -6090,7 +6185,7 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:16
+#: en/drakwizard_ntp.xml:24
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> purpose is to set the "
 "time of your server synchronised with an external server. It isn't installed "
@@ -6102,8 +6197,13 @@ msgstr ""
 "сервером. Типово, цей засіб не встановлюється. Щоб отримати доступ до нього, "
 "вам слід встановити пакунки drakwizard та drakwizard-base."
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:22
+#. type: Content of: <section><section><title>
+#: en/drakwizard_ntp.xml:32
+msgid "Setup a NTP server with drakwizard ntp"
+msgstr "Налаштовування сервера NTP за допомогою drakwizard ntp"
+
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:36
 msgid ""
 "After a welcome screen (see above), the second one ask you to choose three "
 "time servers in the drop down lists and suggests to use pool.ntp.org twice "
@@ -6114,32 +6214,32 @@ msgstr ""
 "pool.ntp.org, оскільки цей сервер завжди прив’язується до доступних серверів "
 "часу."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:28
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:43
 msgid "drakwizard-ntp1.png"
 msgstr "drakwizard-ntp1.png"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:34
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:49
 msgid "drakwizard-ntp2.png"
 msgstr "drakwizard-ntp2.png"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata><info>
-#: en/drakwizard_ntp.xml:36
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata><info>
+#: en/drakwizard_ntp.xml:51
 msgid "<author> <personname/> </author> <pubdate/>"
 msgstr "<author> <personname/> </author> <pubdate/>"
 
-#. type: Content of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:35
+#. type: Content of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:50
 msgid "<placeholder type=\"info\" id=\"0\"/>"
 msgstr "<placeholder type=\"info\" id=\"0\"/>"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:48
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:63
 msgid ""
 "The following screens allows to choose the region and the city and then, you "
 "arrive on a summary. If something is wrong, you can obviously change it "
-"using the <guibutton>Previous </guibutton>button. If everything is right, "
+"using the <guibutton>Previous</guibutton>button.  If everything is right, "
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
@@ -6150,18 +6250,73 @@ msgstr ""
 "<guibutton>Далі</guibutton>, щоб наказати програмі виконати тестування. Якщо "
 "все буде гаразд, ви побачите вікно, подібне до наведеного нижче:"
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_ntp.xml:56
+#. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
+#: en/drakwizard_ntp.xml:72
 msgid "drakwizard-ntp3.png"
 msgstr "drakwizard-ntp3.png"
 
-#. type: Content of: <section><para>
-#: en/drakwizard_ntp.xml:62
+#. type: Content of: <section><section><procedure><step><para>
+#: en/drakwizard_ntp.xml:78
 msgid "Click on the <guibutton>Finish</guibutton> button to close the tool"
 msgstr ""
 "Натисніть кнопку <guibutton>Завершити</guibutton>, щоб завершити роботу "
 "інструмента."
 
+#. type: Content of: <section><section><para>
+#: en/drakwizard_ntp.xml:89
+msgid "This tool executes the following steps:"
+msgstr "Ця програма виконає такі кроки:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:93
+msgid "Installing the package <code>ntp</code> if needed"
+msgstr "встановлення пакунка <code>ntp</code>, якщо його ще не встановлено;"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:97
+msgid ""
+"Saving the files <code>/etc/sysconfig/clock</code> to <code>/etc/sysconfig/"
+"clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
+"step-tickers.orig</code>;"
+msgstr ""
+"збереження файла <code>/etc/sysconfig/clock</code> з назвою <code>/etc/"
+"sysconfig/clock.orig</code> та файла <code>/etc/ntp/step-tickers</code> з "
+"назвою <code>/etc/ntp/step-tickers.orig</code>;"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:104
+msgid ""
+"Writing a new file <code>/etc/ntp/step-tickers</code> with the list of "
+"servers;"
+msgstr ""
+"запис нового файла <code>/etc/ntp/step-tickers</code> зі списком серверів;"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:109
+msgid ""
+"Modifying the file <code>/etc/ntp.conf</code> by inserting the first server "
+"name;"
+msgstr ""
+"внесення змін до файла <code>/etc/ntp.conf</code> шляхом додавання назви "
+"першого сервера;"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:114
+msgid ""
+"Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
+"code> services;"
+msgstr ""
+"зупинення роботи і повторний запуск служб <code>crond</code>, <code>atd</"
+"code> та <code>ntpd</code>;"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_ntp.xml:119
+msgid ""
+"Setting the hardware clock to the current system time with UTC reference."
+msgstr ""
+"встановлення для апаратного годинника поточного часу системи з прив’язкою до "
+"UTC."
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_proftpd.xml:3
 msgid "Configure FTP"
@@ -6208,10 +6363,10 @@ msgid ""
 "protocol used to transfer files from one host to another host over a "
 "<acronym>TCP</acronym>-based network, such as the Internet. (From Wikipedia)"
 msgstr ""
-"Протокол передавання файлів (File Transfer Protocol або <acronym>FTP</acronym>"
-") — стандартний протокол роботи у мережі, що використовується для передавання "
-"файлів з одного комп’ютера на інший у заснованій на <acronym>TCP</acronym> "
-"мережі, зокрема у інтернеті (з Вікіпедії)."
+"Протокол передавання файлів (File Transfer Protocol або <acronym>FTP</"
+"acronym>) — стандартний протокол роботи у мережі, що використовується для "
+"передавання файлів з одного комп’ютера на інший у заснованій на "
+"<acronym>TCP</acronym> мережі, зокрема у інтернеті (з Вікіпедії)."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_proftpd.xml:21
@@ -6258,9 +6413,9 @@ msgid ""
 "Enter name the sever will use to introduce itself, someone to email "
 "complaints too and whether to allow root login access."
 msgstr ""
-"Вкажіть назву, яку сервер використовуватиме для власної ідентифікації, адресу "
-"електронної пошти для надсилання скарг та те, чи буде надано доступ до входу "
-"до системи від імені адміністратора (користувача root)."
+"Вкажіть назву, яку сервер використовуватиме для власної ідентифікації, "
+"адресу електронної пошти для надсилання скарг та те, чи буде надано доступ "
+"до входу до системи від імені адміністратора (користувача root)."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_proftpd.xml:60
@@ -6279,8 +6434,8 @@ msgid ""
 "(File eXchange Protocol)"
 msgstr ""
 "Вкажіть порт для очікування даних, параметри обмеженого запису користувача і "
-"те, чи слід дозволяти відновлення отримання даних і/або <acronym>FXP</acronym>"
-" (File eXchange Protocol)."
+"те, чи слід дозволяти відновлення отримання даних і/або <acronym>FXP</"
+"acronym> (File eXchange Protocol)."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:74
@@ -6293,22 +6448,22 @@ msgid "drakwizard-ftp-step6.png"
 msgstr "drakwizard-ftp-step6.png"
 
 #. type: Content of: <section><info><title>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:10
 msgid "Configure proxy"
 msgstr "Налаштовування проксі-сервера"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakwizard_squid.xml:3
+#: en/drakwizard_squid.xml:12
 msgid "drakwizard squid"
 msgstr "drakwizard squid"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:8
+#: en/drakwizard_squid.xml:17
 msgid "drakwizard_squid.png"
 msgstr "drakwizard_squid.png"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:23
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakwizard squid</emphasis> as root."
@@ -6318,23 +6473,25 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><para>
-#: en/drakwizard_squid.xml:12
+#: en/drakwizard_squid.xml:22
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> can help you to set up a "
-"proxy server."
+"proxy server. It is a component of drakwizard which should be installed "
+"before you can access to it."
 msgstr ""
 "Ця програма<placeholder type=\"footnote\" id=\"0\"/> може допомогти вам у "
-"налаштовуванні проксі-сервера."
+"налаштовуванні проксі-сервера. Цей компонент drakwizard слід встановити "
+"окремо, перш ніж ви зможете ним скористатися."
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:15
+#: en/drakwizard_squid.xml:29
 msgid "What is a proxy server?"
 msgstr "Що таке проксі-сервер?"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:17
+#: en/drakwizard_squid.xml:31
 msgid ""
-"A proxy server is a server (a computer system or an application) that acts "
+"A proxy server is a server (a computer system or an application)  that acts "
 "as an intermediary for requests from clients seeking resources from other "
 "servers. A client connects to the proxy server, requesting some service, "
 "such as a file, connection, web page, or other resource available from a "
@@ -6350,32 +6507,32 @@ msgstr ""
 "складністю запиту.»"
 
 #. type: Content of: <section><section><title>
-#: en/drakwizard_squid.xml:21
+#: en/drakwizard_squid.xml:40
 msgid "Setting up a proxy server with drakwizard squid"
 msgstr "Налаштовування проксі-сервера за допомогою drakwizard squid"
 
 #. type: Content of: <section><section><para>
-#: en/drakwizard_squid.xml:23
+#: en/drakwizard_squid.xml:42
 msgid "Welcome to the proxy server wizard."
 msgstr "Ласкаво просимо до майстра налаштовування проксі-сервера."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:30
+#: en/drakwizard_squid.xml:50
 msgid "drakwizard-proxy-step1.png"
 msgstr "drakwizard-proxy-step1.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:38
+#: en/drakwizard_squid.xml:60
 msgid "Selecting the proxy port"
 msgstr "Вибір порту проксі"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:41
+#: en/drakwizard_squid.xml:64
 msgid "drakwizard-proxy-step2.png"
 msgstr "drakwizard-proxy-step2.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:45
+#: en/drakwizard_squid.xml:69
 msgid ""
 "Select the proxy port browsers will connect through, then click "
 "<guibutton>Next</guibutton>."
@@ -6384,17 +6541,17 @@ msgstr ""
 "натисніть кнопку <guibutton>Далі</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:49
+#: en/drakwizard_squid.xml:74
 msgid "Set Memory and Disk Usage"
 msgstr "Використання пам’яті та диска"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:52
+#: en/drakwizard_squid.xml:78
 msgid "drakwizard-proxy-step3.png"
 msgstr "drakwizard-proxy-step3.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:56
+#: en/drakwizard_squid.xml:83
 msgid ""
 "Set memory and disk cache limits, then click <guibutton>Next</guibutton>."
 msgstr ""
@@ -6402,70 +6559,70 @@ msgstr ""
 "натисніть кнопку <guibutton>Далі</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:60
+#: en/drakwizard_squid.xml:88
 msgid "Select Network Access Control"
 msgstr "Вибір параметрів керування доступом до мережі"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:63
+#: en/drakwizard_squid.xml:92
 msgid "drakwizard-proxy-step4.png"
 msgstr "drakwizard-proxy-step4.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:67
+#: en/drakwizard_squid.xml:97
 msgid ""
 "Set visibility to local network or world, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
-"Визначте, чи діапазон доступу: локальна мережа чи інтернет, — потім натисніть "
-"кнопку <guibutton>Далі</guibutton>."
+"Визначте, чи діапазон доступу: локальна мережа чи інтернет, — потім "
+"натисніть кнопку <guibutton>Далі</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:71
+#: en/drakwizard_squid.xml:102
 msgid "Grant Network Access"
 msgstr "Надання доступу до мережі"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:74
+#: en/drakwizard_squid.xml:106
 msgid "drakwizard-proxy-step5.png"
 msgstr "drakwizard-proxy-step5.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:78
+#: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
 "Надайте доступ локальним мережам і натисніть кнопку <guibutton>Далі</"
 "guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:82
+#: en/drakwizard_squid.xml:116
 msgid "Use Upper Level Proxy Server?"
 msgstr "Чи слід використовувати проксі-сервер вищого рівня?"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:85
+#: en/drakwizard_squid.xml:120
 msgid "drakwizard-proxy-step6.png"
 msgstr "drakwizard-proxy-step6.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:89
+#: en/drakwizard_squid.xml:125
 msgid "Cascade through another proxy server? If no, skip next step."
 msgstr ""
 "Маєте каскадний доступ до інтернету крізь інший проксі-сервер? Якщо ні, "
 "пропустіть наступний крок."
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:93
+#: en/drakwizard_squid.xml:130
 msgid "Upper Level Proxy URL and Port"
 msgstr "Адреса і порт проксі-сервера вищого рівня"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:96
+#: en/drakwizard_squid.xml:134
 msgid "drakwizard-proxy-step7.png"
 msgstr "drakwizard-proxy-step7.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:100
+#: en/drakwizard_squid.xml:139
 msgid ""
 "Provide upper level proxy hostname and port, then click <guibutton>Next</"
 "guibutton>."
@@ -6474,22 +6631,22 @@ msgstr ""
 "<guibutton>Далі</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:107
+#: en/drakwizard_squid.xml:148
 msgid "drakwizard-proxy-step8.png"
 msgstr "drakwizard-proxy-step8.png"
 
 #. type: Content of: <section><section><procedure><step><title>
-#: en/drakwizard_squid.xml:115
+#: en/drakwizard_squid.xml:158
 msgid "Start during boot?"
 msgstr "Чи слід запускати під час завантаження?"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:118
+#: en/drakwizard_squid.xml:162
 msgid "drakwizard-proxy-step9.png"
 msgstr "drakwizard-proxy-step9.png"
 
 #. type: Content of: <section><section><procedure><step><para>
-#: en/drakwizard_squid.xml:122
+#: en/drakwizard_squid.xml:168
 msgid ""
 "Choose if the proxy server should be started during the boot time, then "
 "click <guibutton>Next</guibutton>."
@@ -6498,10 +6655,76 @@ msgstr ""
 "системи, і натисніть кнопку <guibutton>Далі</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
-#: en/drakwizard_squid.xml:129
+#: en/drakwizard_squid.xml:177
 msgid "drakwizard-proxy-step10.png"
 msgstr "drakwizard-proxy-step10.png"
 
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:193
+msgid "Installing the package squid if needed;"
+msgstr "встановлення пакунка squid, якщо його ще не встановлено;"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:197
+msgid ""
+"Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
+"orig;</code>"
+msgstr ""
+"збереження <code>/etc/squid/squid.conf</code> з назвою <code>/etc/squid/"
+"squid.conf.orig</code>№"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:202
+msgid ""
+"Creating a new <code>squid.conf</code> starting from <code>squid.conf."
+"default</code> and adding the new parameters:"
+msgstr ""
+"створення нового файла <code>squid.conf</code> на основі <code>squid.conf."
+"default</code> і додавання до нього нових параметрів:"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:208
+msgid "<code>cache_dir</code>"
+msgstr "<code>cache_dir</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:212
+msgid "<code>localnet</code>"
+msgstr "<code>localnet</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:216
+msgid "cache_mem"
+msgstr "cache_mem"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:220
+msgid "http_port"
+msgstr "http_port"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:224
+msgid ""
+"<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
+msgstr ""
+"<code>level</code> 1, 2 або 3 та <code>http_access</code>, відповідно до "
+"рівня"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:229
+msgid "<code>cache_peer</code>"
+msgstr "<code>cache_peer</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:233
+msgid "<code>visible_hostname</code>"
+msgstr "<code>visible_hostname</code>"
+
+#. type: Content of: <section><section><para><itemizedlist><listitem><para>
+#: en/drakwizard_squid.xml:239
+msgid "Restarting <code>squid.</code>"
+msgstr "перезапуск <code>squid</code>."
+
 #. type: Content of: <section><info><title>
 #: en/drakwizard_sshd.xml:3
 msgid "OpenSSH daemon configuration"
@@ -6556,9 +6779,9 @@ msgstr ""
 "втручання, віддаленого керування системою за допомогою командного рядка, "
 "віддаленого виконання команд та керування іншими мережевими службами. За "
 "використання цього протоколу два з’єднаних мережею комп’ютери використовують "
-"захищений канал обміну даними у незахищеній мережі. Ці комп’ютери називаються "
-"сервер та клієнт, на них запущено серверні та клієнтські програми <acronym>"
-"SSH</acronym>, відповідно (з Вікіпедії)."
+"захищений канал обміну даними у незахищеній мережі. Ці комп’ютери "
+"називаються сервер та клієнт, на них запущено серверні та клієнтські "
+"програми <acronym>SSH</acronym>, відповідно (з Вікіпедії)."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_sshd.xml:22
@@ -6589,9 +6812,8 @@ msgid ""
 "guilabel> to skip steps 3-7, click <guibutton>Next</guibutton>."
 msgstr ""
 "Виберіть <guilabel>Експерт</guilabel> для отримання доступу до усіх "
-"параметрів або <guilabel>Початківець</"
-"guilabel>, щоб пропустити кроки 3-7, натисніть кнопку <guibutton>Далі<"
-"/guibutton>."
+"параметрів або <guilabel>Початківець</guilabel>, щоб пропустити кроки 3-7, "
+"натисніть кнопку <guibutton>Далі</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:39
@@ -6609,8 +6831,8 @@ msgid ""
 "Sets visibility and root access options. Port 22 is the standard "
 "<acronym>SSH</acronym> port."
 msgstr ""
-"Визначте видимість служби та параметри адміністративного доступу. Стандартним "
-"портом для <acronym>SSH</acronym> є порт 22."
+"Визначте видимість служби та параметри адміністративного доступу. "
+"Стандартним портом для <acronym>SSH</acronym> є порт 22."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:50
@@ -6628,8 +6850,8 @@ msgid ""
 "Allow a variety of authentication methods users can use while connecting, "
 "then click <guibutton>Next</guibutton>."
 msgstr ""
-"Вкажіть один зі способів розпізнавання під час з’єднання і натисніть кнопку <"
-"guibutton>Далі</guibutton>."
+"Вкажіть один зі способів розпізнавання під час з’єднання і натисніть кнопку "
+"<guibutton>Далі</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:61
@@ -6664,8 +6886,8 @@ msgstr "drakwizard-sshd-step5.png"
 #: en/drakwizard_sshd.xml:79
 msgid "Configure per-login settings, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Налаштуйте окремі параметри входу для облікових записів і натисніть кнопку <"
-"guibutton>Далі</guibutton>."
+"Налаштуйте окремі параметри входу для облікових записів і натисніть кнопку "
+"<guibutton>Далі</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:83
@@ -6682,8 +6904,8 @@ msgstr "drakwizard-sshd-step6.png"
 msgid ""
 "Configure the user access settings, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Налаштуйте параметри доступу користувачів і натисніть кнопку <guibutton>Далі<"
-"/guibutton>."
+"Налаштуйте параметри доступу користувачів і натисніть кнопку "
+"<guibutton>Далі</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:94
@@ -9007,23 +9229,57 @@ msgstr ""
 "Для належної роботи rpmdrake слід налаштувати параметри сховищ пакунків за "
 "допомогою <xref linkend=\"drakrpm-edit-media\"/>."
 
+#. type: Attribute 'fileref' of: <section><section><important><para><mediaobject><imageobject><imagedata>
+#: en/rpmdrake.xml:43
+msgid "rpmdrake8.png"
+msgstr "rpmdrake8.png"
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:38
+msgid ""
+"During the installation, the configured repository is the medium used for "
+"the installation, generally the DVD or CD. If you keep this medium, rpmdrake "
+"will ask it each time you want to install a package, with this pop-up "
+"window : <placeholder type=\"mediaobject\" id=\"0\"/>If the above message "
+"annoys you and you have a good internet connection without too strict "
+"download limit, it is wise to remove that medium and replace it by online "
+"repositories thanks to <xref linkend=\"drakrpm-edit-media\"/> ."
+msgstr ""
+"Під час встановлення налаштованим сховищем є носій, з якого відбувається "
+"встановлення, наприклад DVD або компакт-диск. Якщо ви нічого не будете "
+"змінювати, rpmdrake проситиме вас вставити цей носій кожного разу, коли вам "
+"потрібно буде встановити пакунок за допомогою такого контекстного вікна: "
+"<placeholder type=\"mediaobject\" id=\"0\"/>Якщо наведене вище повідомлення "
+"дратує вас і у вас є добрі умови з’єднання з інтернетом без обмежень щодо "
+"отримання даних, варто вилучити запис початкового носія і замінити його "
+"сховищами у мережі за допомогою <xref linkend=\"drakrpm-edit-media\"/>."
+
+#. type: Content of: <section><section><important><para>
+#: en/rpmdrake.xml:49
+msgid ""
+"Moreover, the online repositories are always up to date, contains much more "
+"packages, and allow to update your installed packages."
+msgstr ""
+"Крім того, сховища у мережі завжди містять найсвіжіші пакунки, ширший їхній "
+"діапазон та надають змогу оновлювати вже встановлені пакунки."
+
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:39
+#: en/rpmdrake.xml:55
 msgid "The main parts of the screen"
 msgstr "Основні частини вікна"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:44
+#: en/rpmdrake.xml:60
 msgid "rpmdrake1.png"
 msgstr "rpmdrake1.png"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:51
+#: en/rpmdrake.xml:67
 msgid "<emphasis role=\"bold\">Package type filter:</emphasis>"
 msgstr "<emphasis role=\"bold\">Фільтрування за типом пакунка:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:53
+#: en/rpmdrake.xml:69
 msgid ""
 "This filter allows you to display only certain types of packages. The first "
 "time you start the manager, it only displays applications with a graphical "
@@ -9039,7 +9295,7 @@ msgstr ""
 "лише оновлення або лише пакунки, портовані з новіших версій Mageia Linux."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
-#: en/rpmdrake.xml:61
+#: en/rpmdrake.xml:77
 msgid ""
 "The default filter setting is for new entrants to Linux or Mageia, who "
 "probably do not want command line or specialist tools.  Since you're reading "
@@ -9053,7 +9309,7 @@ msgstr ""
 "ваших знань щодо Mageia, отже, краще вибрати варіант «Всі»."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:70
+#: en/rpmdrake.xml:86
 msgid ""
 "<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
 "firstterm>"
@@ -9062,7 +9318,7 @@ msgstr ""
 "emphasis> </firstterm>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:73
+#: en/rpmdrake.xml:89
 msgid ""
 "This filter allows you to view only the installed packages, only the "
 "packages that are not installed or all of the packages, both installed and "
@@ -9073,12 +9329,12 @@ msgstr ""
 "встановлені і невстановлені."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:79
+#: en/rpmdrake.xml:95
 msgid "<emphasis role=\"bold\">Search mode:</emphasis>"
 msgstr "<emphasis role=\"bold\">Режим пошуку:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:81
+#: en/rpmdrake.xml:97
 msgid ""
 "Click on this icon to search through the package names, through their "
 "summaries, through their complete description or through the files included "
@@ -9089,12 +9345,12 @@ msgstr ""
 "пакунках."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:87
+#: en/rpmdrake.xml:103
 msgid "<emphasis role=\"bold\">\"Find\" box:</emphasis>"
 msgstr "<emphasis role=\"bold\">Поле «Знайти»:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:89
+#: en/rpmdrake.xml:105
 msgid ""
 "Enter here one or more key words. If you want to use more than one keyword "
 "for searching use '|' between keywords, e.g. To search for \"mplayer\" and "
@@ -9106,12 +9362,12 @@ msgstr ""
 "«mplayer | xine» (без лапок)."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:95
+#: en/rpmdrake.xml:111
 msgid "<emphasis role=\"bold\">Erase all:</emphasis>"
 msgstr "<emphasis role=\"bold\">Витерти все:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:97
+#: en/rpmdrake.xml:113
 msgid ""
 "This icon can erase in one click all the key words entered in the \"Find\" "
 "box ."
@@ -9120,12 +9376,12 @@ msgstr ""
 "полі «Знайти»."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:102
+#: en/rpmdrake.xml:118
 msgid "<emphasis role=\"bold\">Categories list:</emphasis>"
 msgstr "<emphasis role=\"bold\">Список категорій:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:104
+#: en/rpmdrake.xml:120
 msgid ""
 "This side bar groups all applications and packages into clear categories and "
 "sub categories."
@@ -9134,12 +9390,12 @@ msgstr ""
 "категоріями та підкатегоріями."
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:109
+#: en/rpmdrake.xml:125
 msgid "<emphasis role=\"bold\">Description panel:</emphasis>"
 msgstr "<emphasis role=\"bold\">Панель опису:</emphasis>"
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/rpmdrake.xml:111
+#: en/rpmdrake.xml:127
 msgid ""
 "This panel displays the package's name, its summary and complete "
 "description. It displays many useful elements about the selected package. It "
@@ -9152,12 +9408,12 @@ msgstr ""
 "створений супровідниками пакунка."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:121
+#: en/rpmdrake.xml:137
 msgid "The status column"
 msgstr "Стовпчик стану"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:123
+#: en/rpmdrake.xml:139
 msgid ""
 "Once you correctly set the filters, you can find your software either by "
 "category (in area 6 above) or by name/summary/description using area 4. A "
@@ -9176,77 +9432,77 @@ msgstr ""
 "списку і натисніть кнопку <guibutton>Застосувати</guibutton>."
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:139
+#: en/rpmdrake.xml:155
 msgid "Icon"
 msgstr "Піктограма"
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
-#: en/rpmdrake.xml:141
+#: en/rpmdrake.xml:157
 msgid "Legend"
 msgstr "Умовне позначення"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:149
+#: en/rpmdrake.xml:165
 msgid "rpmdrake2.png"
 msgstr "../rpmdrake2.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:153
+#: en/rpmdrake.xml:169
 msgid "This package is already installed"
 msgstr "Цей пакунок вже встановлено"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:159
+#: en/rpmdrake.xml:175
 msgid "rpmdrake3.png"
 msgstr "../rpmdrake3.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:163
+#: en/rpmdrake.xml:179
 msgid "This package will be installed"
 msgstr "Цей пакунок буде встановлено"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:169
+#: en/rpmdrake.xml:185
 msgid "rpmdrake4.png"
 msgstr "../rpmdrake4.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:173
+#: en/rpmdrake.xml:189
 msgid "This package cannot be modified"
 msgstr "Стан цього пакунка змінювати не можна"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:179
+#: en/rpmdrake.xml:195
 msgid "rpmdrake5.png"
 msgstr "../rpmdrake5.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:183
+#: en/rpmdrake.xml:199
 msgid "This package is an update"
 msgstr "Цей пакунок є оновленням"
 
 #. type: Attribute 'fileref' of: <section><section><para><table><tgroup><tbody><row><entry><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:189
+#: en/rpmdrake.xml:205
 msgid "rpmdrake6.png"
 msgstr "../rpmdrake6.png"
 
 #. type: Content of: <section><section><para><table><tgroup><tbody><row><entry>
-#: en/rpmdrake.xml:193
+#: en/rpmdrake.xml:209
 msgid "This package will be uninstalled"
 msgstr "Цей пакунок буде вилучено"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:131
+#: en/rpmdrake.xml:147
 msgid "<placeholder type=\"table\" id=\"0\"/>"
 msgstr "<placeholder type=\"table\" id=\"0\"/>"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:199
+#: en/rpmdrake.xml:215
 msgid "Examples in the screenshot above:"
 msgstr "Приклади на наведеному вище знімку:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:203
+#: en/rpmdrake.xml:219
 msgid ""
 "If I uncheck digikam (the green arrow tell us it is installed), the status "
 "icon will go red with an up arrow and it will be uninstalled when clicking "
@@ -9258,7 +9514,7 @@ msgstr ""
 "<guibutton>Застосувати</guibutton>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/rpmdrake.xml:211
+#: en/rpmdrake.xml:227
 msgid ""
 "If I check qdigidoc (which is not installed, see the status), the orange "
 "with a down arrow status icon will appear and and it will be installed when "
@@ -9270,17 +9526,17 @@ msgstr ""
 "<guibutton>Застосувати</guibutton>."
 
 #. type: Content of: <section><section><title>
-#: en/rpmdrake.xml:219
+#: en/rpmdrake.xml:235
 msgid "The dependencies"
 msgstr "Залежності"
 
 #. type: Attribute 'fileref' of: <section><section><screenshot><mediaobject><imageobject><imagedata>
-#: en/rpmdrake.xml:224
+#: en/rpmdrake.xml:240
 msgid "rpmdrake7.png"
 msgstr "rpmdrake7.png"
 
 #. type: Content of: <section><section><para>
-#: en/rpmdrake.xml:229
+#: en/rpmdrake.xml:245
 msgid ""
 "Some packages need other packages called dependencies in order to work. They "
 "are for example libraries or tools. In this case, Rpmdrake displays an "
@@ -11316,6 +11572,9 @@ msgstr ""
 "підтверджено, вам доведеться вийти з облікового запису і знову увійти до "
 "нього, щоб задіяти внесені зміни."
 
+#~ msgid "Another lesson learned."
+#~ msgstr "Ну, ось ми і навчилися чогось."
+
 #, fuzzy
 #~ msgid ""
 #~ "Take a second to check these option, then click <guibutton>Next</"
@@ -11342,9 +11601,6 @@ msgstr ""
 #~ msgid "fileserver"
 #~ msgstr "fileserver"
 
-#~ msgid "netbook"
-#~ msgstr "netbook"
-
 #~ msgid "audit_daily"
 #~ msgstr "audit_daily"
 
diff --git a/docs/mcc-help/uk/drakboot--boot.xml b/docs/mcc-help/uk/drakboot--boot.xml
index e2d6c0e4..9b4ae522 100644
--- a/docs/mcc-help/uk/drakboot--boot.xml
+++ b/docs/mcc-help/uk/drakboot--boot.xml
@@ -125,7 +125,4 @@ Grub або змінити вже наявний пункт меню. Не ви�
 <guilabel>initrd</guilabel> та <xref linkend="draknetprofile">Мережевий
 профіль</xref> зі спадних списків.</para>
 
-  <para>Запустити цю програму можна за допомогою термінала: достатньо ввести команду
-<emphasis role="bold">drakboot --boot</emphasis> від імені адміністратора
-(root).</para>
 </section>
\ No newline at end of file
diff --git a/docs/mcc-help/uk/drakwizard_dhcp.xml b/docs/mcc-help/uk/drakwizard_dhcp.xml
index 9d4d923d..5d64b03a 100644
--- a/docs/mcc-help/uk/drakwizard_dhcp.xml
+++ b/docs/mcc-help/uk/drakwizard_dhcp.xml
@@ -1,110 +1,206 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="drakwizard_dhcp" version="5.0" xml:lang="uk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="uk" xml:id="drakwizard_dhcp"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="drakwizard_dhcp-ti1">Налаштовування DHCP</title><subtitle>drakwizard dhcp</subtitle>
+    <title xml:id="drakwizard_dhcp-ti1">Налаштовування DHCP</title>
+
+    <subtitle>drakwizard dhcp</subtitle>
   </info>
 
   <mediaobject>
     <imageobject>
-      <imagedata   xml:id="drakwizard_dhcp-im1" revision="1" align="center" format="PNG" fileref="drakwizard_dhcp.png"/>
+      <imagedata align="center" fileref="drakwizard_dhcp.png" format="PNG"
+                 revision="1" xml:id="drakwizard_dhcp-im1"/>
     </imageobject>
   </mediaobject>
 
-  <para>Ця програма<footnote><para>Запустити цю програму можна за допомогою термінала: достатньо ввести команду
+  <para>Ця програма<footnote>
+      <para>Запустити цю програму можна за допомогою термінала: достатньо ввести команду
 <emphasis role="bold">drakwizard dhcp</emphasis> від імені адміністратора
-(root).</para></footnote> може допомогти вам у
-налаштовуванні сервера <acronym>DHCP</acronym>.
-  </para>
+(root).</para>
+    </footnote> може допомогти вам у
+налаштовуванні сервера <acronym>DHCP</acronym>. Цей компонент drakwizard
+слід встановити до того, як ви зможете ним скористатися.</para>
+
   <section>
     <title>Що таке DHCP?</title>
-    <para>
-      Протокол динамічного налаштовування вузлів (Dynamic Host Configuration
+
+    <para>Протокол динамічного налаштовування вузлів (Dynamic Host Configuration
 Protocol або <acronym>DHCP</acronym>) — це стандартизований протокол роботи
 у мережі, що використовується у IP-мережах для динамічного визначення
 IP-адрес та інших даних, які потрібні для обміну даними у інтернеті (з
-Вікіпедії).
-    </para>
+Вікіпедії).</para>
   </section>
-    <section>
-      <title>Налаштовування сервера DHCP за допомогою drakwizard dhcp</title>
-      <para>
-	Ласкаво просимо до майстра налаштовування сервера DHCP.
-      </para>
-      <procedure>
-	<step>
-	  <title>Вступ</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im2" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step1.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Перша сторінка є просто вступом до програми-майстра. Перегляньте її і
-натисніть кнопку <guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Вибір адаптора</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im3" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step2.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Виберіть інтерфейс мережі, з’єднаний з підмережею DHCP, у якій
-відбуватиметься призначення IP-адрес, і натисніть кнопку
-<guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Вибір діапазону IP-адрес</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im4" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step3.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Виберіть початкову і кінцеву IP-адреси діапазону адрес, які має надавати
+
+  <section>
+    <title>Налаштовування сервера DHCP за допомогою drakwizard dhcp</title>
+
+    <para>Ласкаво просимо до майстра налаштовування сервера DHCP.</para>
+
+    <procedure>
+      <step>
+        <title>Вступ</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step1.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im2"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Перша сторінка є просто вступом до програми-майстра. Перегляньте її і
+натисніть кнопку <guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Вибір адаптора</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step2.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im3"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Виберіть інтерфейс мережі, з’єднаний з підмережею, у якій відбуватиметься
+призначення IP-адрес, і натисніть кнопку <guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Вибір діапазону IP-адрес</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step3.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im4"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Виберіть початкову і кінцеву IP-адреси діапазону адрес, які має надавати
 сервер, а також IP-адресу шлюзу, комп’ютера, який з’єднуватиметься із
 зовнішніми комп’ютерами поза локальною мережею, бажано безпосередньо з
-комп’ютерами у інтернеті. Натисніть кнопку <guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Резюме</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im5" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step4.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Ознайомтеся з резюме щодо зміни параметрів і натисніть кнопку
-<guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Чекайте...</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im6" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step5.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    З цією проблемою можна впоратися. Натисніть кнопку
-<guibutton>Назад</guibutton> декілька разів і внесіть якісь зміни. Далі,
-поверніться до цієї сторінки.
-	  </para>
-	</step>
-	<step>
-	  <title>Згодом...</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_dhcp-im7" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step6.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Ну, ось ми і навчилися чогось.
-	  </para>
-	</step>
-      </procedure>
-    </section>
+комп’ютерами у інтернеті. Натисніть кнопку <guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Резюме</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step4.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im5"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Ознайомтеся з резюме щодо зміни параметрів і натисніть кнопку
+<guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Чекайте...</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step5.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im6"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>З цією проблемою можна впоратися. Натисніть кнопку
+<guibutton>Назад</guibutton> декілька разів і внесіть якісь зміни.</para>
+      </step>
+
+      <step>
+        <title>Згодом...</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-dhcp-step6.png"
+                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im7"/>
+          </imageobject>
+        </mediaobject>
+      </step>
+    </procedure>
+  </section>
+
+  <section>
+    <title>Дії, які виконує інструмент</title>
+
+    <para><itemizedlist>
+        <listitem>
+          <para>встановлення пакунка dhcp-server, якщо його ще не встановлено;</para>
+        </listitem>
+
+        <listitem>
+          <para>збереження <code>/etc/dhcpd.conf</code> під назвою
+<code>/etc/dhcpd.conf.orig</code>;</para>
+        </listitem>
+
+        <listitem>
+          <para>створення нового файла <code>dhcpd.conf</code> на основі
+<code>/usr/share/wizards/dhcp_wizard/scripts/dhcpd.conf.default</code> і
+додавання до нього нових параметрів:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><code>hname</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>dns</code></para>
+            </listitem>
+
+            <listitem>
+              <para>net</para>
+            </listitem>
+
+            <listitem>
+              <para>ip</para>
+            </listitem>
+
+            <listitem>
+              <para><code>mask</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>rng1</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>rng2</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>dname</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>gateway</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>tftpserverip</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>dhcpd_interface</code></para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Також буде внесено зміни до файла налаштувань Webmin
+<code>/etc/webmin/dhcpd/config</code></para>
+        </listitem>
+
+        <listitem>
+          <para>Перезапуск <code>dhcpd</code>.</para>
+        </listitem>
+      </itemizedlist></para>
+  </section>
 </section>
diff --git a/docs/mcc-help/uk/drakwizard_ntp.xml b/docs/mcc-help/uk/drakwizard_ntp.xml
index 3389eb53..5f6df3c1 100644
--- a/docs/mcc-help/uk/drakwizard_ntp.xml
+++ b/docs/mcc-help/uk/drakwizard_ntp.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="drakwizard_ntp" version="5.0" xml:lang="uk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="uk" xml:id="drakwizard_ntp"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="drakwizard_ntp-ti1">Налаштовування часу</title>
 
@@ -10,7 +17,8 @@
   <mediaobject>
     <!-- 2013-10-25 Lebarhon - 3 screenshots ready to be added when it is possible -->
 <imageobject>
-      <imagedata revision="1" fileref="drakwizard_ntp.png" xml:id="drakwizard_ntp-im1" align="center" format="PNG"/>
+      <imagedata align="center" fileref="drakwizard_ntp.png" format="PNG"
+                 revision="1" xml:id="drakwizard_ntp-im1"/>
     </imageobject>
   </mediaobject>
 
@@ -23,43 +31,91 @@
 сервером. Типово, цей засіб не встановлюється. Щоб отримати доступ до нього,
 вам слід встановити пакунки drakwizard та drakwizard-base.</para>
 
-  <para>Після вітального вікна (див. вище) програма попросить вас вибрати три
+  <section>
+    <title>Налаштовування сервера NTP за допомогою drakwizard ntp</title>
+
+    <procedure>
+      <step>
+        <para>Після вітального вікна (див. вище) програма попросить вас вибрати три
 сервери часу за допомогою спадних списків і двічі запропонує скористатися
 pool.ntp.org, оскільки цей сервер завжди прив’язується до доступних серверів
 часу.</para>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="drakwizard-ntp1.png"/>
-    </imageobject>
-  </mediaobject>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="drakwizard-ntp1.png"/>
+          </imageobject>
+        </mediaobject>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="drakwizard-ntp2.png">
-        <info>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="drakwizard-ntp2.png">
+              <info>
 <author> <personname/> </author> <pubdate/></info>
-      </imagedata>
-    </imageobject>
-  </mediaobject>
-
-  <para/>
+            </imagedata>
+          </imageobject>
+        </mediaobject>
+      </step>
 
-  <para>За допомогою наступних сторінок майстра ви зможете вибрати регіон і місто,
+      <step>
+        <para>За допомогою наступних сторінок майстра ви зможете вибрати регіон і місто,
 після чого вам буде показано резюме налаштувань. Якщо вами буде виявлено
 помилки у налаштуваннях, ви можете внести зміни, натиснувши кнопку
 <guibutton>Назад</guibutton>. Якщо усе гаразд, натисніть кнопку
 <guibutton>Далі</guibutton>, щоб наказати програмі виконати тестування. Якщо
 все буде гаразд, ви побачите вікно, подібне до наведеного нижче:</para>
 
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="drakwizard-ntp3.png"/>
-    </imageobject>
-  </mediaobject>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="drakwizard-ntp3.png"/>
+          </imageobject>
+        </mediaobject>
+      </step>
 
-  <para/>
-
-  <para>Натисніть кнопку <guibutton>Завершити</guibutton>, щоб завершити роботу
+      <step>
+        <para>Натисніть кнопку <guibutton>Завершити</guibutton>, щоб завершити роботу
 інструмента.</para>
-</section>
\ No newline at end of file
+      </step>
+    </procedure>
+
+    <para/>
+  </section>
+
+  <section>
+    <title>Дії, які виконує інструмент</title>
+
+    <para>Ця програма виконає такі кроки:</para>
+
+    <para><itemizedlist>
+        <listitem>
+          <para>встановлення пакунка <code>ntp</code>, якщо його ще не встановлено;</para>
+        </listitem>
+
+        <listitem>
+          <para>збереження файла <code>/etc/sysconfig/clock</code> з назвою
+<code>/etc/sysconfig/clock.orig</code> та файла
+<code>/etc/ntp/step-tickers</code> з назвою
+<code>/etc/ntp/step-tickers.orig</code>;</para>
+        </listitem>
+
+        <listitem>
+          <para>запис нового файла <code>/etc/ntp/step-tickers</code> зі списком серверів;</para>
+        </listitem>
+
+        <listitem>
+          <para>внесення змін до файла <code>/etc/ntp.conf</code> шляхом додавання назви
+першого сервера;</para>
+        </listitem>
+
+        <listitem>
+          <para>зупинення роботи і повторний запуск служб <code>crond</code>,
+<code>atd</code> та <code>ntpd</code>;</para>
+        </listitem>
+
+        <listitem>
+          <para>встановлення для апаратного годинника поточного часу системи з прив’язкою до
+UTC.</para>
+        </listitem>
+      </itemizedlist></para>
+  </section>
+</section>
diff --git a/docs/mcc-help/uk/drakwizard_squid.xml b/docs/mcc-help/uk/drakwizard_squid.xml
index 12883079..58058bc8 100644
--- a/docs/mcc-help/uk/drakwizard_squid.xml
+++ b/docs/mcc-help/uk/drakwizard_squid.xml
@@ -1,156 +1,245 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="drakwizard_squid" version="5.0" xml:lang="uk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="uk" xml:id="drakwizard_squid"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="drakwizard_squid-ti1">Налаштовування проксі-сервера</title><subtitle>drakwizard squid</subtitle>
+    <title xml:id="drakwizard_squid-ti1">Налаштовування проксі-сервера</title>
+
+    <subtitle>drakwizard squid</subtitle>
   </info>
 
   <mediaobject>
     <imageobject>
-      <imagedata   xml:id="drakwizard_squid-im1" revision="1" align="center" format="PNG" fileref="drakwizard_squid.png"/>
+      <imagedata align="center" fileref="drakwizard_squid.png" format="PNG"
+                 revision="1" xml:id="drakwizard_squid-im1"/>
     </imageobject>
   </mediaobject>
 
- <para>Ця програма<footnote><para>Запустити цю програму можна за допомогою термінала: достатньо ввести команду
+  <para>Ця програма<footnote>
+      <para>Запустити цю програму можна за допомогою термінала: достатньо ввести команду
 <emphasis role="bold">drakwizard squid</emphasis> від імені адміністратора
-(root).</para></footnote> може допомогти вам у
-налаштовуванні проксі-сервера.
-  </para>
+(root).</para>
+    </footnote> може допомогти вам у
+налаштовуванні проксі-сервера. Цей компонент drakwizard слід встановити
+окремо, перш ніж ви зможете ним скористатися.</para>
+
   <section>
     <title>Що таке проксі-сервер?</title>
-    <para>
-      З Вікіпедії : «У комп’ютерних мережах проксі-сервером називається сервер
+
+    <para>З Вікіпедії : «У комп’ютерних мережах проксі-сервером називається сервер
 (комп’ютерна система або програма), який працює проміжною ланкою для запитів
 від клієнтів, які виконують пошуки ресурсів на інших серверах. Клієнтська
 система з’єднується з проксі-сервером, надсилає запит щодо певної служби,
 зокрема даних файла, з’єднання, сторінки або іншого ресурсу на іншому
 сервері. Проксі-сервер обробляє запит з метою спрощення та керування
-складністю запиту.»
-    </para>
+складністю запиту.»</para>
+  </section>
+
+  <section>
+    <title>Налаштовування проксі-сервера за допомогою drakwizard squid</title>
+
+    <para>Ласкаво просимо до майстра налаштовування проксі-сервера.</para>
+
+    <procedure>
+      <step>
+        <title>Вступ</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step1.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im2"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Перша сторінка є просто вступом до програми-майстра. Перегляньте її і
+натисніть кнопку <guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Вибір порту проксі</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step2.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im3"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Виберіть порт, з яким встановлюватимуть з’єднання клієнти проксі-сервера, і
+натисніть кнопку <guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Використання пам’яті та диска</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step3.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im4"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Виберіть параметри обмежень на використання пам’яті та кешу на диску і
+натисніть кнопку <guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Вибір параметрів керування доступом до мережі</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step4.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im5"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Визначте, чи діапазон доступу: локальна мережа чи інтернет, — потім
+натисніть кнопку <guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Надання доступу до мережі</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step5.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im6"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Надайте доступ локальним мережам і натисніть кнопку
+<guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Чи слід використовувати проксі-сервер вищого рівня?</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step6.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im7"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Маєте каскадний доступ до інтернету крізь інший проксі-сервер? Якщо ні,
+пропустіть наступний крок.</para>
+      </step>
+
+      <step>
+        <title>Адреса і порт проксі-сервера вищого рівня</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step7.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im8"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Вкажіть назву вузла і порт проксі вищого рівня і натисніть кнопку
+<guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Резюме</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step8.png"
+                       format="PNG" revision="1" xml:id="drakwizard_squid-im9"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Ознайомтеся з резюме щодо зміни параметрів і натисніть кнопку
+<guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Чи слід запускати під час завантаження?</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step9.png"
+                       format="PNG" revision="1"
+                       xml:id="drakwizard_squid-im10"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Вкажіть, чи слід запускати проксі-сервер під час завантаження операційної
+системи, і натисніть кнопку <guibutton>Далі</guibutton>.</para>
+      </step>
+
+      <step>
+        <title>Завершення</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="drakwizard-proxy-step10.png"
+                       format="PNG" revision="1"
+                       xml:id="drakwizard_squid-im11"/>
+          </imageobject>
+        </mediaobject>
+
+        <para>Ну ось і все! Натисніть кнопку <guibutton>Завершити</guibutton>.</para>
+      </step>
+    </procedure>
+  </section>
+
+  <section>
+    <title>Дії, які виконує інструмент</title>
+
+    <para><itemizedlist>
+        <listitem>
+          <para>встановлення пакунка squid, якщо його ще не встановлено;</para>
+        </listitem>
+
+        <listitem>
+          <para>збереження <code>/etc/squid/squid.conf</code> з назвою
+<code>/etc/squid/squid.conf.orig</code>№</para>
+        </listitem>
+
+        <listitem>
+          <para>створення нового файла <code>squid.conf</code> на основі
+<code>squid.conf.default</code> і додавання до нього нових параметрів:</para>
+
+          <itemizedlist>
+            <listitem>
+              <para><code>cache_dir</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>localnet</code></para>
+            </listitem>
+
+            <listitem>
+              <para>cache_mem</para>
+            </listitem>
+
+            <listitem>
+              <para>http_port</para>
+            </listitem>
+
+            <listitem>
+              <para><code>level</code> 1, 2 або 3 та <code>http_access</code>, відповідно до
+рівня</para>
+            </listitem>
+
+            <listitem>
+              <para><code>cache_peer</code></para>
+            </listitem>
+
+            <listitem>
+              <para><code>visible_hostname</code></para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>перезапуск <code>squid</code>.</para>
+        </listitem>
+      </itemizedlist></para>
   </section>
-    <section>
-      <title>Налаштовування проксі-сервера за допомогою drakwizard squid</title>
-      <para>
-	Ласкаво просимо до майстра налаштовування проксі-сервера.
-      </para>
-      <procedure>
-	<step>
-	  <title>Вступ</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im2" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step1.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Перша сторінка є просто вступом до програми-майстра. Перегляньте її і
-натисніть кнопку <guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Вибір порту проксі</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im3" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step2.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Виберіть порт, з яким встановлюватимуть з’єднання клієнти проксі-сервера, і
-натисніть кнопку <guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Використання пам’яті та диска</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im4" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step3.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Виберіть параметри обмежень на використання пам’яті та кешу на диску і
-натисніть кнопку <guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Вибір параметрів керування доступом до мережі</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im5" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step4.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Визначте, чи діапазон доступу: локальна мережа чи інтернет, — потім
-натисніть кнопку <guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Надання доступу до мережі</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im6" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step5.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Надайте доступ локальним мережам і натисніть кнопку
-<guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Чи слід використовувати проксі-сервер вищого рівня?</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im7" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step6.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Маєте каскадний доступ до інтернету крізь інший проксі-сервер? Якщо ні,
-пропустіть наступний крок.
-	  </para>
-	</step>
-	<step>
-	  <title>Адреса і порт проксі-сервера вищого рівня</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im8" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step7.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Вкажіть назву вузла і порт проксі вищого рівня і натисніть кнопку
-<guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Резюме</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im9" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step8.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Ознайомтеся з резюме щодо зміни параметрів і натисніть кнопку
-<guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Чи слід запускати під час завантаження?</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im10" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step9.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Вкажіть, чи слід запускати проксі-сервер під час завантаження операційної
-системи, і натисніть кнопку <guibutton>Далі</guibutton>.
-	  </para>
-	</step>
-	<step>
-	  <title>Завершення</title>
-	  <mediaobject>
-	    <imageobject>
-	      <imagedata   xml:id="drakwizard_squid-im11" revision="1" align="center" format="PNG" fileref="drakwizard-proxy-step10.png"/>
-	    </imageobject>
-	  </mediaobject>
-	  <para>
-	    Ну ось і все! Натисніть кнопку <guibutton>Завершити</guibutton>.
-	  </para>
-	</step>
-      </procedure>
-    </section>
 </section>
diff --git a/docs/mcc-help/uk/rpmdrake.xml b/docs/mcc-help/uk/rpmdrake.xml
index 1a17ad71..afa1043c 100644
--- a/docs/mcc-help/uk/rpmdrake.xml
+++ b/docs/mcc-help/uk/rpmdrake.xml
@@ -35,6 +35,24 @@ URPMI. Під час кожного запуску вона перевіряти
 
     <para>Для належної роботи rpmdrake слід налаштувати параметри сховищ пакунків за
 допомогою <xref linkend="drakrpm-edit-media"/>.</para>
+
+    <important>
+      <para>Під час встановлення налаштованим сховищем є носій, з якого відбувається
+встановлення, наприклад DVD або компакт-диск. Якщо ви нічого не будете
+змінювати, rpmdrake проситиме вас вставити цей носій кожного разу, коли вам
+потрібно буде встановити пакунок за допомогою такого контекстного вікна:
+<mediaobject>
+          <imageobject>
+            <imagedata fileref="rpmdrake8.png"/>
+          </imageobject>
+        </mediaobject>Якщо наведене вище повідомлення
+дратує вас і у вас є добрі умови з’єднання з інтернетом без обмежень щодо
+отримання даних, варто вилучити запис початкового носія і замінити його
+сховищами у мережі за допомогою <xref linkend="drakrpm-edit-media"/>.</para>
+
+      <para>Крім того, сховища у мережі завжди містять найсвіжіші пакунки, ширший їхній
+діапазон та надають змогу оновлювати вже встановлені пакунки.</para>
+    </important>
   </section>
 
   <section>