Update templates and docs

14 files changed, 750 insertions, 799 deletions

diff --git a/docs/mcc-help/ca.po b/docs/mcc-help/ca.po
index 5d4492a5..0b2912ec 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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\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"
@@ -329,11 +329,11 @@ msgstr "diskdrake--smb4.png"
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
diff --git a/docs/mcc-help/de.po b/docs/mcc-help/de.po
index 3c5367bf..7e96a127 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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\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/"
@@ -356,11 +356,11 @@ msgstr "diskdrake--nfs5.png"
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
diff --git a/docs/mcc-help/el.po b/docs/mcc-help/el.po
index 66b700b1..dc2a6a4f 100644
--- a/docs/mcc-help/el.po
+++ b/docs/mcc-help/el.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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\n"
 "PO-Revision-Date: 2014-01-26 19:26+0200\n"
 "Last-Translator: Dimitris Tsiamasiotis <dtsiamasiotis@gmail.com>\n"
 "Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -346,11 +346,11 @@ msgstr "diskdrake--nfs2.png"
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
diff --git a/docs/mcc-help/en/diskdrake--nfs.xml b/docs/mcc-help/en/diskdrake--nfs.xml
index a0b01548..6dc1f96a 100644
--- a/docs/mcc-help/en/diskdrake--nfs.xml
+++ b/docs/mcc-help/en/diskdrake--nfs.xml
@@ -74,11 +74,11 @@
       </imageobject>
     </mediaobject>
 
-    <para>On accepting the configuration with the Done button, a message will
+    <para>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.</para>
+    example in Dolphin.</para>
 
     <mediaobject>
       <imageobject>
diff --git a/docs/mcc-help/et.po b/docs/mcc-help/et.po
index 376e9c27..0ce0a459 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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\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"
@@ -401,12 +401,13 @@ msgstr "diskdrake--nfs5.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
+#, fuzzy
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 "Seadistuse kinnitamise järel klõpsuga nupule \"Tehtud\" ilmub küsimus: \"Kas "
 "salvestada /etc/fstab muudatused?\" Salvestamise korral muutub kataloog "
@@ -7262,9 +7263,9 @@ msgid ""
 "for msec that allows to configure your system security according to two "
 "approaches:"
 msgstr ""
-"Tööriist msecgui<placeholder type=\"footnote\" id=\"0\"/> on programmi "
-"msec graafiline kasutajaliides, mis võimaldab seadistada süsteemi turvet "
-"kahel moel:"
+"Tööriist msecgui<placeholder type=\"footnote\" id=\"0\"/> on programmi msec "
+"graafiline kasutajaliides, mis võimaldab seadistada süsteemi turvet kahel "
+"moel:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:28
@@ -7292,10 +7293,10 @@ msgid ""
 "enforcement. Several of them are proposed by Mageia, but you can define your "
 "own customised security levels."
 msgstr ""
-"Programm msec kasutab niinimetatud turbetasemete kontseptsiooni. Need tasemed "
-"hõlmavad teatavat süsteemsete õiguste kogumit, mille põhjal analüüsitakse "
-"süsteemis toimuvaid muutusi. Mõningad tasemed annab Mageia ette, aga neid "
-"saab oma soovi kohaselt muuta ja kohandada."
+"Programm msec kasutab niinimetatud turbetasemete kontseptsiooni. Need "
+"tasemed hõlmavad teatavat süsteemsete õiguste kogumit, mille põhjal "
+"analüüsitakse süsteemis toimuvaid muutusi. Mõningad tasemed annab Mageia "
+"ette, aga neid saab oma soovi kohaselt muuta ja kohandada."
 
 #. type: Content of: <section><section><title>
 #: en/msecgui.xml:45
@@ -7313,8 +7314,8 @@ msgid ""
 "The first tab takes up the list of the different security tools with a "
 "button on the right side to configure them:"
 msgstr ""
-"Esimesel kaardil on ära toodud eri turbetööriistade loetelu, millest "
-"paremal asuvad nupud nende seadistamiseks:"
+"Esimesel kaardil on ära toodud eri turbetööriistade loetelu, millest paremal "
+"asuvad nupud nende seadistamiseks:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:54
@@ -7333,8 +7334,7 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:64
 msgid "msec itself with some information:"
-msgstr ""
-"Msec ise koos mõninga teabega:"
+msgstr "Msec ise koos mõninga teabega:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/msecgui.xml:68
@@ -7366,8 +7366,8 @@ msgid ""
 "A click on the second tab or on the Security <guibutton>Configure</"
 "guibutton> button leads to the same screen shown below."
 msgstr ""
-"Klõps teisele sakile või nupule Turve -> <guibutton>Seadista</"
-"guibutton> avab allnähtava akna."
+"Klõps teisele sakile või nupule Turve -> <guibutton>Seadista</guibutton> "
+"avab allnähtava akna."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:94
@@ -7427,10 +7427,10 @@ msgstr ""
 "Tase <emphasis role=\"bold\">standard</emphasis> on vaikimisi rakendatav "
 "seadistus, mida kasutatakse paigaldamisel, kui paigaldaja ei vali midagi "
 "muud. See tavalisele kasutajale sobiv tase sisaldab mõningaid süsteemsete "
-"seadistuste piiranguid ning käivitab igapäevased turbekontrollid, mis otsivad "
-"muudatusi süsteemsetes failides ja kontodes ning kataloogide õigustes, mis "
-"võivad anda võimaluse halba korda saata. (See tase on sarnane mseci "
-"varasemate versioonide tasemetega 2 ja 3.)"
+"seadistuste piiranguid ning käivitab igapäevased turbekontrollid, mis "
+"otsivad muudatusi süsteemsetes failides ja kontodes ning kataloogide "
+"õigustes, mis võivad anda võimaluse halba korda saata. (See tase on sarnane "
+"mseci varasemate versioonide tasemetega 2 ja 3.)"
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:131
@@ -7441,11 +7441,11 @@ msgid ""
 "the system is more restricted. (This level is similar to levels 4 (High) and "
 "5 (Paranoid) from old msec versions)."
 msgstr ""
-"Tase <emphasis role=\"bold\">secure</emphasis> on mõeldud selleks, kui soovite, "
-"et süsteem oleks tõeliselt turvaline, aga siiski veel kasutatav. Süsteemi "
-"seadistusi piiratakse veelgi ning perioodilisi kontrollegi on rohkem. Lisaks "
-"piiratakse ligipääsu süsteemile. (See tase on sarnane mseci varasemate "
-"versioonide tasemetega 4 (kõrge) ja 5 (paranoiline).)"
+"Tase <emphasis role=\"bold\">secure</emphasis> on mõeldud selleks, kui "
+"soovite, et süsteem oleks tõeliselt turvaline, aga siiski veel kasutatav. "
+"Süsteemi seadistusi piiratakse veelgi ning perioodilisi kontrollegi on "
+"rohkem. Lisaks piiratakse ligipääsu süsteemile. (See tase on sarnane mseci "
+"varasemate versioonide tasemetega 4 (kõrge) ja 5 (paranoiline).)"
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:140
@@ -7458,8 +7458,8 @@ msgid ""
 msgstr ""
 "Lisaks mainitud tasemetele pakutakse veel mitmeid eesmärgipõhiseid "
 "turbetasemeid, näiteks <emphasis role=\"bold\">fileserver</emphasis>, "
-"<emphasis role=\"bold\">webserver</emphasis> ja <emphasis role=\"bold\">"
-"netbook</emphasis>. Nende puhul üritatakse süsteemi turve seadistada "
+"<emphasis role=\"bold\">webserver</emphasis> ja <emphasis role=\"bold"
+"\">netbook</emphasis>. Nende puhul üritatakse süsteemi turve seadistada "
 "vastavalt levinumatele kasutusjuhtumitele."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
@@ -7469,9 +7469,10 @@ msgid ""
 "and <emphasis role=\"bold\">audit_weekly</emphasis> are not really security "
 "levels but rather tools for periodic checks only."
 msgstr ""
-"Viimased kaks taset nimetustega <emphasis role=\"bold\">audit_daily </emphasis> "
-"ja <emphasis role=\"bold\">audit_weekly</emphasis> ei ole õigupoolest päris "
-"turbetasemed, vaid pigem ainult tööriistad perioodiliste kontrollide tarbeks."
+"Viimased kaks taset nimetustega <emphasis role=\"bold\">audit_daily </"
+"emphasis> ja <emphasis role=\"bold\">audit_weekly</emphasis> ei ole "
+"õigupoolest päris turbetasemed, vaid pigem ainult tööriistad perioodiliste "
+"kontrollide tarbeks."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:156
@@ -7483,12 +7484,12 @@ msgid ""
 "intended for power users which require a customised or more secure system "
 "configuration."
 msgstr ""
-"Tasemed salvestatakse faili <filename>etc/security/msec/level.&lt;tasemenimi></"
-"filename>. Soovi korral võib paika panna omaenda kohandatud turbetaseme, "
-"salvestades selle failina <filename>level.&lt;tasemenimi></filename> kataloogis "
-"<filename>etc/security/msec/.</filename> See võimalus on mõistagi mõeldud "
-"väga kogenud kasutajatele, kellel on oma vajadused süsteemi turvet enda "
-"käe järgi kohendada."
+"Tasemed salvestatakse faili <filename>etc/security/msec/level.&lt;"
+"tasemenimi></filename>. Soovi korral võib paika panna omaenda kohandatud "
+"turbetaseme, salvestades selle failina <filename>level.&lt;tasemenimi></"
+"filename> kataloogis <filename>etc/security/msec/.</filename> See võimalus "
+"on mõistagi mõeldud väga kogenud kasutajatele, kellel on oma vajadused "
+"süsteemi turvet enda käe järgi kohendada."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:165
@@ -7496,8 +7497,8 @@ msgid ""
 "Keep in mind that user-modified parameters take precedence over default "
 "level settings."
 msgstr ""
-"Pidage kindlasti silmas, et kasutaja muudetud parameetreid arvestatakse "
-"enne vaiketaseme määratlusi."
+"Pidage kindlasti silmas, et kasutaja muudetud parameetreid arvestatakse enne "
+"vaiketaseme määratlusi."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:170
@@ -7518,11 +7519,10 @@ msgstr ""
 "Kui märkida ära kastike <guibutton>Turbehoiatuste saatmine e-postiga:</"
 "guibutton>, saadetakse mseci loodud turbehoiatused kohalikule e-posti "
 "aadressile turbeadministraatorile, kelle nimi tuleb kirja panna kõrval "
-"asuval väljal. Sinna võib kirjutada kas kohaliku kasutajanime või "
-"täieliku e-posti aadressi (selle huvides peavad olema vajalikult "
-"seadistatud kohalik e-post ja e-posti haldur). Samuti võib lasta "
-"turbehoiatusi näidata otse töölaual, milleks tuleb ära märkida "
-"vastav kastike."
+"asuval väljal. Sinna võib kirjutada kas kohaliku kasutajanime või täieliku e-"
+"posti aadressi (selle huvides peavad olema vajalikult seadistatud kohalik e-"
+"post ja e-posti haldur). Samuti võib lasta turbehoiatusi näidata otse "
+"töölaual, milleks tuleb ära märkida vastav kastike."
 
 #. type: Content of: <section><section><section><important><para>
 #: en/msecgui.xml:182
@@ -7552,11 +7552,11 @@ msgid ""
 "security level name and the list of all the modifications done to the "
 "options."
 msgstr ""
-"Kohandatud taseme loomine ei ole ainuke viis sättida arvuti turvet oma "
-"käe järgi: samamoodi võib kasutada tööriista eri kaarte, et muuta just "
-"neid valikuid, mida vaja. Mseci kehtiv seadistus on salvestatud faili "
-"<filename>/etc/security/msec/security.conf</filename>. See sisaldab "
-"nii kehtivat turbetaseme nime kui ka loetelu kõigist muudetud valikutest."
+"Kohandatud taseme loomine ei ole ainuke viis sättida arvuti turvet oma käe "
+"järgi: samamoodi võib kasutada tööriista eri kaarte, et muuta just neid "
+"valikuid, mida vaja. Mseci kehtiv seadistus on salvestatud faili <filename>/"
+"etc/security/msec/security.conf</filename>. See sisaldab nii kehtivat "
+"turbetaseme nime kui ka loetelu kõigist muudetud valikutest."
 
 #. type: Content of: <section><section><section><title>
 #: en/msecgui.xml:199
@@ -7570,8 +7570,8 @@ msgid ""
 "description in the centre column, and their current values on the right side "
 "column."
 msgstr ""
-"Sellel kaardil võib näha vasakus veerus turbevalikut, keskmises veerus "
-"selle kirjeldust ja paremas veerus kehtivat väärtust."
+"Sellel kaardil võib näha vasakus veerus turbevalikut, keskmises veerus selle "
+"kirjeldust ja paremas veerus kehtivat väärtust."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:207
@@ -7587,10 +7587,10 @@ msgid ""
 "selected. Click on the <guibutton>OK</guibutton> button to validate the "
 "choice."
 msgstr ""
-"Mõne valiku muutmiseks tehke sellel topeltklõps, mille järel ilmub uus "
-"aken (vt pilti allpool). Selles on näha valiku nimi, lühike kirjeldus, "
-"kehtiv ja vaikeväärtus ning ripploend, milles saab valida uue väärtuse. "
-"Klõpsuga nupule <guibutton>Olgu</guibutton> saab muudatuse kinnitada."
+"Mõne valiku muutmiseks tehke sellel topeltklõps, mille järel ilmub uus aken "
+"(vt pilti allpool). Selles on näha valiku nimi, lühike kirjeldus, kehtiv ja "
+"vaikeväärtus ning ripploend, milles saab valida uue väärtuse. Klõpsuga "
+"nupule <guibutton>Olgu</guibutton> saab muudatuse kinnitada."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:219
@@ -7654,10 +7654,10 @@ msgid ""
 "if the box <guibutton>Enable periodic security checks</guibutton> is "
 "checked. Changes are done like in the previous tabs."
 msgstr ""
-"Kui märkida kastike <guibutton>Perioodiliste turbekontrollide "
-"lubamine</guibutton>, näeb sellel kaardil kõiki mseci sooritatavaid "
-"perioodilisi kontrolle ja nende sagedust. Muudatusi saab siin teha "
-"samamoodi nagu eespool kirjeldatud kaartidel."
+"Kui märkida kastike <guibutton>Perioodiliste turbekontrollide lubamine</"
+"guibutton>, näeb sellel kaardil kõiki mseci sooritatavaid perioodilisi "
+"kontrolle ja nende sagedust. Muudatusi saab siin teha samamoodi nagu eespool "
+"kirjeldatud kaartidel."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:264
@@ -7681,8 +7681,8 @@ msgstr ""
 "Mõnikord käivad hoiatused hästi teada ja soovitud olukorra kohta. Sel juhul "
 "ei ole neil tegelikult mõtet ja nad vaid raiskavad administraatori aega. "
 "Sellel kaardil saab luua nii palju erandeid kui vaja, et vältida tarbetuid "
-"turbehoiatusi. Enesest mõista on see kaart mseci esmakäivitusel tühi. Allpool "
-"oleval pildil on näha neli erandit."
+"turbehoiatusi. Enesest mõista on see kaart mseci esmakäivitusel tühi. "
+"Allpool oleval pildil on näha neli erandit."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:280
@@ -7693,7 +7693,8 @@ msgstr "msecgui6.png"
 #: en/msecgui.xml:284
 msgid ""
 "To create an exception, click on the <guibutton>Add a rule</guibutton> button"
-msgstr "Erandi loomiseks tuleb klõpsata nupule <guibutton>Lisa reegel</guibutton>."
+msgstr ""
+"Erandi loomiseks tuleb klõpsata nupule <guibutton>Lisa reegel</guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:289
@@ -7709,11 +7710,11 @@ msgid ""
 "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 ""
-"Valige vajalik perioodiline kontroll ripploendist <guilabel>Kontroll</guilabel> "
-"ja kirjutage erand tekstikasti <guilabel>Erand</guilabel>. Erandi lisamine "
-"ei ole mõistagi midagi jäävat: selle võib kustutada <guilabel>erandite</guilabel> "
-"kaardil klõpsuga nupule <guibutton>Kustuta</guibutton>, samuti võib seda "
-"topeltklõpsuga muuta."
+"Valige vajalik perioodiline kontroll ripploendist <guilabel>Kontroll</"
+"guilabel> ja kirjutage erand tekstikasti <guilabel>Erand</guilabel>. Erandi "
+"lisamine ei ole mõistagi midagi jäävat: selle võib kustutada "
+"<guilabel>erandite</guilabel> kaardil klõpsuga nupule <guibutton>Kustuta</"
+"guibutton>, samuti võib seda topeltklõpsuga muuta."
 
 #. type: Content of: <section><section><section><title>
 #: en/msecgui.xml:303
@@ -7825,9 +7826,9 @@ msgid ""
 "the settings, msecgui allows you to preview the changes before saving them."
 msgstr ""
 "Muudatuste jõustamiseks klõpsake nupule <guibutton>Olgu</guibutton> ning "
-"kindlasti ärge unustage enne tööriistast väljumist kõiki muudatusi salvestamast "
-"menüükäsuga <guimenu>Fail -> Salvesta seadistus</guimenu>. Kui olete "
-"seadistusi muutnud, annab msecgui võimaluse need enne salvestamist üle "
+"kindlasti ärge unustage enne tööriistast väljumist kõiki muudatusi "
+"salvestamast menüükäsuga <guimenu>Fail -> Salvesta seadistus</guimenu>. Kui "
+"olete seadistusi muutnud, annab msecgui võimaluse need enne salvestamist üle "
 "vaadata."
 
 #. type: Content of: <section><section><section><note><para>
@@ -7836,8 +7837,8 @@ msgid ""
 "It is also possible to create or modify the rules by editing the "
 "configuration file <filename>/etc/security/msec/perms.conf</filename>."
 msgstr ""
-"Reegleid võib samuti luua või muuta seadistustefaili "
-"<filename>/etc/security/msec/perms.conf</filename> redigeerides."
+"Reegleid võib samuti luua või muuta seadistustefaili <filename>/etc/security/"
+"msec/perms.conf</filename> redigeerides."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:356
@@ -7852,11 +7853,10 @@ msgid ""
 msgstr ""
 "<emphasis role=\"bold\">Õiguste kaardil</emphasis> (või otse "
 "seadistustefailis) tehtud muudatusi võetakse arvesse esimesel perioodilisel "
-"kontrollil (vt valikut CHECK_PERMS <emphasis role=\"bold"
-"\">perioodiliste kontrollide kaardil</emphasis>). Kui soovite, et neid "
-"kohe arvestataks, kasutage käsureal administraatori õigustes käsku msecperms. "
-"Eelnevalt võib anda käsu msecperms -p, millega saab teada õigused, mida "
-"msecperms muudab."
+"kontrollil (vt valikut CHECK_PERMS <emphasis role=\"bold\">perioodiliste "
+"kontrollide kaardil</emphasis>). Kui soovite, et neid kohe arvestataks, "
+"kasutage käsureal administraatori õigustes käsku msecperms. Eelnevalt võib "
+"anda käsu msecperms -p, millega saab teada õigused, mida msecperms muudab."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:363
@@ -7869,9 +7869,9 @@ msgid ""
 "<emphasis role=\"bold\">Periodic Checks tab </emphasis>."
 msgstr ""
 "Pange kindlasti tähele, et kui muudate õigusi käsureal või failihalduris, "
-"siis faili puhul, millel on <emphasis role=\"bold\">õiguste kaardil</emphasis> "
-"ära märgitud kastike <guilabel>Jõuga kehtestamine</guilabel>, kirjutab "
-"msecgui mõne aja pärast vanad õigused tagasi vastavalt valikutele "
+"siis faili puhul, millel on <emphasis role=\"bold\">õiguste kaardil</"
+"emphasis> ära märgitud kastike <guilabel>Jõuga kehtestamine</guilabel>, "
+"kirjutab msecgui mõne aja pärast vanad õigused tagasi vastavalt valikutele "
 "CHECK_PERMS ja CHECK_PERMS_ENFORCE <emphasis role=\"bold\">perioodiliste "
 "kontrollide kaardil</emphasis>."
 
@@ -10025,9 +10025,9 @@ 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 ""
-"Kui olete valinud vaba draiveri, võib süsteem teha ettepaneku "
-"kasutada omanduslikku draiverit, millel on tihtipeale rohkem võimalusi "
-"(näiteks ruumiliste efektide kasutamine)."
+"Kui olete valinud vaba draiveri, võib süsteem teha ettepaneku kasutada "
+"omanduslikku draiverit, millel on tihtipeale rohkem võimalusi (näiteks "
+"ruumiliste efektide kasutamine)."
 
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:45
@@ -10144,8 +10144,8 @@ msgid ""
 "to change after all, click on <guibutton>No</guibutton>, if everything is "
 "right, click on <guibutton role=\"bold\">OK</guibutton>."
 msgstr ""
-"Kui test nurjub, oodake lihtsalt selle lõpuni. Kui see on edukas, aga "
-"Te soovite siiski midagi muuta, klõpsake <guibutton>Ei</guibutton>. Kui kõik "
+"Kui test nurjub, oodake lihtsalt selle lõpuni. Kui see on edukas, aga Te "
+"soovite siiski midagi muuta, klõpsake <guibutton>Ei</guibutton>. Kui kõik "
 "sobib, klõpsake <guibutton role=\"bold\">Olgu</guibutton>."
 
 #. type: Content of: <section><orderedlist><title>
diff --git a/docs/mcc-help/fr.po b/docs/mcc-help/fr.po
index 00a10b6f..e4c71a0f 100644
--- a/docs/mcc-help/fr.po
+++ b/docs/mcc-help/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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\n"
 "PO-Revision-Date: 2014-02-04 21:35+0100\n"
 "Last-Translator: Dune <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
@@ -414,12 +414,13 @@ msgstr "diskdrake--nfs5.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
+#, fuzzy
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 "Après l'acceptation de la configuration en cliquant sur le bouton "
 "<guibutton>Terminé</guibutton> un message apparaît pour demander \"Désirez "
diff --git a/docs/mcc-help/id.po b/docs/mcc-help/id.po
index 172e807a..195416af 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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\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/"
@@ -405,12 +405,13 @@ msgstr "diskdrake--nfs5.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
+#, fuzzy
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 "Saat menerima konfigurasi dengan tombol Selesai, sebuah pesan ditampilkan, "
 "menanyakan \"Apakah Anda ingin menyimpan perubahan /etc/fstab\". Ini akan "
diff --git a/docs/mcc-help/it.po b/docs/mcc-help/it.po
index a2f5b900..401d69af 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: 2013-12-24 17:14+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\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"
@@ -35,8 +35,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--dav.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --dav</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --dav</emphasis> as root."
 msgstr ""
 "Puoi avviare questo strumento dalla riga di comando, digitando <emphasis "
 "role=\"bold\">diskdrake --dav</emphasis> come root."
@@ -48,12 +48,15 @@ msgid ""
 "Control Center, under the Network Sharing tab, labeled <guilabel>Configure "
 "WebDAV shares</guilabel>."
 msgstr ""
-"Questo strumento<placeholder type=\"footnote\" id=\"0\"/> lo trovi nel Centro "
-"di Controllo di Mageia, nel tab Condivisioni di rete, etichettato <guilabel>"
-"Configura condivisioni WebDAV</guilabel>."
+"Questo strumento<placeholder type=\"footnote\" id=\"0\"/> lo trovi nel "
+"Centro di Controllo di Mageia, nel tab Condivisioni di rete, etichettato "
+"<guilabel>Configura condivisioni 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/keyboarddrake.xml:17 en/system-config-printer.xml:21
+#: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
+#: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
+#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/keyboarddrake.xml:17
+#: en/system-config-printer.xml:21
 msgid "Introduction"
 msgstr "Introduzione"
 
@@ -68,11 +71,9 @@ msgid ""
 msgstr ""
 "<link xlink:href=\"http://en.wikipedia.org/wiki/WebDAV\">WebDAV</link> è un "
 "protocollo che consente di montare un directory di un server web localmente, "
-"così che questo "
-"appaia come una directory locale. E' necessario che la macchina remota abbia "
-"in esecuzione un "
-"server WebDAV. Lo scopo di questo strumento non è quello di configurare il "
-"server WebDAV."
+"così che questo appaia come una directory locale. E' necessario che la "
+"macchina remota abbia in esecuzione un server WebDAV. Lo scopo di questo "
+"strumento non è quello di configurare il server WebDAV."
 
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:40
@@ -83,13 +84,12 @@ msgstr "Crea una nuova voce"
 #: en/diskdrake--dav.xml:42
 msgid ""
 "The first screen of the tool displays the already configured entries, if "
-"any, and a <guibutton>New</guibutton> button. Use it to create a new "
-"entry. Insert the server URL in the field of the new screen."
+"any, and a <guibutton>New</guibutton> button. Use it to create a new entry. "
+"Insert the server URL in the field of the new screen."
 msgstr ""
 "La prima schermata dello strumento mostra le voci già configurate, se "
 "presenti, e un pulsante <guibutton>Nuova</guibutton>. Usalo per creare una "
-"nuova "
-"voce. Inserisci l'URL del server nel campo della nuova schermata."
+"nuova voce. Inserisci l'URL del server nel campo della nuova schermata."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:46
@@ -101,12 +101,10 @@ msgid ""
 "it, if needed."
 msgstr ""
 "Raggiungerai quindi una schermata con alcuni pulsanti radio per selezionare "
-"alcune azioni. Continua "
-"con l'azione <guibutton>Punto di mount</guibutton> cliccando <guibutton>OK<"
-"/guibutton> dopo aver "
-"selezionato il pulsante radio, in quanto il <guibutton>Server</guibutton> è "
-"già configurato. Potrai comunque correggerlo, "
-"se necessario."
+"alcune azioni. Continua con l'azione <guibutton>Punto di mount</guibutton> "
+"cliccando <guibutton>OK</guibutton> dopo aver selezionato il pulsante radio, "
+"in quanto il <guibutton>Server</guibutton> è già configurato. Potrai "
+"comunque correggerlo, se necessario."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--dav.xml:54
@@ -129,8 +127,8 @@ msgid ""
 "options, you can give them in the <guibutton>advanced</guibutton> screen."
 msgstr ""
 "Nella fase successiva, inserisci il tuo nome utente e la password. Se "
-"necessiti altre opzioni, "
-"puoi darle nella schermata <guibutton>avanzate</guibutton>."
+"necessiti altre opzioni, puoi darle nella schermata <guibutton>avanzate</"
+"guibutton>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--dav.xml:67
@@ -149,24 +147,20 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/diskdrake--dav.xml:74
 msgid ""
-"After you accepted the configuration with the radio button "
-"<guibutton>Done</guibutton>, the first screen is displayed again and you new "
-"mount point is listed. After you choose <guibutton>Quit</guibutton>, you are "
-"asked 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."
+"After you accepted the configuration with the radio button <guibutton>Done</"
+"guibutton>, the first screen is displayed again and you new mount point is "
+"listed. After you choose <guibutton>Quit</guibutton>, you are asked 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 ""
 "Dopo aver accettato la configurazione con il pulsante radio "
-"<guibutton>Fatto</guibutton>, la prima schermata viene mostrata nuovamente ed "
-"il tuo nuovo "
-"punto di montaggio viene elencato. Dopo aver premuto <guibutton>Chiudi<"
-"/guibutton>, ti viene "
-"chiesto se salvare o non salvare le modifiche in "
-"<emphasis>/etc/fstab</emphasis>. Scegli questa opzione se vuoi che la "
-"directory remota sia disponibile ad ogni avvio. Se la tua configurazione vale "
-"per "
-"un solo utilizzo, non salvarla."
+"<guibutton>Fatto</guibutton>, la prima schermata viene mostrata nuovamente "
+"ed il tuo nuovo punto di montaggio viene elencato. Dopo aver premuto "
+"<guibutton>Chiudi</guibutton>, ti viene chiesto se salvare o non salvare le "
+"modifiche in <emphasis>/etc/fstab</emphasis>. Scegli questa opzione se vuoi "
+"che la directory remota sia disponibile ad ogni avvio. Se la tua "
+"configurazione vale per un solo utilizzo, non salvarla."
 
 #. type: Content of: <section><info><title>
 #: en/diskdrake--fileshare.xml:3
@@ -186,11 +180,11 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/diskdrake--fileshare.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --fileshare</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --fileshare</emphasis> as root."
 msgstr ""
-"Puoi avviare questo strumento dalla riga di comando digitando <emphasis "
-"role=\"bold\">diskdrake --fileshare</emphasis> come root."
+"Puoi avviare questo strumento dalla riga di comando digitando <emphasis role="
+"\"bold\">diskdrake --fileshare</emphasis> come root."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:15
@@ -200,12 +194,11 @@ msgid ""
 "subdirectories with other users of a same local network which may have "
 "computers running either Linux or Windows operating system."
 msgstr ""
-"Questo semplice strumento<placeholder type=\"footnote\" id=\"0\"/> consente a "
-"te, "
-"amministratore, di autorizzare gli utenti a condividere parti delle proprie "
-"sottodirectory "
-"in /home con altri utenti della stessa rete locale che potrebbero avere "
-"computers su cui gira il sistema operativo Linux o Windows."
+"Questo semplice strumento<placeholder type=\"footnote\" id=\"0\"/> consente "
+"a te, amministratore, di autorizzare gli utenti a condividere parti delle "
+"proprie sottodirectory in /home con altri utenti della stessa rete locale "
+"che potrebbero avere computers su cui gira il sistema operativo Linux o "
+"Windows."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:20
@@ -214,8 +207,7 @@ msgid ""
 "\"Share your hard disk partitions\"."
 msgstr ""
 "Si trova nel Centro di Controllo di Mageia, nella scheda Dischi Locali, "
-"etichettata "
-"\"Condividi le partizioni del disco fisso\"."
+"etichettata \"Condividi le partizioni del disco fisso\"."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:23
@@ -230,18 +222,14 @@ msgid ""
 "created by the system. You will be asked about this later."
 msgstr ""
 "Primo, rispondi alla domanda: \"<guilabel>Vuoi consentire agli utenti di "
-"condividere alcune delle loro directory ?</guilabel>\", clicca su <guibutton>"
-"Nessuna "
-"condivisione</guibutton> se la risposta è no per tutti gli utenti, clicca su "
-"<guibutton>Permetti a tutti gli utenti</guibutton> per tutti gli utenti e "
-"clicca su "
-"<guibutton>Personalizzato</guibutton> se la risposta è no per alcuni utenti e "
-"sì per "
-"altri. In questo ultimo caso, gli utenti che sono autorizzati a condividere "
-"le proprie "
-"directory devono appartenere al gruppo fileshare, che è automaticamente "
-"creato dal sistema. Verrai interrogato successivamente in merito a questo "
-"aspetto."
+"condividere alcune delle loro directory ?</guilabel>\", clicca su "
+"<guibutton>Nessuna condivisione</guibutton> se la risposta è no per tutti "
+"gli utenti, clicca su <guibutton>Permetti a tutti gli utenti</guibutton> per "
+"tutti gli utenti e clicca su <guibutton>Personalizzato</guibutton> se la "
+"risposta è no per alcuni utenti e sì per altri. In questo ultimo caso, gli "
+"utenti che sono autorizzati a condividere le proprie directory devono "
+"appartenere al gruppo fileshare, che è automaticamente creato dal sistema. "
+"Verrai interrogato successivamente in merito a questo aspetto."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:32
@@ -254,12 +242,11 @@ msgid ""
 "required packages will be installed if necessary."
 msgstr ""
 "Clicca su <guilabel>OK</guilabel>, una seconda schermata apparirà "
-"proponendoti "
-"di scegliere tra <guibutton>NFS</guibutton> o <guibutton>SMB</guibutton>. "
-"Spunta <guibutton>NFS</guibutton> se Linux è l'unico sistema operativo sulla "
-"rete, spunta <guibutton>SMB</guibutton> se la rete include sia macchine "
-"Linux che macchine Windows e quindi clicca su <guibutton>OK</guibutton>. I "
-"pacchetti richiesti verranno installati se necessario."
+"proponendoti di scegliere tra <guibutton>NFS</guibutton> o <guibutton>SMB</"
+"guibutton>. Spunta <guibutton>NFS</guibutton> se Linux è l'unico sistema "
+"operativo sulla rete, spunta <guibutton>SMB</guibutton> se la rete include "
+"sia macchine Linux che macchine Windows e quindi clicca su <guibutton>OK</"
+"guibutton>. I pacchetti richiesti verranno installati se necessario."
 
 #. type: Content of: <section><para>
 #: en/diskdrake--fileshare.xml:39
@@ -273,15 +260,12 @@ msgid ""
 "about Userdrake, see <link ns2:href=\"userdrake.xml\">this page</link>"
 msgstr ""
 "La configurazione è ora completa a meno che non sia stata scelta l'opzione "
-"Personalizzato. "
-"In questo caso una schermata extra ti domanderà di avviare Userdrake. "
-"Questo strumento ti consente di aggiungere gli utenti autorizzati a "
-"condividere "
-"le loro directory al gruppo fileshare. Nella scheda Utente, clicca "
-"sull'utente per aggiungerlo al gruppo fileshare, "
-"quindi su <guimenuitem>Modifica</guimenuitem>, nella scheda Gruppi. Spunta il "
-"gruppo fileshare e clicca su <guibutton>OK</guibutton>. Per ulteriori "
-"informazioni "
+"Personalizzato. In questo caso una schermata extra ti domanderà di avviare "
+"Userdrake. Questo strumento ti consente di aggiungere gli utenti autorizzati "
+"a condividere le loro directory al gruppo fileshare. Nella scheda Utente, "
+"clicca sull'utente per aggiungerlo al gruppo fileshare, quindi su "
+"<guimenuitem>Modifica</guimenuitem>, nella scheda Gruppi. Spunta il gruppo "
+"fileshare e clicca su <guibutton>OK</guibutton>. Per ulteriori informazioni "
 "su Userdrake, guarda <link ns2:href=\"userdrake.xml\">questa pagina</link>"
 
 #. type: Content of: <section><note><para>
@@ -301,13 +285,12 @@ msgid ""
 "have this facility."
 msgstr ""
 "D'ora in poi ogni utente appartenente al gruppo fileshare potrà selezionare "
-"nel suo "
-"gestore di file le directory da condividere, sebbene non tutti i gestori di "
-"file "
-"forniscono questa funzionalità."
+"nel suo gestore di file le directory da condividere, sebbene non tutti i "
+"gestori di file forniscono questa funzionalità."
 
 #. 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 ""
 
@@ -334,11 +317,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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --nfs</emphasis> as root."
 msgstr ""
-"Puoi avviare questo strumento dalla riga di comando digitando <emphasis "
-"role=\"bold\">diskdrake --nfs</emphasis> come root."
+"Puoi avviare questo strumento dalla riga di comando digitando <emphasis role="
+"\"bold\">diskdrake --nfs</emphasis> come root."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:24
@@ -346,9 +329,9 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to declare "
 "some shared directories to be accessible to all users on the machine. The "
 "protocol used for this is NFS which is available on most Linux or Unix "
-"systems. The shared directory will be thus available directly at "
-"boot. Shared directories can be also accessible directly in a single session "
-"for a user with tools such as file browsers."
+"systems. The shared directory will be thus available directly at boot. "
+"Shared directories can be also accessible directly in a single session for a "
+"user with tools such as file browsers."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -363,8 +346,7 @@ msgid ""
 "which share directories."
 msgstr ""
 "Seleziona <guibutton>cerca server</guibutton> per ottenere una lista dei "
-"server "
-"che condividono directory."
+"server che condividono directory."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:41
@@ -373,8 +355,7 @@ msgid ""
 "shared directories and select the directory you want to access."
 msgstr ""
 "Clicca sul simbolo > prima del nome del server per visualizzare la lista "
-"delle "
-"directory condivise e seleziona la directory cui vuoi accedere."
+"delle directory condivise e seleziona la directory cui vuoi accedere."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:47
@@ -388,15 +369,13 @@ msgid ""
 "to specify where to mount the directory."
 msgstr ""
 "Il pulsante <guibutton>Punto di mount</guibutton> diventerà disponibile e "
-"dovrai "
-"specificare dove montare la directory."
+"dovrai specificare dove montare la directory."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:56
 msgid "diskdrake--nfs3.png"
 msgstr ""
 
-
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:60
 msgid ""
@@ -405,8 +384,8 @@ msgid ""
 "mounting the directory, you can unmount it with the same button."
 msgstr ""
 "Dopo aver scelto il punto di mount, puoi montarlo. Puoi anche verificare e "
-"cambiare qualche opzione con il pulsante <guibutton>Opzioni</guibutton>. Dopo "
-"aver montato la directory puoi smontarla usando lo stesso pulsante."
+"cambiare qualche opzione con il pulsante <guibutton>Opzioni</guibutton>. "
+"Dopo aver montato la directory puoi smontarla usando lo stesso pulsante."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/diskdrake--nfs.xml:67
@@ -421,11 +400,11 @@ msgstr "diskdrake--nfs5.png"
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
@@ -451,8 +430,8 @@ 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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --removable</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -472,8 +451,8 @@ msgstr ""
 #: 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> "
+"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 ""
 
@@ -526,8 +505,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/diskdrake--smb.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">diskdrake --smb</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">diskdrake --smb</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -601,15 +580,13 @@ msgstr "diskdrake--smb3.png"
 msgid "diskdrake--smb4.png"
 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."
+"new directory is then available in your file browser, for example in dolphin."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
@@ -635,8 +612,8 @@ 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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drak3d</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -665,10 +642,9 @@ msgstr ""
 msgid ""
 "After starting drak3d, you will be presented with a menu window.  Here you "
 "can choose either <guilabel>No 3D Desktop Effects</guilabel> or "
-"<guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a "
-"composite/window manager, which includes hardware-accelerated special "
-"effects for your desktop. Choose <guilabel>Compiz Fusion</guilabel> to turn "
-"it on."
+"<guilabel>Compiz Fusion</guilabel>. Compiz Fusion is part of a composite/"
+"window manager, which includes hardware-accelerated special effects for your "
+"desktop. Choose <guilabel>Compiz Fusion</guilabel> to turn it on."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -676,8 +652,8 @@ msgstr ""
 msgid ""
 "If this is your first time using this program after a clean installation of "
 "Mageia, you will get a warning message telling you which packages need to be "
-"installed in order to use Compiz Fusion. Click on the "
-"<guibutton>Ok</guibutton> button to continue."
+"installed in order to use Compiz Fusion. Click on the <guibutton>Ok</"
+"guibutton> button to continue."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
@@ -750,8 +726,8 @@ 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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakauth</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -787,8 +763,8 @@ msgstr "drakboot--boot.png"
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:15 en/drakboot--boot.xml:126
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakboot --boot</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot --boot</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -819,20 +795,20 @@ msgid ""
 "In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
 "choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
 "with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot "
-"device</guibutton>, don't change anything here unless you are an expert. The "
-"boot device is where the bootloader is installed and any modification can "
-"prevent you machine from booting."
+"no other consequences. You can also set the <guibutton>Boot device</"
+"guibutton>, don't change anything here unless you are an expert. The boot "
+"device is where the bootloader is installed and any modification can prevent "
+"you machine from booting."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:36
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
-"the <guibutton>Delay before booting default image</guibutton>, in "
-"seconds. During this delay, grub or Lilo will display the list of available "
-"operating systems, prompting you to make your choice, if no selection is "
-"made, the bootloader will boot the default one once the delay elapses."
+"the <guibutton>Delay before booting default image</guibutton>, in seconds. "
+"During this delay, grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice, if no selection is made, the "
+"bootloader will boot the default one once the delay elapses."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -883,8 +859,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:66
 msgid ""
-"<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local "
-"APIC:</guibutton>"
+"<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
+"guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -997,8 +973,8 @@ 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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1025,10 +1001,10 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakboot.xml:28
 msgid ""
-"Check <guibutton>Launch the graphical environment when your system "
-"starts</guibutton>, if you want X Window System to be executed after the "
-"boot. If not, the system will start in text mode. Nevertheless, it will be "
-"possible to launch the graphic interface manually."
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1055,8 +1031,8 @@ msgstr ""
 #. 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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakbug_report</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1258,10 +1234,10 @@ 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>."
+"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 ""
 
 #. type: Content of: <section><info><title>
@@ -1282,8 +1258,8 @@ 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>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakbug</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1299,10 +1275,9 @@ msgstr ""
 #: 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."
+"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 ""
 
 #. type: Content of: <section><para>
@@ -1331,17 +1306,17 @@ 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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakclock</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the tab "
-"System in the Mageia Control Center labelled <guilabel>\"Manage date and "
-"time\"</guilabel>. In some desktop environments it is also available by a "
-"right click / Adjust date and Time ... on the clock in the system tray."
+"System in the Mageia Control Center labelled <guilabel>\"Manage date and time"
+"\"</guilabel>. In some desktop environments it is also available by a right "
+"click / Adjust date and Time ... on the clock in the system tray."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1352,20 +1327,19 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakclock.xml:23
 msgid ""
-"On the upper left part, is the <emphasis "
-"role=\"bold\">calendar</emphasis>. On the screenshot above, the date is "
-"September (on the upper left), 2012 (on the upper right), the 2nd (in blue)  "
-"and it is a Sunday. Select the month (or year) by clicking on the little "
-"arrows on each side of September (or 2012). Select the day by clicking on "
-"its number."
+"On the upper left part, is the <emphasis role=\"bold\">calendar</emphasis>. "
+"On the screenshot above, the date is September (on the upper left), 2012 (on "
+"the upper right), the 2nd (in blue)  and it is a Sunday. Select the month "
+"(or year) by clicking on the little arrows on each side of September (or "
+"2012). Select the day by clicking on its number."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakclock.xml:29
 msgid ""
-"On the bottom left is the <emphasis role=\"bold\">Network Time "
-"Protocol</emphasis> synchronising, it is possible to have a clock always on "
-"time by synchronising it with a server. Check <guilabel>Enable Network Time "
+"On the bottom left is the <emphasis role=\"bold\">Network Time Protocol</"
+"emphasis> synchronising, it is possible to have a clock always on time by "
+"synchronising it with a server. Check <guilabel>Enable Network Time "
 "Protocol</guilabel> and choose the closest server."
 msgstr ""
 
@@ -1413,15 +1387,15 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakconnect--del.xml:12
 msgid ""
-"You can also start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconnect --del</emphasis> as root."
+"You can also start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconnect --del</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakconnect--del.xml:12
 msgid ""
-"Here, you can delete a network interface<placeholder type=\"footnote\" "
-"id=\"0\"/>."
+"Here, you can delete a network interface<placeholder type=\"footnote\" id="
+"\"0\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1456,8 +1430,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakconnect.xml:19
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconnect</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconnect</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -1552,8 +1526,8 @@ msgstr ""
 #: en/drakconnect.xml:95 en/drakconnect.xml:232 en/drakconnect.xml:599
 msgid ""
 "the HOSTNAME required by DHCP. Only use this option if the DHCP server "
-"requires the client to specify a hostname before receiving an IP "
-"address. This option is not dealt by some DHCP servers."
+"requires the client to specify a hostname before receiving an IP address. "
+"This option is not dealt by some DHCP servers."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
@@ -1581,20 +1555,20 @@ msgstr ""
 #: en/drakconnect.xml:121 en/drakconnect.xml:258
 msgid ""
 "For a residential network, the IP address usually looks like "
-"<emphasis>192.168.x.x</emphasis>, Netmask is "
-"<emphasis>255.255.255.0</emphasis>, and the Gateway and DNS servers are "
-"available from your service provider's website."
+"<emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</"
+"emphasis>, and the Gateway and DNS servers are available from your service "
+"provider's website."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:126
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It would usually be your home domain, i.e. if your "
-"computer is called \"splash\", and it's full domain name is "
-"\"splash.boatanchor.net\", the Search Domain would be "
-"\"boatanchor.net\". Unless you specifically need it, it's ok not to define "
-"this setting. Again, domestic ADSL would not need this setting."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It would usually be your home domain, i.e. if your computer is "
+"called \"splash\", and it's full domain name is \"splash.boatanchor.net\", "
+"the Search Domain would be \"boatanchor.net\". Unless you specifically need "
+"it, it's ok not to define this setting. Again, domestic ADSL would not need "
+"this setting."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
@@ -1603,7 +1577,9 @@ msgid "drakconnect30.png"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
-#: en/drakconnect.xml:142 en/drakconnect.xml:279 en/drakconnect.xml:351 en/drakconnect.xml:458 en/drakconnect.xml:636 en/drakconnect.xml:688 en/drakconnect.xml:780
+#: en/drakconnect.xml:142 en/drakconnect.xml:279 en/drakconnect.xml:351
+#: en/drakconnect.xml:458 en/drakconnect.xml:636 en/drakconnect.xml:688
+#: en/drakconnect.xml:780
 msgid "The next steps are exposed at <xref linkend=\"drakconnect-end\"/>"
 msgstr ""
 
@@ -1613,12 +1589,12 @@ msgid "A new Satellite connection (DVB)"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakconnect.xml:152 en/drakconnect.xml:696 en/draknetcenter.xml:136 en/draknetcenter.xml:142 en/draknetcenter.xml:203
+#: en/drakconnect.xml:152 en/drakconnect.xml:696 en/draknetcenter.xml:136
+#: en/draknetcenter.xml:142 en/draknetcenter.xml:203
 msgid ""
 "This section hasn't been written yet for lack of resources. If you think you "
-"can write this help, please contact <link "
-"ns2:href=\"https://wiki.mageia.org/en/Documentation_team\"> the Doc "
-"team.</link> Thanking you in advance."
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -1669,12 +1645,12 @@ msgstr ""
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:263
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It would usually be your home domain, i.e. if your "
-"computer is called \"splash\", and it's full domain name is "
-"\"splash.boatanchor.net\", the Search Domain would be "
-"\"boatanchor.net\". Unless you specifically need it, it's ok not to define "
-"this setting. Again, domestic connection would not need this setting."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It would usually be your home domain, i.e. if your computer is "
+"called \"splash\", and it's full domain name is \"splash.boatanchor.net\", "
+"the Search Domain would be \"boatanchor.net\". Unless you specifically need "
+"it, it's ok not to define this setting. Again, domestic connection would not "
+"need this setting."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><orderedlist><listitem><orderedlist><listitem><mediaobject><imageobject><imagedata>
@@ -1698,8 +1674,8 @@ msgstr ""
 #: en/drakconnect.xml:296 en/drakconnect.xml:663
 msgid ""
 "A list of providers is proposed, classified by countries.  Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider gave."
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave."
 msgstr ""
 
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
@@ -1785,8 +1761,8 @@ msgstr ""
 #. type: Content of: <section><section><para><orderedlist><listitem><para>
 #: en/drakconnect.xml:375
 msgid ""
-"A list of hardware is proposed, classified by category and "
-"manufacturer. Select your card."
+"A list of hardware is proposed, classified by category and manufacturer. "
+"Select your card."
 msgstr ""
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1803,9 +1779,9 @@ msgstr ""
 #: en/drakconnect.xml:395
 msgid ""
 "A list of providers is then offered, classified by countries.  Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider gave "
-"you. Then it is asked for parameters:"
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave you. Then it is "
+"asked for parameters:"
 msgstr ""
 
 #. type: Content of: <section><section><para><orderedlist><listitem><itemizedlist><listitem><para>
@@ -1974,12 +1950,12 @@ msgstr ""
 #: en/drakconnect.xml:561
 msgid ""
 "<emphasis>IP settings</emphasis>: you have to select if DNS servers are "
-"declared by the DHCP server or are manually specified, as explained "
-"below. In the last case, IP address of DNS servers has to be set. The "
-"HOSTNAME of the computer can be specified here.  If no HOSTNAME is "
-"specified, the name localhost.localdomain is attributed by default. The "
-"Hostname can also be provided by the DHCP server with the option "
-"<emphasis>Assign host name from DHCP server</emphasis>"
+"declared by the DHCP server or are manually specified, as explained below. "
+"In the last case, IP address of DNS servers has to be set. The HOSTNAME of "
+"the computer can be specified here.  If no HOSTNAME is specified, the name "
+"localhost.localdomain is attributed by default. The Hostname can also be "
+"provided by the DHCP server with the option <emphasis>Assign host name from "
+"DHCP server</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><itemizedlist><listitem><para>
@@ -2006,17 +1982,17 @@ msgstr ""
 #: en/drakconnect.xml:625
 msgid ""
 "For a residential network, the IP address always looks like "
-"<emphasis>192.168.x.x</emphasis>, Netmask is "
-"<emphasis>255.255.255.0</emphasis>, and the Gateway and DNS servers are "
-"available from your providers website."
+"<emphasis>192.168.x.x</emphasis>, Netmask is <emphasis>255.255.255.0</"
+"emphasis>, and the Gateway and DNS servers are available from your providers "
+"website."
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/drakconnect.xml:630
 msgid ""
-"In advanced settings, you can specified a <emphasis>Search "
-"domain</emphasis>. It must seem to your hostname without the first name, "
-"before the period."
+"In advanced settings, you can specified a <emphasis>Search domain</"
+"emphasis>. It must seem to your hostname without the first name, before the "
+"period."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -2089,9 +2065,9 @@ msgstr ""
 #: en/drakconnect.xml:729
 msgid ""
 "A list of providers is proposed, classified by countries. Select your "
-"provider. If it is not listed, select the option "
-"<guilabel>Unlisted</guilabel> and then enter the options your provider "
-"gave. Then it is asked for Dialup options:"
+"provider. If it is not listed, select the option <guilabel>Unlisted</"
+"guilabel> and then enter the options your provider gave. Then it is asked "
+"for Dialup options:"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><itemizedlist><listitem><para>
@@ -2238,8 +2214,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakconsole.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakconsole</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakconsole</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2268,9 +2244,9 @@ msgstr ""
 #. type: Content of: <section><warning><para><footnote><para>
 #: en/drakdisk.xml:21
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakdisk</emphasis> or <emphasis "
-"role=\"bold\">diskdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
+"as root."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -2279,8 +2255,8 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
 "partition or even to erasing the entire hard disk. For that reason, you'll "
-"see the screen above on top of the tool screen. Click on "
-"<emphasis>Exit</emphasis> if you're not sure you want to continue."
+"see the screen above on top of the tool screen. Click on <emphasis>Exit</"
+"emphasis> if you're not sure you want to continue."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2301,10 +2277,9 @@ msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
 "resizing them or changing the filesystem, formatting or viewing what is in a "
-"partition: it is all possible. The <emphasis><guibutton>Clear "
-"all</guibutton></emphasis> button at the bottom is to erase the complete "
-"disk, the other buttons become visible on the right after you click on a "
-"partition."
+"partition: it is all possible. The <emphasis><guibutton>Clear all</"
+"guibutton></emphasis> button at the bottom is to erase the complete disk, "
+"the other buttons become visible on the right after you click on a partition."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2370,8 +2345,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakedm.xml:17
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakedm</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakedm</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2385,9 +2360,9 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakedm.xml:24
 msgid ""
-"Most users will only notice that the provided login screens look "
-"different. However, there are differences in supported features, too. LXDM "
-"is a lightweight display manager, KDM and GDM have more extras."
+"Most users will only notice that the provided login screens look different. "
+"However, there are differences in supported features, too. LXDM is a "
+"lightweight display manager, KDM and GDM have more extras."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2408,8 +2383,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakfirewall.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakfirewall</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakfirewall</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2537,8 +2512,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakfont.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakfont</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakfont</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2612,10 +2587,10 @@ msgstr ""
 msgid ""
 "Allows you to add fonts from a third party (CD, internet, ...). The "
 "supported formats are ttf, pfa, pfb, pcf, pfm and gsf. Click on the "
-"<emphasis role=\"bold\">Import</emphasis> button and then on <emphasis "
-"role=\"bold\">Add</emphasis>, a file manager pops up where you can select "
-"the fonts to install, click on <emphasis role=\"bold\">Install</emphasis> "
-"when done. They are installed in the folder /usr/share/fonts."
+"<emphasis role=\"bold\">Import</emphasis> button and then on <emphasis role="
+"\"bold\">Add</emphasis>, a file manager pops up where you can select the "
+"fonts to install, click on <emphasis role=\"bold\">Install</emphasis> when "
+"done. They are installed in the folder /usr/share/fonts."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2643,21 +2618,21 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakguard.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakguard</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakguard</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakguard.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
-"Control Center, under the Security tab, labelled <guilabel>Parental "
-"Control</guilabel>. If you don't see this label, you have to install the "
-"drakguard package (not installed by default)."
+"Control Center, under the Security tab, labelled <guilabel>Parental Control</"
+"guilabel>. If you don't see this label, you have to install the drakguard "
+"package (not installed by default)."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakguard.xml:21
+#: en/drakguard.xml:21 en/msecgui.xml:19
 msgid "Presentation"
 msgstr ""
 
@@ -2686,10 +2661,10 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/drakguard.xml:40
 msgid ""
-"It restricts access to websites, both manually defined through "
-"blacklists/whitelists, but also dynamically based on the content of the "
-"website. To achieve this Drakguard uses the leading opensource parental "
-"control blocker DansGuardian."
+"It restricts access to websites, both manually defined through blacklists/"
+"whitelists, but also dynamically based on the content of the website. To "
+"achieve this Drakguard uses the leading opensource parental control blocker "
+"DansGuardian."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -2831,8 +2806,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakgw.xml:48
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakgw</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakgw</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -2942,8 +2917,7 @@ msgstr ""
 #: en/drakgw.xml:125
 msgid ""
 "If you want to stop sharing the connection on the Mageia computer, launch "
-"the tool. It will offer to reconfigure the connection or to stop the "
-"sharing."
+"the tool. It will offer to reconfigure the connection or to stop the sharing."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2964,15 +2938,15 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakhosts.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakhosts</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakhosts</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakhosts.xml:14
 msgid ""
-"If some systems on your network grant you services, and have fixed "
-"IP-addresses, this tool<placeholder type=\"footnote\" id=\"0\"/> allows to "
+"If some systems on your network grant you services, and have fixed IP-"
+"addresses, this tool<placeholder type=\"footnote\" id=\"0\"/> allows to "
 "specify a name to access them more easily. Then you can use that name "
 "instead of the IP-address."
 msgstr ""
@@ -3018,19 +2992,22 @@ msgid "drakinvictus.png"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakinvictus.xml:12 en/draknetcenter.xml:187 en/draknetprofile.xml:12 en/drakups.xml:12 en/drakwizard_apache2.xml:12 en/drakwizard_bind.xml:12 en/drakwizard_dhcp.xml:12 en/drakwizard_proftpd.xml:12 en/drakwizard_squid.xml:12 en/drakwizard_sshd.xml:12 en/drakxservices.xml:12 en/msecgui.xml:12
+#: en/drakinvictus.xml:12 en/draknetcenter.xml:187 en/draknetprofile.xml:12
+#: en/drakups.xml:12 en/drakwizard_apache2.xml:12 en/drakwizard_bind.xml:12
+#: en/drakwizard_dhcp.xml:12 en/drakwizard_proftpd.xml:12
+#: en/drakwizard_squid.xml:12 en/drakwizard_sshd.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."
+"can write this help, please contact <link ns2:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\"> the Doc team.</link> Thanking you in advance."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/drakinvictus.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakinvictus</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakinvictus</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3051,8 +3028,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/draknetcenter.xml:22
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknetcenter</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknetcenter</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -3102,10 +3079,10 @@ msgid ""
 "first one is wired and connected, recognizable by this icon <placeholder "
 "type=\"inlinemediaobject\" id=\"0\"/> (this one is not connected<placeholder "
 "type=\"inlinemediaobject\" id=\"1\"/> ) and the second section shows "
-"wireless networks, not connected recognizable by this icon <placeholder "
-"type=\"inlinemediaobject\" id=\"2\"/> and this one <placeholder "
-"type=\"inlinemediaobject\" id=\"3\"/>if connected. For the other network "
-"types, the colour code is always the same, green if connected and red if not "
+"wireless networks, not connected recognizable by this icon <placeholder type="
+"\"inlinemediaobject\" id=\"2\"/> and this one <placeholder type="
+"\"inlinemediaobject\" id=\"3\"/>if connected. For the other network types, "
+"the colour code is always the same, green if connected and red if not "
 "connected."
 msgstr ""
 
@@ -3113,14 +3090,14 @@ msgstr ""
 #: en/draknetcenter.xml:62
 msgid ""
 "In the wireless part of the screen, you can also see all the detected "
-"networks, with the <guilabel>SSID</guilabel>, the <guilabel>Signal "
-"strengh</guilabel>, if they are encrypted (in red) or not (in green), and "
-"the <guilabel>Operating mode</guilabel>. Click on the chosen one and then "
-"either on <guibutton>Monitor</guibutton>, <guibutton>Configure</guibutton> "
-"or <guibutton>Connect</guibutton>. It is possible here to go from a network "
-"to another one. If a private network is selected, the Network Settings "
-"window (see below) will open and ask you for extra settings ( an encryption "
-"key in particular)."
+"networks, with the <guilabel>SSID</guilabel>, the <guilabel>Signal strengh</"
+"guilabel>, if they are encrypted (in red) or not (in green), and the "
+"<guilabel>Operating mode</guilabel>. Click on the chosen one and then either "
+"on <guibutton>Monitor</guibutton>, <guibutton>Configure</guibutton> or "
+"<guibutton>Connect</guibutton>. It is possible here to go from a network to "
+"another one. If a private network is selected, the Network Settings window "
+"(see below) will open and ask you for extra settings ( an encryption key in "
+"particular)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3163,8 +3140,8 @@ msgstr ""
 #. type: Content of: <section><section><note><para>
 #: en/draknetcenter.xml:102
 msgid ""
-"At the bottom of the window is a title <guilabel>Traffic "
-"accounting</guilabel>, we will look at that in the next section."
+"At the bottom of the window is a title <guilabel>Traffic accounting</"
+"guilabel>, we will look at that in the next section."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -3185,8 +3162,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:118
 msgid ""
-"It is possible to change all the settings given during network "
-"creation. Most of the time, checking <guibutton>Automatic IP</guibutton> "
+"It is possible to change all the settings given during network creation. "
+"Most of the time, checking <guibutton>Automatic IP</guibutton> "
 "<guibutton>(BOOTP/DHCP)</guibutton> will do, but in case of problems, manual "
 "configuration may give better results."
 msgstr ""
@@ -3212,8 +3189,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/draknetcenter.xml:133
 msgid ""
-"<emphasis role=\"bold\">Allow interface to be controlled by Network "
-"Manager:</emphasis>"
+"<emphasis role=\"bold\">Allow interface to be controlled by Network Manager:"
+"</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3320,8 +3297,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/draknetprofile.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknetprofile</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknetprofile</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3347,8 +3324,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/draknfs.xml:27
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draknfs</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draknfs</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3475,9 +3452,8 @@ msgstr ""
 #. type: Content of: <section><section><section><para>
 #: en/draknfs.xml:103
 msgid ""
-"<emphasis>allow real remote root access</emphasis>: turn off root "
-"squashing. This option is mainly useful for diskless clients "
-"(no_root_squash)."
+"<emphasis>allow real remote root access</emphasis>: turn off root squashing. "
+"This option is mainly useful for diskless clients (no_root_squash)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
@@ -3578,8 +3554,7 @@ msgstr ""
 #. 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."
+"The configuration displayed is reloaded from the current configuration files."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3600,8 +3575,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/drakproxy.xml:24
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakproxy</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakproxy</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -3649,11 +3624,6 @@ msgid ""
 "below)."
 msgstr ""
 
-#. type: Content of: <section><para><note>
-#: en/drakrpm-edit-media.xml:25 en/MageiaUpdate.xml:17 en/MageiaUpdate.xml:32 en/XFdrake.xml:36 en/XFdrake.xml:75 en/XFdrake.xml:89
-msgid "<note>"
-msgstr ""
-
 #. type: Content of: <section><para><note><para>
 #: en/drakrpm-edit-media.xml:26
 msgid ""
@@ -3664,16 +3634,11 @@ msgid ""
 "the i586 and the x86_64 media."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakrpm-edit-media.xml:31 en/MageiaUpdate.xml:21 en/MageiaUpdate.xml:40 en/XFdrake.xml:79
-msgid "</note>"
-msgstr ""
-
 #. type: Content of: <section><para><footnote><para>
 #: en/drakrpm-edit-media.xml:35
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakrpm-edit-media</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakrpm-edit-media</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -3870,8 +3835,8 @@ msgstr ""
 msgid ""
 "Suppose you aren't happy with the actual mirror, because for example it's "
 "too slow or often unavailable, you can choose another mirror. Select all the "
-"actual media and click on <guibutton>Remove</guibutton> to take them "
-"out. Click on <guimenu>File -> Add a specific media mirror</guimenu>, choose "
+"actual media and click on <guibutton>Remove</guibutton> to take them out. "
+"Click on <guimenu>File -> Add a specific media mirror</guimenu>, choose "
 "between update only or the full set (if you do not know, choose the "
 "<guibutton>Full set of sources</guibutton>) and accept the contact by "
 "clicking on <guibutton>Yes</guibutton>. This window opens:"
@@ -3923,9 +3888,9 @@ msgstr ""
 #. 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 ""
 
@@ -3939,9 +3904,9 @@ msgstr ""
 msgid ""
 "To guarantee a high level of security, digital keys are used to authenticate "
 "the media. It is possible for each medium to allow or disallow a key. In the "
-"window that appear, select a medium and then click on "
-"<guibutton>Add</guibutton> to allow a new key or to select a key and click "
-"on <guibutton>Remove</guibutton> to disallow that key."
+"window that appear, select a medium and then click on <guibutton>Add</"
+"guibutton> to allow a new key or to select a key and click on "
+"<guibutton>Remove</guibutton> to disallow that key."
 msgstr ""
 
 #. type: Content of: <section><section><para><warning><para>
@@ -4011,8 +3976,8 @@ 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."
+"You can start this tool from the command line, by typing<emphasis role=\"bold"
+"\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -4117,8 +4082,8 @@ msgstr ""
 #: 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>."
+"configuration. When accepted, the configuration will be written in <code>/"
+"etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
@@ -4172,10 +4137,10 @@ msgstr ""
 #. 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."
+"A new entry is thus added. It can be modified with the <guibutton>Modify</"
+"guibutton> button. Options can be edited, such as whether the directory is "
+"visible to the public, writable or browseable.  The share name can not be "
+"modified."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
@@ -4229,7 +4194,10 @@ 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:42 en/rpmdrake.xml:147 en/rpmdrake.xml:157
+#: en/rpmdrake.xml:167 en/rpmdrake.xml:177 en/rpmdrake.xml:187
+#: en/rpmdrake.xml:222
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
@@ -4269,8 +4237,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/draksec.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksec</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksec</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4335,16 +4303,16 @@ msgstr ""
 #. 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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksnapshot-config </emphasis> as root."
 msgstr ""
 
 #. 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."
+"<guilabel>System</guilabel> tab, in the <guilabel>Administration tools</"
+"guilabel> section."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4359,9 +4327,9 @@ msgstr ""
 #: 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>."
+"<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 ""
 
 #. type: Content of: <section><para>
@@ -4371,11 +4339,10 @@ msgid ""
 "<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."
+"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 ""
 
 #. type: Content of: <section><para>
@@ -4383,8 +4350,8 @@ msgstr ""
 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>."
+"USB-key or external HD can be found in <emphasis role=\"bold\">/run/media/"
+"your_user_name/</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4410,8 +4377,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/draksound.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksound</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">draksound</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4433,8 +4400,7 @@ msgstr ""
 #: en/draksound.xml:23
 msgid ""
 "The drop down list called <guilabel>Driver</guilabel> allows you to select a "
-"driver from all the ones available on the computer that match the sound "
-"card."
+"driver from all the ones available on the computer that match the sound card."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -4513,8 +4479,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakups.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakups</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakups</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4535,8 +4501,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/drakvpn.xml:19
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakvpn</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakvpn</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -4649,8 +4615,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakwizard_apache2.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard apache2</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard apache2</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4671,8 +4637,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakwizard_bind.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard bind</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard bind</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4693,8 +4659,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakwizard_dhcp.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard dhcp</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard dhcp</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4715,8 +4681,8 @@ msgstr ""
 #. 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."
+"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>
@@ -4794,8 +4760,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakwizard_proftpd.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard proftpd</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard proftpd</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4816,8 +4782,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakwizard_squid.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard squid</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard squid</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4838,8 +4804,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakwizard_sshd.xml:16
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakwizard sshd</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakwizard sshd</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4860,8 +4826,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/drakxservices.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakxservices</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakxservices</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4882,8 +4848,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/harddrake2.xml:23
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">harddrake2</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">harddrake2</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4892,8 +4858,8 @@ msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> gives a general view of "
 "the hardware of your computer. When the tool is launched, it executes a job "
 "to look for every element of the hardware. For that, it uses the command "
-"<code>ldetect </code>which refers to a list of hardware in "
-"<code>ldetect-lst</code> package."
+"<code>ldetect </code>which refers to a list of hardware in <code>ldetect-"
+"lst</code> package."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -4992,17 +4958,17 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/keyboarddrake.xml:20
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">keyboarddrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">keyboarddrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/keyboarddrake.xml:19
 msgid ""
 "The keyboarddrake tool<placeholder type=\"footnote\" id=\"0\"/> helps you "
-"configure the basic layout for the keyboard that you wish to use on "
-"Mageia. It affects the keyboard layout for all users on the system. It can "
-"be found in the Hardware section of the Mageia Control Center (MCC) labelled "
+"configure the basic layout for the keyboard that you wish to use on Mageia. "
+"It affects the keyboard layout for all users on the system. It can be found "
+"in the Hardware section of the Mageia Control Center (MCC) labelled "
 "\"Configure mouse and keyboard\"."
 msgstr ""
 
@@ -5049,8 +5015,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/localedrake.xml:24
 msgid ""
-"You can also start this tool from the command line, by typing <emphasis "
-"role=\"bold\">localedrake</emphasis> as root."
+"You can also start this tool from the command line, by typing <emphasis role="
+"\"bold\">localedrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -5130,16 +5096,16 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/logdrake.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">logdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">logdrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/logdrake.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found in the Mageia "
-"Control Center System tab, labelled \"<guilabel>View and search system "
-"logs</guilabel>\"."
+"Control Center System tab, labelled \"<guilabel>View and search system logs</"
+"guilabel>\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -5150,18 +5116,18 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:24
 msgid ""
-"First, enter the key string you want to look for in the <emphasis "
-"role=\"bold\">Matching</emphasis> field and/or the key string you want to "
-"<emphasis>do not</emphasis> wish to see amongst the answers in the field "
-"<emphasis role=\"bold\">but not matching</emphasis>. Then select the file(s)  "
-"to search in the <guilabel>Choose file</guilabel> field. Optionally, it is "
-"possible to limit the search to only one day. Select it in the <emphasis "
-"role=\"bold\">Calendar</emphasis>, using the little arrows on each side of "
-"the month and year, and check \"<guibutton>Show only for the selected "
-"day</guibutton>\". At last, click on the <guibutton>search</guibutton> "
-"button to see the results in the window called <guilabel>Content of the "
-"file</guilabel>. It is possible to save the results in the .txt format by "
-"clicking on the <emphasis role=\"bold\">Save</emphasis> button."
+"First, enter the key string you want to look for in the <emphasis role=\"bold"
+"\">Matching</emphasis> field and/or the key string you want to <emphasis>do "
+"not</emphasis> wish to see amongst the answers in the field <emphasis role="
+"\"bold\">but not matching</emphasis>. Then select the file(s)  to search in "
+"the <guilabel>Choose file</guilabel> field. Optionally, it is possible to "
+"limit the search to only one day. Select it in the <emphasis role=\"bold"
+"\">Calendar</emphasis>, using the little arrows on each side of the month "
+"and year, and check \"<guibutton>Show only for the selected day</guibutton>"
+"\". At last, click on the <guibutton>search</guibutton> button to see the "
+"results in the window called <guilabel>Content of the file</guilabel>. It is "
+"possible to save the results in the .txt format by clicking on the <emphasis "
+"role=\"bold\">Save</emphasis> button."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
@@ -5188,11 +5154,11 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:49
 msgid ""
-"To configure this tool, click on the <emphasis role=\"bold\">Mail "
-"Alert</emphasis> button and then, in the next screen, on the<guibutton> "
-"Configure the mail alert system</guibutton> drop down button. Here, all the "
-"running services are displayed and you can choose which ones you want to "
-"look watch. (See screenshot above)."
+"To configure this tool, click on the <emphasis role=\"bold\">Mail Alert</"
+"emphasis> button and then, in the next screen, on the<guibutton> Configure "
+"the mail alert system</guibutton> drop down button. Here, all the running "
+"services are displayed and you can choose which ones you want to look watch. "
+"(See screenshot above)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -5276,8 +5242,8 @@ msgstr ""
 #. 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>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">lsnetdrake</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -5291,9 +5257,9 @@ msgstr ""
 #: 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."
+"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 ""
 
 #. type: Content of: <section><info><title>
@@ -5309,8 +5275,8 @@ msgstr ""
 #. 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>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">lspcidrake</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -5409,25 +5375,25 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/MageiaUpdate.xml:14
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">MageiaUpdate</emphasis> or <emphasis "
-"role=\"bold\">drakrpm-update</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">MageiaUpdate</emphasis> or <emphasis role=\"bold\">drakrpm-update</"
+"emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
-"Control Center under the tab <emphasis role=\"bold\">Software "
-"management.</emphasis>"
+"Control Center under the tab <emphasis role=\"bold\">Software management.</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para><note><para>
 #: en/MageiaUpdate.xml:18
 msgid ""
-"To work, MageiaUpdate needs the repositories to be configured with "
-"rpmdrake-edit-media with some media checked as updates. If they are not, you "
-"are prompted to do so."
+"To work, MageiaUpdate needs the repositories to be configured with rpmdrake-"
+"edit-media with some media checked as updates. If they are not, you are "
+"prompted to do so."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -5456,8 +5422,8 @@ msgstr ""
 #: en/MageiaUpdate.xml:33
 msgid ""
 "When updates are available, an applet in the system tray warns you by "
-"displaying this red icon <placeholder type=\"inlinemediaobject\" id=\"0\"/> "
-". Just click and enter the user password to update the system alike."
+"displaying this red icon <placeholder type=\"inlinemediaobject\" id=\"0\"/"
+"> . Just click and enter the user password to update the system alike."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -5522,8 +5488,8 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:22
 msgid ""
-"<xref linkend=\"harddrake2\"/><emphasis> = Browse and configure "
-"hardware</emphasis>"
+"<xref linkend=\"harddrake2\"/><emphasis> = Browse and configure hardware</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
@@ -5539,8 +5505,8 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-hardware.xml:36
 msgid ""
-"<xref linkend=\"drak3d\"/><emphasis> = Configure 3D Desktop "
-"effects</emphasis>"
+"<xref linkend=\"drak3d\"/><emphasis> = Configure 3D Desktop effects</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
@@ -5607,8 +5573,7 @@ msgstr ""
 #. 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 ""
 
 #. type: Content of: <section><para>
@@ -5977,8 +5942,8 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:58
 msgid ""
-"<xref linkend=\"userdrake\"></xref><emphasis> = Manage users on "
-"system</emphasis>"
+"<xref linkend=\"userdrake\"></xref><emphasis> = Manage users on system</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
@@ -6000,29 +5965,28 @@ msgstr "Centro Controllo Mageia"
 #: en/MCC.xml:6
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link "
-"ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">"
-"http://creativecommons.org/licenses/by-sa/3.0/</link>."
+"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:9
 msgid ""
-"This manual was produced with the help of the <link "
-"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
-"ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>."
+"This manual was produced with the help of the <link ns6:href=\"http://www."
+"calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
+"neodoc.biz\">NeoDoc</link>."
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/MCC.xml:11
 msgid ""
-"It was written by volunteers in their free time. Please contact <link "
-"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
-"Team</link>, if you would like to help improve this manual."
+"It was written by volunteers in their free time. Please contact <link ns6:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
+"link>, if you would like to help improve this manual."
 msgstr ""
-"E' stato scritto da volontari nel loro tempo libero. Contatta <link "
-"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Team "
-"Documentazione</link>, se vuoi aiutare a migliorare questo manuale."
+"E' stato scritto da volontari nel loro tempo libero. Contatta <link ns6:href="
+"\"https://wiki.mageia.org/en/Documentation_team\">Team Documentazione</"
+"link>, se vuoi aiutare a migliorare questo manuale."
 
 #. type: Content of: <section><info><title>
 #: en/mgaapplet-config.xml:3
@@ -6042,18 +6006,18 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/mgaapplet-config.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">mgaapplet-config</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">mgaapplet-config</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:14
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the Mageia "
-"Control Center under the tab <emphasis role=\"bold\">Software "
-"management</emphasis>. It is also available by a <guimenu>right click / "
-"Updates configuration</guimenu> on the red icon <placeholder "
-"type=\"inlinemediaobject\" id=\"1\"/> in the system tray."
+"Control Center under the tab <emphasis role=\"bold\">Software management</"
+"emphasis>. It is also available by a <guimenu>right click / Updates "
+"configuration</guimenu> on the red icon <placeholder type=\"inlinemediaobject"
+"\" id=\"1\"/> in the system tray."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -6061,8 +6025,7 @@ msgstr ""
 msgid ""
 "The first slider allows you to change how frequently Mageia will check for "
 "updates and the second the delay after booting before the first check.  The "
-"check box gives you the option to be warned when a new Mageia release is "
-"out."
+"check box gives you the option to be warned when a new Mageia release is out."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -6083,8 +6046,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/mousedrake.xml:15
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">mousedrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">mousedrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -6116,7 +6079,7 @@ msgid "MSEC: System Security and Audit"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/msecgui.xml:3
+#: en/msecgui.xml:5
 msgid "msecgui"
 msgstr ""
 
@@ -6665,11 +6628,11 @@ msgstr "Introduzione ad 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."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">rpmdrake</emphasis> as root."
 msgstr ""
-"Puoi avviare questo strumento dalla riga di comando digitando <emphasis "
-"role=\"bold\">rpmdrake</emphasis> come root."
+"Puoi avviare questo strumento dalla riga di comando digitando <emphasis role="
+"\"bold\">rpmdrake</emphasis> come root."
 
 #. type: Content of: <section><section><para>
 #: en/rpmdrake.xml:20
@@ -6690,12 +6653,11 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/rpmdrake.xml:35
 msgid ""
-"To work, rpmdrake needs the repositories to be configured with <xref "
-"linkend=\"drakrpm-edit-media\"/> ."
+"To work, rpmdrake needs the repositories to be configured with <xref linkend="
+"\"drakrpm-edit-media\"/> ."
 msgstr ""
 "Per funzionare, rpmdrake necessita della configurazione dei repositories con "
-"<xref "
-"linkend=\"drakrpm-edit-media\"/> ."
+"<xref linkend=\"drakrpm-edit-media\"/> ."
 
 #. type: Content of: <section><section><title>
 #: en/rpmdrake.xml:39
@@ -6722,12 +6684,11 @@ msgid ""
 "updates only or backported packages from newer versions of Mageia."
 msgstr ""
 "Questo filtro ti consente di visualizzare solo alcuni tipi di pacchetto. La "
-"prima volta "
-"che avvi il gestore questo mostrerà solamente le applicazioni con una "
-"interfaccia "
-"grafica. Puoi visualizzare sia tutti i pacchetti che tutte le loro "
-"dipendenze e librerie o solo gruppi di pacchetti come le sole applicazioni, "
-"i soli aggiornamenti o pacchetti backported da versioni più recenti di Mageia."
+"prima volta che avvi il gestore questo mostrerà solamente le applicazioni "
+"con una interfaccia grafica. Puoi visualizzare sia tutti i pacchetti che "
+"tutte le loro dipendenze e librerie o solo gruppi di pacchetti come le sole "
+"applicazioni, i soli aggiornamenti o pacchetti backported da versioni più "
+"recenti di Mageia."
 
 #. type: Content of: <section><section><orderedlist><listitem><warning><para>
 #: en/rpmdrake.xml:61
@@ -6741,8 +6702,8 @@ msgstr ""
 #. type: Content of: <section><section><orderedlist><listitem><para>
 #: en/rpmdrake.xml:70
 msgid ""
-"<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> "
-"</firstterm>"
+"<firstterm> <emphasis role=\"bold\">Package state filter:</emphasis> </"
+"firstterm>"
 msgstr ""
 
 #. type: Content of: <section><section><orderedlist><listitem><para>
@@ -6830,8 +6791,8 @@ msgid ""
 "list of packages fulfilling your query and, don't forget, the chosen medium "
 "is shown with different status markers according to whether each package is "
 "installed/not installed/an update... To change this status, just check or "
-"uncheck the box before the package name and click on "
-"<guibutton>Apply</guibutton>."
+"uncheck the box before the package name and click on <guibutton>Apply</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><para><table><tgroup><thead><row><entry>
@@ -6969,9 +6930,9 @@ msgstr ""
 #: en/scannerdrake.xml:21
 msgid ""
 "This tool <placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
-"a single scanner device or a multifunction device which includes "
-"scanning. It also allows you to share local devices connected to this "
-"computer with a remote computer or to access remote scanners."
+"a single scanner device or a multifunction device which includes scanning. "
+"It also allows you to share local devices connected to this computer with a "
+"remote computer or to access remote scanners."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -6995,9 +6956,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:38
 msgid ""
-"Choose <emphasis>Yes</emphasis> to continue. It will install "
-"<code>scanner-gui</code> and <code>task-scanning</code> if they are not yet "
-"installed."
+"Choose <emphasis>Yes</emphasis> to continue. It will install <code>scanner-"
+"gui</code> and <code>task-scanning</code> if they are not yet installed."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
@@ -7017,8 +6977,8 @@ msgstr ""
 #: en/scannerdrake.xml:55
 msgid ""
 "In that case, you might now want to want to configure the <emphasis>Scanner "
-"sharing</emphasis> option. You can read about it in the <xref "
-"linkend=\"scannersharing\"/>."
+"sharing</emphasis> option. You can read about it in the <xref linkend="
+"\"scannersharing\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7045,17 +7005,17 @@ msgstr ""
 #. type: Content of: <section><section><note><para>
 #: en/scannerdrake.xml:76
 msgid ""
-"If you can't find your scanner in the list, then click "
-"<emphasis>Cancel</emphasis>"
+"If you can't find your scanner in the list, then click <emphasis>Cancel</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/scannerdrake.xml:79
 msgid ""
-"Please check whether your scanner is supported on the <link "
-"xlink:href=\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: "
-"Supported Devices</link> page and ask for help in the <link "
-"xlink:href=\"http://forums.mageia.org/en/\">forums</link>."
+"Please check whether your scanner is supported on the <link xlink:href="
+"\"http://www.sane-project.org/lists/sane-mfgs-cvs.html\">SANE: Supported "
+"Devices</link> page and ask for help in the <link xlink:href=\"http://forums."
+"mageia.org/en/\">forums</link>."
 msgstr ""
 
 #. type: Content of: <section><section><figure><info><title>
@@ -7071,16 +7031,16 @@ msgstr ""
 #. type: Content of: <section><section><figure>
 #: en/scannerdrake.xml:86
 msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" "
-"id=\"1\"/>"
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:97
 msgid ""
-"You can leave this setting to <emphasis>Auto-detect available "
-"ports</emphasis> unless your scanner's interface is a parallel port. In that "
-"case, select <emphasis>/dev/parport0</emphasis> if you have only one."
+"You can leave this setting to <emphasis>Auto-detect available ports</"
+"emphasis> unless your scanner's interface is a parallel port. In that case, "
+"select <emphasis>/dev/parport0</emphasis> if you have only one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7093,8 +7053,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:104
 msgid ""
-"If you don't get that screen, then please read the <xref "
-"linkend=\"scannerextrasteps\"/>."
+"If you don't get that screen, then please read the <xref linkend="
+"\"scannerextrasteps\"/>."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
@@ -7205,8 +7165,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:193
 msgid ""
-"It will also configure <emphasis>saned</emphasis> and "
-"<emphasis>xinetd</emphasis> to be started on boot."
+"It will also configure <emphasis>saned</emphasis> and <emphasis>xinetd</"
+"emphasis> to be started on boot."
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -7224,8 +7184,8 @@ msgstr ""
 msgid ""
 "Most HP scanners are managed from <emphasis>HP Device Manager</emphasis> "
 "(hplip) which also manages printers. In this case, this tool does not allow "
-"you to configure it and invites you to use <emphasis>HP Device "
-"Manager</emphasis>."
+"you to configure it and invites you to use <emphasis>HP Device Manager</"
+"emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -7236,11 +7196,9 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:216
 msgid ""
-"Drivers are available from <link "
-"xlink:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">"
-"this "
-"page</link>. When indicated, you must install the "
-"<emphasis>iscan-data</emphasis> package first, then "
+"Drivers are available from <link xlink:href=\"http://download.ebz.epson.net/"
+"dsc/search/01/search/?OSC=LX\">this page</link>. When indicated, you must "
+"install the <emphasis>iscan-data</emphasis> package first, then "
 "<emphasis>iscan</emphasis> (in this order). It is possible that the "
 "<emphasis>iscan</emphasis> package will generate a warning about a conflict "
 "with <emphasis>sane</emphasis>. Users have reported that this warning can be "
@@ -7280,16 +7238,16 @@ msgstr ""
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:246
 msgid ""
-"Also, you may get a screen telling you to adjust the "
-"<emphasis>/etc/sane.d/\"name_of_your_SANE_backend\".conf file.</emphasis>"
+"Also, you may get a screen telling you to adjust the <emphasis>/etc/sane.d/"
+"\"name_of_your_SANE_backend\".conf file.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/scannerdrake.xml:250
 msgid ""
 "Read those or other instructions you get carefully and if you don't know "
-"what to do, feel free to ask for help in the <link "
-"xlink:href=\"http://forums.mageia.org/en/\">forums</link>."
+"what to do, feel free to ask for help in the <link xlink:href=\"http://"
+"forums.mageia.org/en/\">forums</link>."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><title>
@@ -7305,8 +7263,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/software-management.xml:14
 msgid ""
-"In this screen you can choose between several tools for software "
-"management. Click on a link below to learn more."
+"In this screen you can choose between several tools for software management. "
+"Click on a link below to learn more."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
@@ -7317,8 +7275,8 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/software-management.xml:20
 msgid ""
-"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Update your "
-"system</emphasis>"
+"<xref linkend=\"MageiaUpdate\"></xref><emphasis> = Update your system</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
@@ -7369,9 +7327,8 @@ msgstr ""
 #. type: Content of: <section><section><para><footnote><para>
 #: en/system-config-printer.xml:37
 msgid ""
-"You can start this tool from the command line, by typing "
-"<emphasis>system-config-printer</emphasis>. The root password will be asked "
-"for."
+"You can start this tool from the command line, by typing <emphasis>system-"
+"config-printer</emphasis>. The root password will be asked for."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7379,8 +7336,8 @@ msgstr ""
 msgid ""
 "Printer installation is carried out in the <guilabel>Hardware</guilabel> "
 "section of the Mageia Control Centre. Select the <guilabel>Configure "
-"printing and scanning</guilabel> tool<placeholder type=\"footnote\" "
-"id=\"0\"/>."
+"printing and scanning</guilabel> tool<placeholder type=\"footnote\" id=\"0\"/"
+">."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7424,8 +7381,8 @@ msgstr ""
 #: en/system-config-printer.xml:63
 msgid ""
 "This usually refers to USB printers. The utility automatically finds the "
-"name of the printer and displays it. Select the printer and then click "
-"\"Next\". If there is a known driver associated for the printer, it will be "
+"name of the printer and displays it. Select the printer and then click \"Next"
+"\". If there is a known driver associated for the printer, it will be "
 "automatically installed. If there is more than one driver or no known "
 "drivers, a window will ask you to select or furnish one, as explained in the "
 "next paragraph. Continue with <xref linkend=\"terminate\"/>"
@@ -7562,11 +7519,11 @@ msgid ""
 "JetDirect. It allows access to a printer directly connected to the network "
 "via an Ethernet port. You must know the IP-address at which the printer is "
 "known on the network. This technique is also used inside some ADSL-routers "
-"which contain an USB port to connect the printer. In this case, the "
-"IP-address is that of the router. Note that the tool \"Hp Device manager\" "
-"can manage dynamically configured IP-adress, setting an URI like "
-"<emphasis>hp:/net/&lt;name-of-the-printer></emphasis> . In this case, fixed "
-"IP-adress is not required."
+"which contain an USB port to connect the printer. In this case, the IP-"
+"address is that of the router. Note that the tool \"Hp Device manager\" can "
+"manage dynamically configured IP-adress, setting an URI like <emphasis>hp:/"
+"net/&lt;name-of-the-printer></emphasis> . In this case, fixed IP-adress is "
+"not required."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7673,9 +7630,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:251
 msgid ""
-"Additional information can be found in the <link "
-"ns2:href=\"http://www.cups.org/documentation.php/doc-1.5/network.html\">CUPS "
-"documentation.</link>"
+"Additional information can be found in the <link ns2:href=\"http://www.cups."
+"org/documentation.php/doc-1.5/network.html\">CUPS documentation.</link>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -7688,11 +7644,10 @@ msgstr ""
 msgid ""
 "You can access the properties of the device. The menu allows access to "
 "parameters for the CUPS server. By default a CUPS server is launched on your "
-"system, but you can specify a different one with the "
-"<guimenu>Server</guimenu> | <guimenuitem>Connect...</guimenuitem> menu, "
-"another window which gives access to the tuning of other specific parameters "
-"of the server, following <guimenu>Server</guimenu> | "
-"<guimenuitem>Settings.</guimenuitem>"
+"system, but you can specify a different one with the <guimenu>Server</"
+"guimenu> | <guimenuitem>Connect...</guimenuitem> menu, another window which "
+"gives access to the tuning of other specific parameters of the server, "
+"following <guimenu>Server</guimenu> | <guimenuitem>Settings.</guimenuitem>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
@@ -7710,23 +7665,23 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:273
 msgid ""
-"You can also access to a tool to diagnose problems using the "
-"<guimenu>Help</guimenu> | <guilabel>Troubleshoot</guilabel> menu."
+"You can also access to a tool to diagnose problems using the <guimenu>Help</"
+"guimenu> | <guilabel>Troubleshoot</guilabel> menu."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:280
 msgid ""
 "It is possible that some drivers for specific printers are not available in "
-"Mageia or are not functional. In this case, have a look at the <link "
-"ns2:href=\"http://openprinting.org/printers/\">openprinting</link> site to "
-"check if a driver for your device is available. If yes, check if the package "
-"is already present in Mageia and in this case install it manually. Then, "
-"redo the installation process to configure the printer. In all cases, report "
-"the problem in bugzilla or on the forum if you are comfortable with this "
-"tool and furnish the model and driver information and whether the printer "
-"works or not after installation. Here are some sources to find other "
-"up-to-date drivers or for more recent devices."
+"Mageia or are not functional. In this case, have a look at the <link ns2:"
+"href=\"http://openprinting.org/printers/\">openprinting</link> site to check "
+"if a driver for your device is available. If yes, check if the package is "
+"already present in Mageia and in this case install it manually. Then, redo "
+"the installation process to configure the printer. In all cases, report the "
+"problem in bugzilla or on the forum if you are comfortable with this tool "
+"and furnish the model and driver information and whether the printer works "
+"or not after installation. Here are some sources to find other up-to-date "
+"drivers or for more recent devices."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7737,11 +7692,9 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:294
 msgid ""
-"<link "
-"ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/en/downl"
-"oad_prn.html\">This "
-"page</link> give a list of drivers provided by Brother. Search the driver "
-"for your device, download the rpm(s) and install."
+"<link ns2:href=\"http://welcome.solutions.brother.com/bsc/public_s/id/linux/"
+"en/download_prn.html\">This page</link> give a list of drivers provided by "
+"Brother. Search the driver for your device, download the rpm(s) and install."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7753,8 +7706,8 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:301
 msgid ""
-"<emphasis role=\"bold\">Hewlett-Packard printers and All in one "
-"devices</emphasis>"
+"<emphasis role=\"bold\">Hewlett-Packard printers and All in one devices</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7762,13 +7715,11 @@ msgstr ""
 msgid ""
 "These devices use the hplip tool. It is installed automatically after the "
 "detection or the selection of the printer. You can find other information "
-"<link "
-"ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">here</link>.  "
-"The tool \"HP Device Manager\" is available in the "
-"<guilabel>System</guilabel> menu. Also view <link "
-"ns2:href=\"http://hplipopensource.com/hplip-web/install/manual/hp_setup.html\""
-">configuration</link> "
-"for the management of the printer."
+"<link ns2:href=\"http://hplipopensource.com/hplip-web/index.html\">here</"
+"link>.  The tool \"HP Device Manager\" is available in the <guilabel>System</"
+"guilabel> menu. Also view <link ns2:href=\"http://hplipopensource.com/hplip-"
+"web/install/manual/hp_setup.html\">configuration</link> for the management "
+"of the printer."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7791,9 +7742,9 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:321
 msgid ""
-"For specific Samsung and Xerox colour printers, <link "
-"ns2:href=\"http://foo2qpdl.rkkda.com/\">this site provides drivers</link> "
-"for the QPDL protocol."
+"For specific Samsung and Xerox colour printers, <link ns2:href=\"http://"
+"foo2qpdl.rkkda.com/\">this site provides drivers</link> for the QPDL "
+"protocol."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7804,12 +7755,12 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/system-config-printer.xml:326
 msgid ""
-"Drivers for Epson printers are available from <link "
-"ns2:href=\"http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this "
-"search page</link>. For the scanner part, you must install the "
-"\"iscan-data\" package first, then \"iscan\" (in this order). A iscan-plugin "
-"package can also be available and is to install. Choose the "
-"<emphasis>rpm</emphasis> packages according to your architecture."
+"Drivers for Epson printers are available from <link ns2:href=\"http://"
+"download.ebz.epson.net/dsc/search/01/search/?OSC=LX\">this search page</"
+"link>. For the scanner part, you must install the \"iscan-data\" package "
+"first, then \"iscan\" (in this order). A iscan-plugin package can also be "
+"available and is to install. Choose the <emphasis>rpm</emphasis> packages "
+"according to your architecture."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -7849,8 +7800,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/transfugdrake.xml:22
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">transfugdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">transfugdrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7866,9 +7817,9 @@ msgstr ""
 msgid ""
 "The tool allows an administrator to import the user documents and settings "
 "from a <trademark class=\"registered\">Windows</trademark> 2000, <trademark "
-"class=\"registered\">Windows</trademark> XP or <trademark "
-"class=\"registered\">Windows</trademark> <trademark>Vista</trademark> "
-"installation on the same computer as the Mageia installation."
+"class=\"registered\">Windows</trademark> XP or <trademark class=\"registered"
+"\">Windows</trademark> <trademark>Vista</trademark> installation on the same "
+"computer as the Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -7911,9 +7862,9 @@ msgstr ""
 #: en/transfugdrake.xml:56
 msgid ""
 "Please take into account that due to migrate-assistant (the backend of "
-"transfugdrake) limitations <trademark "
-"class=\"registered\">Windows</trademark> user account names with special "
-"symbols can be displayed incorrectly."
+"transfugdrake) limitations <trademark class=\"registered\">Windows</"
+"trademark> user account names with special symbols can be displayed "
+"incorrectly."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -7927,18 +7878,17 @@ msgstr ""
 msgid ""
 "Some <trademark class=\"registered\">Windows</trademark> applications "
 "(especially drivers) may create user accounts for different purposes. For "
-"example, NVidia drivers in <trademark "
-"class=\"registered\">Windows</trademark>are updated using "
-"<emphasis>UpdatusUser</emphasis>. Please do not use such accounts for the "
-"import purposes."
+"example, NVidia drivers in <trademark class=\"registered\">Windows</"
+"trademark>are updated using <emphasis>UpdatusUser</emphasis>. Please do not "
+"use such accounts for the import purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:74
 msgid ""
-"When you finished with the accounts selection press "
-"<guibutton>Next</guibutton> button. The next page is used to select a method "
-"to import documents:"
+"When you finished with the accounts selection press <guibutton>Next</"
+"guibutton> button. The next page is used to select a method to import "
+"documents:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
@@ -7949,11 +7899,10 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:84
 msgid ""
-"Transfugdrake is designed to import <trademark "
-"class=\"registered\">Windows</trademark> data from <emphasis>My "
-"Documents</emphasis>, <emphasis>My Music</emphasis> and <emphasis>My "
-"Pictures</emphasis> folders. It is possible to skip import by selecting the "
-"appropriate item in this window."
+"Transfugdrake is designed to import <trademark class=\"registered\">Windows</"
+"trademark> data from <emphasis>My Documents</emphasis>, <emphasis>My Music</"
+"emphasis> and <emphasis>My Pictures</emphasis> folders. It is possible to "
+"skip import by selecting the appropriate item in this window."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -7997,8 +7946,7 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:120
 msgid ""
-"Choose the preferred option and press the <guibutton>Next</guibutton> "
-"button."
+"Choose the preferred option and press the <guibutton>Next</guibutton> button."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8031,8 +7979,8 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/userdrake.xml:23
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">userdrake</emphasis> as root."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">userdrake</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8090,11 +8038,11 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/userdrake.xml:52
 msgid ""
-"Setting a <emphasis role=\"bold\">Password</emphasis> is highly "
-"recommended. There is a little shield on the right, if it is red, the "
-"password is weak, too short or is too similar to the login name. You should "
-"use figures, lower and upper case characters, punctuation marks, etc. The "
-"shield will turn orange and then green as the password strength improves."
+"Setting a <emphasis role=\"bold\">Password</emphasis> is highly recommended. "
+"There is a little shield on the right, if it is red, the password is weak, "
+"too short or is too similar to the login name. You should use figures, lower "
+"and upper case characters, punctuation marks, etc. The shield will turn "
+"orange and then green as the password strength improves."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8235,10 +8183,10 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/userdrake.xml:128
 msgid ""
-"Select a user or a group and click on <emphasis "
-"role=\"bold\">Delete</emphasis> to remove it. For a user, a window appears "
-"to ask if home directory and mailbox must also be deleted. If a private "
-"group has been created for the user, it will be deleted as well."
+"Select a user or a group and click on <emphasis role=\"bold\">Delete</"
+"emphasis> to remove it. For a user, a window appears to ask if home "
+"directory and mailbox must also be deleted. If a private group has been "
+"created for the user, it will be deleted as well."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
@@ -8293,9 +8241,9 @@ msgstr ""
 #. type: Content of: <section><para><footnote><para>
 #: en/XFdrake.xml:17
 msgid ""
-"You can start this tool from the command line, by typing "
-"<emphasis>XFdrake</emphasis> as normal user or <emphasis>drakx11</emphasis> "
-"as root. Mind the capital letters."
+"You can start this tool from the command line, by typing <emphasis>XFdrake</"
+"emphasis> as normal user or <emphasis>drakx11</emphasis> as root. Mind the "
+"capital letters."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8303,8 +8251,8 @@ msgstr ""
 msgid ""
 "This tool is present in the Mageia Control Center under the tab <emphasis "
 "role=\"bold\">Hardware</emphasis>. Select <emphasis><guilabel>Set up the "
-"graphical server</guilabel></emphasis>.  <placeholder type=\"footnote\" "
-"id=\"0\"/>"
+"graphical server</guilabel></emphasis>.  <placeholder type=\"footnote\" id="
+"\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -8353,9 +8301,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:39
 msgid ""
-"</note>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)."
+"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 ""
 
 #. type: Content of: <section><para>
@@ -8444,9 +8391,9 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/XFdrake.xml:93
 msgid ""
-"</note>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>."
+"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 ""
 
 #. type: Content of: <section><orderedlist><title>
@@ -8457,9 +8404,9 @@ msgstr ""
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/XFdrake.xml:99
 msgid ""
-"<guilabel>Global options</guilabel>: If <emphasis>Disable "
-"Ctrl-Alt-Backspace</emphasis> is checked, it will no longer be possible to "
-"restart X server using Ctrl+Alt+Backspace keys."
+"<guilabel>Global options</guilabel>: If <emphasis>Disable Ctrl-Alt-"
+"Backspace</emphasis> is checked, it will no longer be possible to restart X "
+"server using Ctrl+Alt+Backspace keys."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
@@ -8473,9 +8420,9 @@ msgstr ""
 #: en/XFdrake.xml:107
 msgid ""
 "<guilabel>Graphical interface at startup</guilabel>: Most of the time, "
-"<emphasis>Automatically start the graphical interface (Xorg) upon "
-"booting</emphasis> is checked to make the boot switch to graphical mode, it "
-"may be unchecked for a server."
+"<emphasis>Automatically start the graphical interface (Xorg) upon booting</"
+"emphasis> is checked to make the boot switch to graphical mode, it may be "
+"unchecked for a server."
 msgstr ""
 
 #. type: Content of: <section><para>
diff --git a/docs/mcc-help/mcc-help.pot b/docs/mcc-help/mcc-help.pot
index f7dc6add..ee17da0b 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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\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"
@@ -317,11 +317,11 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
diff --git a/docs/mcc-help/nl.po b/docs/mcc-help/nl.po
index a4a335de..790c9038 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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\n"
 "PO-Revision-Date: 2014-02-10 12:52+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -407,12 +407,13 @@ msgstr "diskdrake--nfs5.png"
 # TODO: compare with software translation
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
+#, fuzzy
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 "Na het aanvaarden van de configuratie met de <guibutton>Klaar</guibutton>-"
 "knop, verschijnt er een bericht met de vraag of u de /etc/fstab aanpassingen "
@@ -779,7 +780,6 @@ msgstr ""
 "drak3d."
 
 #. 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"
@@ -903,12 +903,12 @@ msgid ""
 "you machine from booting."
 msgstr ""
 "In het eerste deel, <guilabel>Opstartlader</guilabel>, kunt u kiezen welke "
-"<guibutton>opstartlader te gebruiken</guibutton>, GRUB, GRUB2, of LILO, en met "
-"een grafisch of een tekstmenu. Het is een kwestie van smaak, er zijn geen "
-"verdere consequenties. U kunt ook het <guibutton>Opstartapparaat</guibutton> "
-"kiezen, verander dit niet als u geen expert bent. Het opstartapparaat is "
-"waar de opstarlader is geïnstalleerd, het wijzigen kan het opstarten van uw "
-"machine onmogelijk maken."
+"<guibutton>opstartlader te gebruiken</guibutton>, GRUB, GRUB2, of LILO, en "
+"met een grafisch of een tekstmenu. Het is een kwestie van smaak, er zijn "
+"geen verdere consequenties. U kunt ook het <guibutton>Opstartapparaat</"
+"guibutton> kiezen, verander dit niet als u geen expert bent. Het "
+"opstartapparaat is waar de opstarlader is geïnstalleerd, het wijzigen kan "
+"het opstarten van uw machine onmogelijk maken."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:36
@@ -919,12 +919,12 @@ msgid ""
 "systems, prompting you to make your choice, if no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
-"In het tweede deel, <guilabel>Hoofdopties</guilabel>, kunt u de <guibutton>"
-"Wachttijd voor het opstarten van standaard image</guibutton> instellen in "
-"seconden. Gedurende deze wachttijd, zal GRUB(2) of LILO de lijst met "
-"beschikbare besturingssystemen laten zien, waaruit u kunt kiezen. Als geen "
-"keuze gemaakt wordt, zal de opstartlader de standaard keuze starten zodra de "
-"wachttijd verstreken is."
+"In het tweede deel, <guilabel>Hoofdopties</guilabel>, kunt u de "
+"<guibutton>Wachttijd voor het opstarten van standaard image</guibutton> "
+"instellen in seconden. Gedurende deze wachttijd, zal GRUB(2) of LILO de "
+"lijst met beschikbare besturingssystemen laten zien, waaruit u kunt kiezen. "
+"Als geen keuze gemaakt wordt, zal de opstartlader de standaard keuze starten "
+"zodra de wachttijd verstreken is."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:43
@@ -987,8 +987,8 @@ msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
 msgstr ""
-"<guibutton>APIC inschakelen</guibutton> en <guibutton>Lokale APIC inschakelen"
-"</guibutton>."
+"<guibutton>APIC inschakelen</guibutton> en <guibutton>Lokale APIC "
+"inschakelen</guibutton>."
 
 #. type: Content of: <section><para>
 #: en/drakboot--boot.xml:69
@@ -8833,10 +8833,9 @@ msgid ""
 "to change after all, click on <guibutton>No</guibutton>, if everything is "
 "right, click on <guibutton role=\"bold\">OK</guibutton>."
 msgstr ""
-"Als de test mislukt, wacht dan rustig tot hij klaar is. Als hij "
-"slaagt, maar u toch niets wilt veranderen, klik dan op <guibutton>Nee</"
-"guibutton>. Als alles naar wens is, klik dan op <guibutton role=\"bold\">OK</"
-"guibutton>."
+"Als de test mislukt, wacht dan rustig tot hij klaar is. Als hij slaagt, maar "
+"u toch niets wilt veranderen, klik dan op <guibutton>Nee</guibutton>. Als "
+"alles naar wens is, klik dan op <guibutton role=\"bold\">OK</guibutton>."
 
 #. type: Content of: <section><orderedlist><title>
 #: en/XFdrake.xml:97
diff --git a/docs/mcc-help/ro.po b/docs/mcc-help/ro.po
index b80483e5..6ed9aae6 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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\n"
 "PO-Revision-Date: 2014-01-10 11:11+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/"
@@ -411,12 +411,13 @@ msgstr "diskdrake--nfs5.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
+#, fuzzy
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 "După ce acceptați configurația cu butonul „Gata”, un mesaj se va afișa "
 "întrebîndu-vă dacă „Doriți să salvați modificările în /etc/fstab”. Aceasta "
diff --git a/docs/mcc-help/ru.po b/docs/mcc-help/ru.po
index 98a3022f..8ebde1b3 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-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\n"
 "PO-Revision-Date: 2013-12-17 19:30+0300\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian <kde-i18n-uk@kde.org>\n"
@@ -426,12 +426,13 @@ msgstr "diskdrake--nfs5.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
+#, fuzzy
 msgid ""
-"On accepting the configuration with the Done 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."
+"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> "
 "система попросит вас ответить на вопрос относительно того, желаете ли вы "
diff --git a/docs/mcc-help/tr.po b/docs/mcc-help/tr.po
index 1d2419c3..6bdb85f5 100644
--- a/docs/mcc-help/tr.po
+++ b/docs/mcc-help/tr.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-01-30 15:31+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\n"
 "PO-Revision-Date: 2014-01-31 12:22+0000\n"
 "Last-Translator: kemalokmen <kemal@comu.edu.tr>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/mageia/language/"
@@ -414,12 +414,13 @@ msgstr "diskdrake--nfs5.png"
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
+#, fuzzy
 msgid ""
-"On accepting the configuration with the Done 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."
+"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 ""
 "Bitti düğmesi ile yapılandırma kabul edildiğinde \"/etc/fstab "
 "değişikliklerini kaydetmek istiyor musunuz?\" diye sorulur. Ağ erişilebilir "
diff --git a/docs/mcc-help/uk.po b/docs/mcc-help/uk.po
index a1685ffc..85e7524a 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-01-30 15:31+0200\n"
-"PO-Revision-Date: 2014-01-30 16:10+0200\n"
+"POT-Creation-Date: 2014-02-17 08:51+0200\n"
+"PO-Revision-Date: 2014-02-17 08:52+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -422,11 +422,11 @@ msgstr "diskdrake--nfs5.png"
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:77
 msgid ""
-"On accepting the configuration with the Done 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."
+"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> система попросить вас відповісти на питання щодо того, чи бажаєте "
@@ -7520,8 +7520,8 @@ msgid ""
 "approaches:"
 msgstr ""
 "msecgui<placeholder type=\"footnote\" id=\"0\"/> — графічний інтерфейс "
-"користувача до msec, за допомогою якого можна "
-"налаштувати захист системи у такий спосіб:"
+"користувача до msec, за допомогою якого можна налаштувати захист системи у "
+"такий спосіб:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:28
@@ -7687,11 +7687,11 @@ msgid ""
 "versions)."
 msgstr ""
 "Рівень <emphasis role=\"bold\">standard</emphasis>. Цей рівень є типовим "
-"після встановлення системи, його призначено для звичайних користувачів. Права "
-"доступу у системі буде дещо обмежено, виконуватимуться щоденні перевірки "
-"захисту для виявлення змін у системних файлах, облікових записах та "
-"вразливостей у правах доступу до каталогів (цей рівень подібний до рівнів 2 і "
-"3 у старих версіях msec)."
+"після встановлення системи, його призначено для звичайних користувачів. "
+"Права доступу у системі буде дещо обмежено, виконуватимуться щоденні "
+"перевірки захисту для виявлення змін у системних файлах, облікових записах "
+"та вразливостей у правах доступу до каталогів (цей рівень подібний до рівнів "
+"2 і 3 у старих версіях msec)."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
 #: en/msecgui.xml:131
@@ -7718,9 +7718,9 @@ msgid ""
 "the most common use cases."
 msgstr ""
 "Окрім цих рівнів, передбачено різні зорієнтовані на завдання набори "
-"налаштувань захисту, зокрема рівні <emphasis role=\"bold\">fileserver<"
-"/emphasis>, <emphasis role=\"bold\">webserver</emphasis> та <emphasis "
-"role=\"bold\">netbook</emphasis>. Якщо ви скористаєтеся цими рівнями, захист "
+"налаштувань захисту, зокрема рівні <emphasis role=\"bold\">fileserver</"
+"emphasis>, <emphasis role=\"bold\">webserver</emphasis> та <emphasis role="
+"\"bold\">netbook</emphasis>. Якщо ви скористаєтеся цими рівнями, захист "
 "системи буде попередньо налаштовано на виконання більшості типових завдань."
 
 #. type: Content of: <section><section><section><orderedlist><listitem><para>
@@ -7732,8 +7732,8 @@ msgid ""
 msgstr ""
 "Останні два рівні мають назву <emphasis role=\"bold\">audit_daily</emphasis> "
 "і <emphasis role=\"bold\">audit_weekly</emphasis>. Насправді, це не зовсім "
-"рівні безпеки, скоріше інструменти, призначені лише для виконання періодичних "
-"перевірок."
+"рівні безпеки, скоріше інструменти, призначені лише для виконання "
+"періодичних перевірок."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:156
@@ -7798,8 +7798,8 @@ msgstr ""
 "Наполегливо рекомендуємо вам увімкнути сповіщення безпеки забезпечення для "
 "адміністратора безпеки отримання негайної інформації щодо можливих проблем з "
 "безпекою. Якщо ви цього не зробите, адміністратору доведеться регулярно "
-"ознайомлюватися з файлами журналу, що зберігаються у каталозі <filename>"
-"/var/log/security</filename>."
+"ознайомлюватися з файлами журналу, що зберігаються у каталозі <filename>/var/"
+"log/security</filename>."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:188
@@ -8074,8 +8074,8 @@ msgid ""
 "\">Periodic check tab</emphasis> must be configured accordingly."
 msgstr ""
 "Для того, щоб це спрацювало, слід відповідним чином налаштувати параметр "
-"CHECK_PERMS на <emphasis role=\"bold"
-"\">вкладці «Періодичні перевірки»</emphasis>."
+"CHECK_PERMS на <emphasis role=\"bold\">вкладці «Періодичні перевірки»</"
+"emphasis>."
 
 #. type: Content of: <section><section><section><para>
 #: en/msecgui.xml:339
@@ -8084,8 +8084,8 @@ msgid ""
 "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> і заповніть поля так, як це показано у наведеному нижче прикладі. "
+"Щоб створити нове правило, натисніть кнопку <guibutton>Додати правило</"
+"guibutton> і заповніть поля так, як це показано у наведеному нижче прикладі. "
 "У полі <guilabel>Файл</guilabel> можна використовувати замінник *. «current» "
 "означає «не вносити зміни»."