Update translation catalogs

4 files changed, 38 insertions, 36 deletions

diff --git a/docs/mcc-help/en/drakconnect.xml b/docs/mcc-help/en/drakconnect.xml
index ff460054..9ac952dd 100644
--- a/docs/mcc-help/en/drakconnect.xml
+++ b/docs/mcc-help/en/drakconnect.xml
@@ -650,7 +650,7 @@
         </listitem>
 
         <listitem>
-          <para>The PIN number is asked. Keep left if this PIN number is not
+          <para>The PIN is asked. Leave empty if the PIN is not
           required.</para>
         </listitem>
 
diff --git a/docs/mcc-help/en/drakrpm-edit-media.xml b/docs/mcc-help/en/drakrpm-edit-media.xml
index ee667a7e..f219ab93 100644
--- a/docs/mcc-help/en/drakrpm-edit-media.xml
+++ b/docs/mcc-help/en/drakrpm-edit-media.xml
@@ -6,6 +6,7 @@
   </info>
 
   <!-- 2013-01-06 marja - added Qilaq's and spturtle's corrections -->
+
   <!--2013-10-22 marja - improved wording, thanks to Aragorn :-) 
                        - adjusted "Add" part to changed behaviour of this tool
 		       (no longer a choice to only add "update sources" is
@@ -18,11 +19,17 @@
   </mediaobject>
 
   <para><important>
-      <para>First thing to do after an install is to add software sources (also
-      known as repositories, media, mirrors). That means you must select the
-      media sources to be used to install and update packages and
+      <para>First thing to do after an install is to add software sources
+      (also known as repositories, media, mirrors). That means you must select
+      the media sources to be used to install and update packages and
       applications. (see Add button below).</para>
-    </important><note>
+    </important> <note>
+      <para>If you install (or upgrade) Mageia using an optical media (DVD or
+      CD) or a USB device, there will be a software source configured to the
+      optical media used. To avoid being asked to insert the media when you
+      install new packages, you should disable (or delete) this media.  (It
+      will have the media type CD-Rom).</para>
+    </note> <note>
       <para>Your system is running under an architecture which may be 32-bit
       (called i586), or 64-bit (called x86_64). Some packages are independent
       of whether your system is 32-bit or 64-bit; these are called noarch
@@ -122,7 +129,7 @@
     repositories contain only safe and well tested software. Clicking on the
     "Add" button adds the mirrorlist to your configuration, it is designed to
     make sure that you install and update from a mirror close to you. If you
-    prefer to choose a specific mirror, then add it by choosing "Add a 
+    prefer to choose a specific mirror, then add it by choosing "Add a
     specific media mirror" from the drop-down "File" menu.</para>
 
     <para><guibutton>Up and down arrows:</guibutton></para>
@@ -155,7 +162,7 @@
 
     <mediaobject>
       <imageobject>
-	      <imagedata fileref="drakrpmEditMedia2.png"/>
+        <imagedata fileref="drakrpmEditMedia2.png"/>
       </imageobject>
     </mediaobject>
 
@@ -200,6 +207,10 @@
     configure it here. You only need to give the <guibutton>Proxy
     hostname</guibutton> and if necessary a <guilabel>Username</guilabel> and
     <guilabel>Password</guilabel>.</para>
-  </section>
-</section>
 
+    <para/>
+
+    <para>For more information about configuring the media, see the Mageia
+    Wiki page: <link linkend="???"><link ns2:href="https://wiki.mageia.org/en/Software_management">https://wiki.mageia.org/en/Software_management</link></link></para>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/mcc-help/en/draksound.xml b/docs/mcc-help/en/draksound.xml
index 4c424c13..47db2ca4 100644
--- a/docs/mcc-help/en/draksound.xml
+++ b/docs/mcc-help/en/draksound.xml
@@ -42,7 +42,7 @@
   programs. It is also recommended to leave it enabled.</para>
 
   <para>The button <guibutton>Advanced</guibutton> display a new window with
-  three buttons:</para>
+  two or three buttons:</para>
 
   <mediaobject>
     <imageobject>
@@ -51,7 +51,8 @@
   </mediaobject>
 
   <para>The first button gives total freedom of choice. You have to know what
-  you are doing.</para>
+  you are doing. This button is not available when the system has found a
+  driver for your device.</para>
 
   <para>The second one is obvious and the last one gives assistance with
   fixing any problems you may have. You will find it helpful to try this
diff --git a/docs/mcc-help/en/drakwizard_dhcp.xml b/docs/mcc-help/en/drakwizard_dhcp.xml
index eab06e30..495518aa 100644
--- a/docs/mcc-help/en/drakwizard_dhcp.xml
+++ b/docs/mcc-help/en/drakwizard_dhcp.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:id="drakwizard_dhcp"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1999/xhtml"
-         xmlns:ns2="http://www.w3.org/1999/xlink"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="drakwizard_dhcp">
   <info>
     <title xml:id="drakwizard_dhcp-ti1">Configure DHCP</title>
 
@@ -14,14 +7,17 @@
 
   <mediaobject>
     <imageobject>
-      <imagedata align="center" fileref="drakwizard_dhcp.png" format="PNG"
-                 revision="1" xml:id="drakwizard_dhcp-im1"/>
+      <imagedata xml:id="drakwizard_dhcp-im1" fileref="drakwizard_dhcp.png" revision="1" align="center" format="PNG"/>
     </imageobject>
   </mediaobject>
 
+  <para><note>
+      <para>This tool is broken in Mageia 4 because of new naming scheme for
+      the Net interafces</para>
+    </note></para>
+
   <para>This tool<footnote>
-      <para>You can start this tool from the command line, by typing <emphasis
-      role="bold">drakwizard dhcp</emphasis> as root.</para>
+      <para>You can start this tool from the command line, by typing <emphasis role="bold">drakwizard dhcp</emphasis> as root.</para>
     </footnote> can help you to set up a <acronym>DHCP</acronym> server. It is
   a component of drakwizard which should be installed before you can access to
   it.</para>
@@ -46,8 +42,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="drakwizard-dhcp-step1.png"
-                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im2"/>
+            <imagedata xml:id="drakwizard_dhcp-im2" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step1.png"/>
           </imageobject>
         </mediaobject>
 
@@ -60,8 +55,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="drakwizard-dhcp-step2.png"
-                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im3"/>
+            <imagedata xml:id="drakwizard_dhcp-im3" revision="1" align="center" format="PNG" fileref="drakwizard-dhcp-step2.png"/>
           </imageobject>
         </mediaobject>
 
@@ -75,8 +69,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="drakwizard-dhcp-step3.png"
-                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im4"/>
+            <imagedata revision="1" align="center" fileref="drakwizard-dhcp-step3.png" format="PNG" xml:id="drakwizard_dhcp-im4"/>
           </imageobject>
         </mediaobject>
 
@@ -91,8 +84,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="drakwizard-dhcp-step4.png"
-                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im5"/>
+            <imagedata fileref="drakwizard-dhcp-step4.png" revision="1" align="center" xml:id="drakwizard_dhcp-im5" format="PNG"/>
           </imageobject>
         </mediaobject>
 
@@ -105,8 +97,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="drakwizard-dhcp-step5.png"
-                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im6"/>
+            <imagedata fileref="drakwizard-dhcp-step5.png" revision="1" align="center" format="PNG" xml:id="drakwizard_dhcp-im6"/>
           </imageobject>
         </mediaobject>
 
@@ -119,8 +110,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="drakwizard-dhcp-step6.png"
-                       format="PNG" revision="1" xml:id="drakwizard_dhcp-im7"/>
+            <imagedata revision="1" fileref="drakwizard-dhcp-step6.png" align="center" format="PNG" xml:id="drakwizard_dhcp-im7"/>
           </imageobject>
         </mediaobject>
       </step>
@@ -202,4 +192,4 @@
         </listitem>
       </itemizedlist></para>
   </section>
-</section>
+</section>
\ No newline at end of file