updated .pot and .po files

3 files changed, 421 insertions, 363 deletions

diff --git a/docs/mcc-help/mcc-help.pot b/docs/mcc-help/mcc-help.pot
index cfd80b81..8a75fe27 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: 2013-10-19 19:57+0200\n"
+"POT-Creation-Date: 2013-10-22 15:57+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"
@@ -3551,8 +3551,12 @@ msgid "drakrpm-edit-media"
 msgstr ""
 
 #.  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
+#. 		       given) 
 #. type: Content of: <section><mediaobject>
-#: en/drakrpm-edit-media.xml:11
+#: en/drakrpm-edit-media.xml:15
 msgid ""
 "<imageobject> <imagedata xml:id=\"drakrpm-edit-media-im1\" "
 "fileref=\"drakrpm-edit-media.png\" revision=\"1\" align=\"center\" "
@@ -3560,42 +3564,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><important><para>
-#: en/drakrpm-edit-media.xml:17
+#: en/drakrpm-edit-media.xml:21
 msgid ""
-"First thing to do after an install is to add software sources (as known as "
+"First thing to do after an install is to add software sources (also known as "
 "repositories, media, mirrors). That means you must select the media sources "
 "to be used to install and update packages and applications. (see Add button "
 "below)."
 msgstr ""
 
 #. type: Content of: <section><para><note>
-#: en/drakrpm-edit-media.xml:21 en/MageiaUpdate.xml:17 en/MageiaUpdate.xml:32 en/XFdrake.xml:36 en/XFdrake.xml:75 en/XFdrake.xml:89
+#: 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:22
+#: en/drakrpm-edit-media.xml:26
 msgid ""
-"Your system is running under an architecture than may be 32-bit called i586, "
-"or 64-bit called x86_64. Take care to choose repositories that suit your "
-"system or are not dependent of the architecture, these are called noarch "
-"packages."
+"Your system is running under an architecture which may be 32-bit (called "
+"i586), or 64-bit (called x86_64). Some packages are independent of whether "
+"your system is 32-bit or 64-bit; these are called noarch packages. They "
+"don't have their own noarch directories on the mirrors, but are all in both "
+"the i586 and the x86_64 media."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakrpm-edit-media.xml:26 en/MageiaUpdate.xml:21 en/MageiaUpdate.xml:40 en/XFdrake.xml:79
+#: 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:30
+#: en/drakrpm-edit-media.xml:35
 msgid ""
 "You can start this tool from the command line, by typing <emphasis "
 "role=\"bold\">drakrpm-edit-media</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakrpm-edit-media.xml:28
+#: en/drakrpm-edit-media.xml:33
 msgid ""
 "This tool is present in the Mageia Control Center under the tab <emphasis "
 "role=\"bold\">Software management.</emphasis><placeholder type=\"footnote\" "
@@ -3603,29 +3608,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:34
+#: en/drakrpm-edit-media.xml:39
 msgid "The columns"
 msgstr ""
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:36
+#: en/drakrpm-edit-media.xml:41
 msgid "Column Enable:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:38
+#: en/drakrpm-edit-media.xml:43
 msgid ""
 "The checked media will be used to install new packages. Be cautious with "
 "some media such as Testing and Debug, they could make your system unusable."
 msgstr ""
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:42
+#: en/drakrpm-edit-media.xml:47
 msgid "Column Update:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:44
+#: en/drakrpm-edit-media.xml:49
 msgid ""
 "The checked media will be used to update packages, it must be enabled. Only "
 "media with \"Update\" in its name should be selected. For security reasons, "
@@ -3634,52 +3639,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:50
+#: en/drakrpm-edit-media.xml:55
 msgid "Column medium:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:52
+#: en/drakrpm-edit-media.xml:57
 msgid ""
 "Display the medium name. Mageia official repositories for final release "
 "versions contain at least:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:57
+#: en/drakrpm-edit-media.xml:62
 msgid ""
 "<emphasis role=\"bold\">Core</emphasis> which contains most programs "
 "available supported by Mageia."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:62
+#: en/drakrpm-edit-media.xml:67
 msgid ""
 "<emphasis role=\"bold\">Nonfree</emphasis> which contains some programs "
 "which are not free"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:67
+#: en/drakrpm-edit-media.xml:72
 msgid ""
 "<emphasis role=\"bold\">Tainted</emphasis> free software for which there "
 "might be patent claims in some countries."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:70
+#: en/drakrpm-edit-media.xml:75
 msgid "Each medium has 4 sub-sections:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:74
+#: en/drakrpm-edit-media.xml:79
 msgid ""
 "<emphasis role=\"bold\">Release</emphasis> the packages as of the day the "
 "this version of Mageia was released."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:79
+#: en/drakrpm-edit-media.xml:84
 msgid ""
 "<emphasis role=\"bold\">Updates</emphasis> the packages updated since "
 "release due to security or bug concerns. Everyone should have this medium "
@@ -3687,14 +3692,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:85
+#: en/drakrpm-edit-media.xml:90
 msgid ""
 "<emphasis role=\"bold\">Backports</emphasis> some packages of new versions "
 "backported from Cauldron (the next version under development)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:91
+#: en/drakrpm-edit-media.xml:96
 msgid ""
 "<emphasis role=\"bold\">Testing</emphasis> which is used for temporary tests "
 "of new updates, to allow the bug reporters and the QA team to validate the "
@@ -3702,17 +3707,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:99
+#: en/drakrpm-edit-media.xml:104
 msgid "The buttons on the right"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:102
+#: en/drakrpm-edit-media.xml:107
 msgid "<guibutton>Remove:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:104
+#: en/drakrpm-edit-media.xml:109
 msgid ""
 "To remove a medium, click on it and then on this button. It is wise to "
 "remove the medium used for the installation (CD or DVD for example)  since "
@@ -3720,70 +3725,71 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:109
+#: en/drakrpm-edit-media.xml:114
 msgid "<guibutton>Edit:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:111
+#: en/drakrpm-edit-media.xml:116
 msgid ""
 "Allows you to modify the selected medium settings, (URL, downloader and "
 "proxy)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:114
+#: en/drakrpm-edit-media.xml:119
 msgid "<guibutton>Add:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:116
+#: en/drakrpm-edit-media.xml:121
 msgid ""
-"Add the official repositories available on the internet. These repositories "
-"contains only sure and well tested software. Clicking on the add button "
-"opens a pop up window giving the choices of installing the \"Update sources "
-"only\" or the \"Full set of sources\". The first choice the essential, the "
-"second is more useful."
+"Add the official repositories available on the Internet. These repositories "
+"contain only safe and well tested software. Clicking on the \"Add\" button "
+"adds the mirrorlist to your configuration, it is designed to make sure that "
+"you install and update from a mirror close to you. If you prefer to choose a "
+"specific mirror, then add it by choosing \"Add a specific media mirror\" "
+"from the drop-down \"File\" menu."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:122
+#: en/drakrpm-edit-media.xml:128
 msgid "<guibutton>Up and down arrows:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:124
+#: en/drakrpm-edit-media.xml:130
 msgid ""
 "Change the list order. When Drakrpm looks for a package, it reads the list "
-"in the displayed order and will install the first found package (for a same "
-"release number, if not, the last release will be installed).  So if "
-"possible, place the fastest repositories on the top."
+"in the displayed order and will install the first package found for the same "
+"release number - in the event of a version mismatch, the latest release will "
+"be installed. So if possible, put the fastest repositories at the top."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:131 en/harddrake2.xml:64
+#: en/drakrpm-edit-media.xml:138 en/harddrake2.xml:64
 msgid "The menu"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:133
+#: en/drakrpm-edit-media.xml:140
 msgid "<guimenu>File -> Update:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:135
+#: en/drakrpm-edit-media.xml:142
 msgid ""
 "A window pops up with the media list. Select the ones you want to update and "
 "click on the <guibutton>Update</guibutton> button."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:138
+#: en/drakrpm-edit-media.xml:145
 msgid "<guimenu>File -> Add a specific media mirror:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:140
+#: en/drakrpm-edit-media.xml:147
 msgid ""
 "Suppose you aren't happy with the actual mirror, because for example it's "
 "too slow or often unavailable, you can choose another mirror. Select all the "
@@ -3795,12 +3801,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/drakrpm-edit-media.xml:150
+#: en/drakrpm-edit-media.xml:157
 msgid "<imageobject> <imagedata fileref=\"drakrpmEditMedia2.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:155
+#: en/drakrpm-edit-media.xml:162
 msgid ""
 "You can see, on the left, a list of countries, choose yours or one very "
 "close by clicking on the > symbol, this will display all the available "
@@ -3808,24 +3814,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:160
+#: en/drakrpm-edit-media.xml:167
 msgid "<guimenu>File -> Add a custom medium:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:162
+#: en/drakrpm-edit-media.xml:169
 msgid ""
 "It is possible to install a new media (from a third party for example) that "
 "isn't supported by Mageia. A new window appears:"
 msgstr ""
 
 #. type: Content of: <section><section><para><mediaobject>
-#: en/drakrpm-edit-media.xml:166
+#: en/drakrpm-edit-media.xml:173
 msgid "<imageobject> <imagedata fileref=\"rpmdrakeEditMedia1.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:165
+#: en/drakrpm-edit-media.xml:172
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>Select the medium type, find a "
 "smart name that well define the medium and give the URL (or the path, "
@@ -3833,12 +3839,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:173
+#: en/drakrpm-edit-media.xml:180
 msgid "<guimenu>Options -> Global options:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:175
+#: 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 "
@@ -3847,12 +3853,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:180
+#: en/drakrpm-edit-media.xml:187
 msgid "<guimenu>Options -> Manage keys:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:182
+#: en/drakrpm-edit-media.xml:189
 msgid ""
 "To guarantee a high level of security, digital keys are used to authenticate "
 "the media. It is possible for each medium to allow or disallow a key. In the "
@@ -3862,17 +3868,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para><warning><para>
-#: en/drakrpm-edit-media.xml:189
+#: en/drakrpm-edit-media.xml:196
 msgid "Do this with care, as with all security-related questions"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:190
+#: en/drakrpm-edit-media.xml:197
 msgid "<guimenu>Options -> Proxy:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:192
+#: en/drakrpm-edit-media.xml:199
 msgid ""
 "If you need to use a proxy server for internet access, you can configure it "
 "here. You only need to give the <guibutton>Proxy hostname</guibutton> and if "
@@ -4260,49 +4266,76 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksnapshot-config.xml:3
+#: en/draksnapshot-config.xml:11
 msgid "Snapshots"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksnapshot-config.xml:3
+#: en/draksnapshot-config.xml:12
 msgid "draksnapshot-config"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/draksnapshot-config.xml:7
+#: en/draksnapshot-config.xml:16
 msgid ""
 "<imageobject> <imagedata xml:id=\"draksnapshot-config-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"draksnapshot-config.png\"/> "
 "</imageobject>"
 msgstr ""
 
+#. type: Content of: <section><para><footnote><para>
+#: en/draksnapshot-config.xml:22
+msgid ""
+"You can start this tool fom the commandline, by typing <emphasis "
+"role=\"bold\">draksnapshot-config </emphasis> as root."
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:12
+#: en/draksnapshot-config.xml:22
 msgid ""
-"If you see the screen above when starting this tool, please close it. This "
-"crash has been reported many times."
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is available in MCC's "
+"\"System\" tab, in the \"Administration tools\" section."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:14
+#: en/draksnapshot-config.xml:26
 msgid ""
-"You can read more about the problem in this bug report: <link "
-"xlink:href=\"https://bugs.mageia.org/show_bug.cgi?id=3032\">bug 3032</link>"
+"When you start this tool in MCC for the first time, you will see a message "
+"about installing draksnapshot. Click on \"Install\" to proceed. Draksnapshot "
+"and some other packages it needs will be installed."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:17
+#: en/draksnapshot-config.xml:31
 msgid ""
-"We shall replace the screenshot with a correct one of the tool, and fill "
-"this page with instructions about how to use it, when the bug is fixed."
+"Click again on \"Snapshots\", you will see the \"Settings\" screen. Tick "
+"\"Enable Backups\" and, if you want to Backup the whole system, \"Backup the "
+"whole system\"."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:20
+#: en/draksnapshot-config.xml:34
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">draksnapshot-config</emphasis> as root."
+"If you only want to backup part of your directories, then choose "
+"\"Advanced\". You will see a little pop-up screen. Use the \"add\" and "
+"\"remove\" buttons next to the \"Backup list\" to include or exclude "
+"directories and files from the backup. Use the same buttons next to the "
+"\"Exclude\" 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 \"Close\" when you are done."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/draksnapshot-config.xml:41
+msgid ""
+"Now give the path to \"Where to backup\", or choose the \"Browse\" button to "
+"select the correct path. Any mounted USB-key or external HD can be found in "
+"<emphasis role=\"bold\">/run/media/your_user_name/</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/draksnapshot-config.xml:45
+msgid "Click on \"Apply\" to make the snapshot."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4726,35 +4759,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakx-intro.xml:3
-msgid "About the Installer Help Manual"
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/drakx-intro.xml:7
-msgid ""
-"No one will see all the installer screens that you see in this manual. Which "
-"screens you will see, depends on your hardware and the choices you make "
-"while installing."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/drakx-intro.xml:12
-msgid ""
-"The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link "
-"xlink:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/drakx-intro.xml:15
-msgid ""
-"This manual was produced with the help of the <link "
-"xlink:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
-"xlink:href=\"http://www.neodoc.biz\">NeoDoc</link>"
-msgstr ""
-
-#. type: Content of: <section><info><title>
 #: en/drakxservices.xml:3
 msgid "Manage system services by enabling or disabling them"
 msgstr ""
diff --git a/docs/mcc-help/nl.po b/docs/mcc-help/nl.po
index 36c75dc9..bc983f4c 100644
--- a/docs/mcc-help/nl.po
+++ b/docs/mcc-help/nl.po
@@ -5,7 +5,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-10-19 19:57+0200\n"
+"POT-Creation-Date: 2013-10-22 15:57+0200\n"
 "PO-Revision-Date: 2013-10-20 19:40+0200\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -336,9 +336,9 @@ msgstr ""
 "U kunt deze tool op de commandoregel starten, door als root <emphasis role="
 "\"bold\">diskdrake --nfs</emphasis> te typen."
 
+# fuzzy
 #. type: Content of: <section><section><para>
 #: en/diskdrake--nfs.xml:24
-# fuzzy
 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 "
@@ -354,7 +354,6 @@ msgstr ""
 "beschikbaar. Shared directories can be also accessible directly in a single "
 "session for a user with tools such as file browsers."
 
-
 #. type: Content of: <section><section><title>
 #: en/diskdrake--nfs.xml:36 en/diskdrake--smb.xml:38
 msgid "Procedure"
@@ -1296,8 +1295,8 @@ msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakbug</emphasis>."
 msgstr ""
-"U kunt deze tool op de commandoregel starten, door <emphasis role=\"bold\">"
-"drakbug</emphasis> te typen."
+"U kunt deze tool op de commandoregel starten, door <emphasis role=\"bold"
+"\">drakbug</emphasis> te typen."
 
 #. type: Content of: <section><para>
 #: en/drakbug.xml:19
@@ -2498,9 +2497,9 @@ msgid ""
 msgstr ""
 "Deze tool<placeholder type=\"footnote\" id=\"0\"/> vindt u in het Mageia "
 "Configuratiecentrum, onder de \"Veiligheid\" tab, onder het label \"Uw "
-"persoonlijke firewall instellen\". Het is dezelfde tool als \"Firewall\" in 
+"persoonlijke firewall instellen\". Het is dezelfde tool als \"Firewall\" in "
 "het eerste tabblad van \"Beveiliging, rechten en audit van het systeem "
-"afregelen\".
+"afregelen\"."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:20
@@ -3800,8 +3799,12 @@ msgid "drakrpm-edit-media"
 msgstr ""
 
 #.  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
+#. 		       given) 
 #. type: Content of: <section><mediaobject>
-#: en/drakrpm-edit-media.xml:11
+#: en/drakrpm-edit-media.xml:15
 msgid ""
 "<imageobject> <imagedata xml:id=\"drakrpm-edit-media-im1\" fileref=\"drakrpm-"
 "edit-media.png\" revision=\"1\" align=\"center\" format=\"PNG\"/> </"
@@ -3812,37 +3815,38 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para><important><para>
-#: en/drakrpm-edit-media.xml:17
+#: en/drakrpm-edit-media.xml:21
 msgid ""
-"First thing to do after an install is to add software sources (as known as "
+"First thing to do after an install is to add software sources (also known as "
 "repositories, media, mirrors). That means you must select the media sources "
 "to be used to install and update packages and applications. (see Add button "
 "below)."
 msgstr ""
 
 #. type: Content of: <section><para><note>
-#: en/drakrpm-edit-media.xml:21 en/MageiaUpdate.xml:17 en/MageiaUpdate.xml:32
+#: 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:22
+#: en/drakrpm-edit-media.xml:26
 msgid ""
-"Your system is running under an architecture than may be 32-bit called i586, "
-"or 64-bit called x86_64. Take care to choose repositories that suit your "
-"system or are not dependent of the architecture, these are called noarch "
-"packages."
+"Your system is running under an architecture which may be 32-bit (called "
+"i586), or 64-bit (called x86_64). Some packages are independent of whether "
+"your system is 32-bit or 64-bit; these are called noarch packages. They "
+"don't have their own noarch directories on the mirrors, but are all in both "
+"the i586 and the x86_64 media."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakrpm-edit-media.xml:26 en/MageiaUpdate.xml:21 en/MageiaUpdate.xml:40
+#: 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:30
+#: 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."
@@ -3851,7 +3855,7 @@ msgstr ""
 "\"bold\">drakrpm-edit-media</emphasis> te typen."
 
 #. type: Content of: <section><para>
-#: en/drakrpm-edit-media.xml:28
+#: en/drakrpm-edit-media.xml:33
 msgid ""
 "This tool is present in the Mageia Control Center under the tab <emphasis "
 "role=\"bold\">Software management.</emphasis><placeholder type=\"footnote\" "
@@ -3859,29 +3863,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:34
+#: en/drakrpm-edit-media.xml:39
 msgid "The columns"
 msgstr ""
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:36
+#: en/drakrpm-edit-media.xml:41
 msgid "Column Enable:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:38
+#: en/drakrpm-edit-media.xml:43
 msgid ""
 "The checked media will be used to install new packages. Be cautious with "
 "some media such as Testing and Debug, they could make your system unusable."
 msgstr ""
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:42
+#: en/drakrpm-edit-media.xml:47
 msgid "Column Update:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:44
+#: en/drakrpm-edit-media.xml:49
 msgid ""
 "The checked media will be used to update packages, it must be enabled. Only "
 "media with \"Update\" in its name should be selected. For security reasons, "
@@ -3890,52 +3894,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:50
+#: en/drakrpm-edit-media.xml:55
 msgid "Column medium:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:52
+#: en/drakrpm-edit-media.xml:57
 msgid ""
 "Display the medium name. Mageia official repositories for final release "
 "versions contain at least:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:57
+#: en/drakrpm-edit-media.xml:62
 msgid ""
 "<emphasis role=\"bold\">Core</emphasis> which contains most programs "
 "available supported by Mageia."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:62
+#: en/drakrpm-edit-media.xml:67
 msgid ""
 "<emphasis role=\"bold\">Nonfree</emphasis> which contains some programs "
 "which are not free"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:67
+#: en/drakrpm-edit-media.xml:72
 msgid ""
 "<emphasis role=\"bold\">Tainted</emphasis> free software for which there "
 "might be patent claims in some countries."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:70
+#: en/drakrpm-edit-media.xml:75
 msgid "Each medium has 4 sub-sections:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:74
+#: en/drakrpm-edit-media.xml:79
 msgid ""
 "<emphasis role=\"bold\">Release</emphasis> the packages as of the day the "
 "this version of Mageia was released."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:79
+#: en/drakrpm-edit-media.xml:84
 msgid ""
 "<emphasis role=\"bold\">Updates</emphasis> the packages updated since "
 "release due to security or bug concerns. Everyone should have this medium "
@@ -3943,14 +3947,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:85
+#: en/drakrpm-edit-media.xml:90
 msgid ""
 "<emphasis role=\"bold\">Backports</emphasis> some packages of new versions "
 "backported from Cauldron (the next version under development)."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:91
+#: en/drakrpm-edit-media.xml:96
 msgid ""
 "<emphasis role=\"bold\">Testing</emphasis> which is used for temporary tests "
 "of new updates, to allow the bug reporters and the QA team to validate the "
@@ -3958,17 +3962,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:99
+#: en/drakrpm-edit-media.xml:104
 msgid "The buttons on the right"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:102
+#: en/drakrpm-edit-media.xml:107
 msgid "<guibutton>Remove:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:104
+#: en/drakrpm-edit-media.xml:109
 msgid ""
 "To remove a medium, click on it and then on this button. It is wise to "
 "remove the medium used for the installation (CD or DVD for example)  since "
@@ -3976,70 +3980,71 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:109
+#: en/drakrpm-edit-media.xml:114
 msgid "<guibutton>Edit:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:111
+#: en/drakrpm-edit-media.xml:116
 msgid ""
 "Allows you to modify the selected medium settings, (URL, downloader and "
 "proxy)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:114
+#: en/drakrpm-edit-media.xml:119
 msgid "<guibutton>Add:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:116
+#: en/drakrpm-edit-media.xml:121
 msgid ""
-"Add the official repositories available on the internet. These repositories "
-"contains only sure and well tested software. Clicking on the add button "
-"opens a pop up window giving the choices of installing the \"Update sources "
-"only\" or the \"Full set of sources\". The first choice the essential, the "
-"second is more useful."
+"Add the official repositories available on the Internet. These repositories "
+"contain only safe and well tested software. Clicking on the \"Add\" button "
+"adds the mirrorlist to your configuration, it is designed to make sure that "
+"you install and update from a mirror close to you. If you prefer to choose a "
+"specific mirror, then add it by choosing \"Add a specific media mirror\" "
+"from the drop-down \"File\" menu."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:122
+#: en/drakrpm-edit-media.xml:128
 msgid "<guibutton>Up and down arrows:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:124
+#: en/drakrpm-edit-media.xml:130
 msgid ""
 "Change the list order. When Drakrpm looks for a package, it reads the list "
-"in the displayed order and will install the first found package (for a same "
-"release number, if not, the last release will be installed).  So if "
-"possible, place the fastest repositories on the top."
+"in the displayed order and will install the first package found for the same "
+"release number - in the event of a version mismatch, the latest release will "
+"be installed. So if possible, put the fastest repositories at the top."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:131 en/harddrake2.xml:64
+#: en/drakrpm-edit-media.xml:138 en/harddrake2.xml:64
 msgid "The menu"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:133
+#: en/drakrpm-edit-media.xml:140
 msgid "<guimenu>File -> Update:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:135
+#: en/drakrpm-edit-media.xml:142
 msgid ""
 "A window pops up with the media list. Select the ones you want to update and "
 "click on the <guibutton>Update</guibutton> button."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:138
+#: en/drakrpm-edit-media.xml:145
 msgid "<guimenu>File -> Add a specific media mirror:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:140
+#: en/drakrpm-edit-media.xml:147
 msgid ""
 "Suppose you aren't happy with the actual mirror, because for example it's "
 "too slow or often unavailable, you can choose another mirror. Select all the "
@@ -4051,14 +4056,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/drakrpm-edit-media.xml:150
+#: en/drakrpm-edit-media.xml:157
 msgid ""
 "<imageobject> <imagedata fileref=\"drakrpmEditMedia2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"drakrpmEditMedia2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:155
+#: en/drakrpm-edit-media.xml:162
 msgid ""
 "You can see, on the left, a list of countries, choose yours or one very "
 "close by clicking on the > symbol, this will display all the available "
@@ -4066,26 +4071,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:160
+#: en/drakrpm-edit-media.xml:167
 msgid "<guimenu>File -> Add a custom medium:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:162
+#: en/drakrpm-edit-media.xml:169
 msgid ""
 "It is possible to install a new media (from a third party for example) that "
 "isn't supported by Mageia. A new window appears:"
 msgstr ""
 
 #. type: Content of: <section><section><para><mediaobject>
-#: en/drakrpm-edit-media.xml:166
+#: en/drakrpm-edit-media.xml:173
 msgid ""
 "<imageobject> <imagedata fileref=\"rpmdrakeEditMedia1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"rpmdrakeEditMedia1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:165
+#: en/drakrpm-edit-media.xml:172
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>Select the medium type, find a "
 "smart name that well define the medium and give the URL (or the path, "
@@ -4093,12 +4098,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:173
+#: en/drakrpm-edit-media.xml:180
 msgid "<guimenu>Options -> Global options:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:175
+#: 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 "
@@ -4107,12 +4112,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:180
+#: en/drakrpm-edit-media.xml:187
 msgid "<guimenu>Options -> Manage keys:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:182
+#: en/drakrpm-edit-media.xml:189
 msgid ""
 "To guarantee a high level of security, digital keys are used to authenticate "
 "the media. It is possible for each medium to allow or disallow a key. In the "
@@ -4122,17 +4127,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para><warning><para>
-#: en/drakrpm-edit-media.xml:189
+#: en/drakrpm-edit-media.xml:196
 msgid "Do this with care, as with all security-related questions"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:190
+#: en/drakrpm-edit-media.xml:197
 msgid "<guimenu>Options -> Proxy:</guimenu>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:192
+#: en/drakrpm-edit-media.xml:199
 msgid ""
 "If you need to use a proxy server for internet access, you can configure it "
 "here. You only need to give the <guibutton>Proxy hostname</guibutton> and if "
@@ -4552,17 +4557,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksnapshot-config.xml:3
+#: en/draksnapshot-config.xml:11
 msgid "Snapshots"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksnapshot-config.xml:3
+#: en/draksnapshot-config.xml:12
 msgid "draksnapshot-config"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/draksnapshot-config.xml:7
+#: en/draksnapshot-config.xml:16
 msgid ""
 "<imageobject> <imagedata xml:id=\"draksnapshot-config-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"draksnapshot-config.png\"/> </"
@@ -4572,35 +4577,63 @@ msgstr ""
 "align=\"center\" format=\"PNG\" fileref=\"draksnapshot-config.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><footnote><para>
+#: en/draksnapshot-config.xml:22
+#, fuzzy
+msgid ""
+"You can start this tool fom the commandline, by typing <emphasis role=\"bold"
+"\">draksnapshot-config </emphasis> as root."
+msgstr ""
+"U kunt deze tool op de commandoregel starten, door als root <emphasis role="
+"\"bold\">draksnapshot-config</emphasis> te typen."
+
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:12
+#: en/draksnapshot-config.xml:22
 msgid ""
-"If you see the screen above when starting this tool, please close it. This "
-"crash has been reported many times."
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is available in MCC's "
+"\"System\" tab, in the \"Administration tools\" section."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:14
+#: en/draksnapshot-config.xml:26
 msgid ""
-"You can read more about the problem in this bug report: <link xlink:href="
-"\"https://bugs.mageia.org/show_bug.cgi?id=3032\">bug 3032</link>"
+"When you start this tool in MCC for the first time, you will see a message "
+"about installing draksnapshot. Click on \"Install\" to proceed. Draksnapshot "
+"and some other packages it needs will be installed."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:17
+#: en/draksnapshot-config.xml:31
 msgid ""
-"We shall replace the screenshot with a correct one of the tool, and fill "
-"this page with instructions about how to use it, when the bug is fixed."
+"Click again on \"Snapshots\", you will see the \"Settings\" screen. Tick "
+"\"Enable Backups\" and, if you want to Backup the whole system, \"Backup the "
+"whole system\"."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:20
+#: en/draksnapshot-config.xml:34
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">draksnapshot-config</emphasis> as root."
+"If you only want to backup part of your directories, then choose \"Advanced"
+"\". You will see a little pop-up screen. Use the \"add\" and \"remove\" "
+"buttons next to the \"Backup list\" to include or exclude directories and "
+"files from the backup. Use the same buttons next to the \"Exclude\" 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 "
+"\"Close\" when you are done."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/draksnapshot-config.xml:41
+msgid ""
+"Now give the path to \"Where to backup\", or choose the \"Browse\" button to "
+"select the correct path. Any mounted USB-key or external HD can be found in "
+"<emphasis role=\"bold\">/run/media/your_user_name/</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/draksnapshot-config.xml:45
+msgid "Click on \"Apply\" to make the snapshot."
 msgstr ""
-"U kunt deze tool op de commandoregel starten, door als root <emphasis role="
-"\"bold\">draksnapshot-config</emphasis> te typen."
 
 #. type: Content of: <section><info><title>
 #: en/draksound.xml:3
@@ -5064,35 +5097,6 @@ msgstr ""
 "\"bold\">drakwizard sshd</emphasis> te typen."
 
 #. type: Content of: <section><info><title>
-#: en/drakx-intro.xml:3
-msgid "About the Installer Help Manual"
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/drakx-intro.xml:7
-msgid ""
-"No one will see all the installer screens that you see in this manual. Which "
-"screens you will see, depends on your hardware and the choices you make "
-"while installing."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/drakx-intro.xml:12
-msgid ""
-"The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link xlink:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
-"\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/drakx-intro.xml:15
-msgid ""
-"This manual was produced with the help of the <link xlink:href=\"http://www."
-"calenco.com\">Calenco CMS</link> developed by <link xlink:href=\"http://www."
-"neodoc.biz\">NeoDoc</link>"
-msgstr ""
-
-#. type: Content of: <section><info><title>
 #: en/drakxservices.xml:3
 msgid "Manage system services by enabling or disabling them"
 msgstr ""
@@ -5566,8 +5570,8 @@ msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">lsnetdrake</emphasis>."
 msgstr ""
-"U kunt deze tool op de commandoregel starten, door <emphasis role="\bold\">"
-"lsnetdrake</emphasis> te typen."
+"U kunt deze tool op de commandoregel starten, door <emphasis role=\"bold"
+"\">lsnetdrake</emphasis> te typen."
 
 #. type: Content of: <section><para>
 #: en/lsnetdrake.xml:14 en/lspcidrake.xml:14
@@ -5601,8 +5605,8 @@ msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">lspcidrake</emphasis>."
 msgstr ""
-"U kunt deze tool op de commandoregel starten, door <emphasis role=\"bold\">"
-"lspcidrake</emphasis> te typen."
+"U kunt deze tool op de commandoregel starten, door <emphasis role=\"bold"
+"\">lspcidrake</emphasis> te typen."
 
 #. type: Content of: <section><info><title>
 #: en/MageiaUpdate.xml:3
diff --git a/docs/mcc-help/uk.po b/docs/mcc-help/uk.po
index 85c9b454..0fc28d42 100644
--- a/docs/mcc-help/uk.po
+++ b/docs/mcc-help/uk.po
@@ -6,7 +6,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: 2013-10-19 19:57+0200\n"
+"POT-Creation-Date: 2013-10-22 15:57+0200\n"
 "PO-Revision-Date: 2013-10-21 18:10+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -1283,8 +1283,8 @@ msgid ""
 "several GBs large."
 msgstr ""
 "Вам варто вивести дані, отримані за допомогою цієї програми, до файла, "
-"наприклад так: <emphasis role=\"bold\">drakbug_report > drakbugreport.txt<"
-"/emphasis>. Втім, спершу слід переконатися, що у системі є достатньо вільного "
+"наприклад так: <emphasis role=\"bold\">drakbug_report > drakbugreport.txt</"
+"emphasis>. Втім, спершу слід переконатися, що у системі є достатньо вільного "
 "місця на диску: об’єм файла може досягти значення у декілька гігабайтів."
 
 #. type: Content of: <section><note><para>
@@ -1478,14 +1478,14 @@ msgid ""
 "\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
 msgstr ""
 "На час написання цієї сторінки довідки частина «syslog» виведених цією "
-"програмою даних була порожньою, оскільки програму ще не пристосовано до нової "
-"системи ведення журналу, systemd. Якщо у вашій системі ця частина є "
-"порожньою, отримати відповідні дані можна за допомогою такої команди (команду "
-"слід віддавати від імені користувача root): <emphasis role=\"bold\"> "
-"journalctl -a > journalctl.txt</"
-"emphasis>. Якщо на диску не дуже багато місця, ви можете, наприклад, вивести "
-"лише останні 5000 рядків журналу: <emphasis role=\"bold"
-"\">journalctl -a | tail -n5000 > journalctl5000.txt</emphasis>."
+"програмою даних була порожньою, оскільки програму ще не пристосовано до "
+"нової системи ведення журналу, systemd. Якщо у вашій системі ця частина є "
+"порожньою, отримати відповідні дані можна за допомогою такої команди "
+"(команду слід віддавати від імені користувача root): <emphasis role=\"bold"
+"\"> journalctl -a > journalctl.txt</emphasis>. Якщо на диску не дуже багато "
+"місця, ви можете, наприклад, вивести лише останні 5000 рядків журналу: "
+"<emphasis role=\"bold\">journalctl -a | tail -n5000 > journalctl5000.txt</"
+"emphasis>."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug.xml:9
@@ -4590,9 +4590,13 @@ msgstr "Налаштувати джерело"
 msgid "drakrpm-edit-media"
 msgstr "drakrpm-edit-media"
 
-#.  2013-01-06 marja - added Qilaq's and spturtle's corrections
+#.  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
+#. 		       given) 
 #. type: Content of: <section><mediaobject>
-#: en/drakrpm-edit-media.xml:11
+#: en/drakrpm-edit-media.xml:15
 msgid ""
 "<imageobject> <imagedata xml:id=\"drakrpm-edit-media-im1\" fileref=\"drakrpm-"
 "edit-media.png\" revision=\"1\" align=\"center\" format=\"PNG\"/> </"
@@ -4603,9 +4607,10 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para><important><para>
-#: en/drakrpm-edit-media.xml:17
+#: en/drakrpm-edit-media.xml:21
+#, fuzzy
 msgid ""
-"First thing to do after an install is to add software sources (as known as "
+"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)."
@@ -4617,18 +4622,20 @@ msgstr ""
 "<guilabel>Додати</guilabel>, описану нижче)."
 
 #. type: Content of: <section><para><note>
-#: en/drakrpm-edit-media.xml:21 en/MageiaUpdate.xml:17 en/MageiaUpdate.xml:32
+#: 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 "<note>"
 
 #. type: Content of: <section><para><note><para>
-#: en/drakrpm-edit-media.xml:22
+#: en/drakrpm-edit-media.xml:26
+#, fuzzy
 msgid ""
-"Your system is running under an architecture than may be 32-bit called i586, "
-"or 64-bit called x86_64. Take care to choose repositories that suit your "
-"system or are not dependent of the architecture, these are called noarch "
-"packages."
+"Your system is running under an architecture which may be 32-bit (called "
+"i586), or 64-bit (called x86_64). Some packages are independent of whether "
+"your system is 32-bit or 64-bit; these are called noarch packages. They "
+"don't have their own noarch directories on the mirrors, but are all in both "
+"the i586 and the x86_64 media."
 msgstr ""
 "Ваша система може працювати на 32-бітовій апаратній архітектурі, яка "
 "називається у дистрибутиві i586, або 64-бітовій архітектурі, яка має назву "
@@ -4636,13 +4643,13 @@ msgstr ""
 "для пакунків, які не залежать від архітектури (їх ще називають noarch)."
 
 #. type: Content of: <section><para>
-#: en/drakrpm-edit-media.xml:26 en/MageiaUpdate.xml:21 en/MageiaUpdate.xml:40
+#: en/drakrpm-edit-media.xml:31 en/MageiaUpdate.xml:21 en/MageiaUpdate.xml:40
 #: en/XFdrake.xml:79
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <section><para><footnote><para>
-#: en/drakrpm-edit-media.xml:30
+#: 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."
@@ -4652,7 +4659,7 @@ msgstr ""
 "адміністратора (root)."
 
 #. type: Content of: <section><para>
-#: en/drakrpm-edit-media.xml:28
+#: en/drakrpm-edit-media.xml:33
 msgid ""
 "This tool is present in the Mageia Control Center under the tab <emphasis "
 "role=\"bold\">Software management.</emphasis><placeholder type=\"footnote\" "
@@ -4663,17 +4670,17 @@ msgstr ""
 "\"footnote\" id=\"0\"/>."
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:34
+#: en/drakrpm-edit-media.xml:39
 msgid "The columns"
 msgstr "Стовпчики"
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:36
+#: en/drakrpm-edit-media.xml:41
 msgid "Column Enable:"
 msgstr "Стовпчик «Доступний»:"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:38
+#: en/drakrpm-edit-media.xml:43
 msgid ""
 "The checked media will be used to install new packages. Be cautious with "
 "some media such as Testing and Debug, they could make your system unusable."
@@ -4683,12 +4690,12 @@ msgstr ""
 "використання може призвести до непрацездатності системи."
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:42
+#: en/drakrpm-edit-media.xml:47
 msgid "Column Update:"
 msgstr "Стовпчик «Поновлення»:"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:44
+#: en/drakrpm-edit-media.xml:49
 msgid ""
 "The checked media will be used to update packages, it must be enabled. Only "
 "media with \"Update\" in its name should be selected. For security reasons, "
@@ -4703,12 +4710,12 @@ msgstr ""
 "\"bold\">drakrpm-edit-media --expert</emphasis>."
 
 #. type: Content of: <section><section><bridgehead>
-#: en/drakrpm-edit-media.xml:50
+#: en/drakrpm-edit-media.xml:55
 msgid "Column medium:"
 msgstr "Стовпчик «Джерело»:"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:52
+#: en/drakrpm-edit-media.xml:57
 msgid ""
 "Display the medium name. Mageia official repositories for final release "
 "versions contain at least:"
@@ -4717,7 +4724,7 @@ msgstr ""
 "випусків містять принаймні такі елементи:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:57
+#: en/drakrpm-edit-media.xml:62
 msgid ""
 "<emphasis role=\"bold\">Core</emphasis> which contains most programs "
 "available supported by Mageia."
@@ -4726,7 +4733,7 @@ msgstr ""
 "більшість програм, які підтримуються спільнотою Mageia."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:62
+#: en/drakrpm-edit-media.xml:67
 msgid ""
 "<emphasis role=\"bold\">Nonfree</emphasis> which contains some programs "
 "which are not free"
@@ -4735,7 +4742,7 @@ msgstr ""
 "деякі з програм, доступ до коду яких обмежено правилами ліцензування."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:67
+#: en/drakrpm-edit-media.xml:72
 msgid ""
 "<emphasis role=\"bold\">Tainted</emphasis> free software for which there "
 "might be patent claims in some countries."
@@ -4745,12 +4752,12 @@ msgstr ""
 "застосовуватися патентні обмеження."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:70
+#: en/drakrpm-edit-media.xml:75
 msgid "Each medium has 4 sub-sections:"
 msgstr "Кожен запис джерела містить 4 підрозділи:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:74
+#: en/drakrpm-edit-media.xml:79
 msgid ""
 "<emphasis role=\"bold\">Release</emphasis> the packages as of the day the "
 "this version of Mageia was released."
@@ -4759,7 +4766,7 @@ msgstr ""
 "день випуску вашої версії Mageia."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:79
+#: en/drakrpm-edit-media.xml:84
 msgid ""
 "<emphasis role=\"bold\">Updates</emphasis> the packages updated since "
 "release due to security or bug concerns. Everyone should have this medium "
@@ -4770,7 +4777,7 @@ msgstr ""
 "увімкнути всім, навіть якщо з’єднання з інтернетом є дуже повільним."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:85
+#: en/drakrpm-edit-media.xml:90
 msgid ""
 "<emphasis role=\"bold\">Backports</emphasis> some packages of new versions "
 "backported from Cauldron (the next version under development)."
@@ -4780,7 +4787,7 @@ msgstr ""
 "наступної версії дистрибутива, розробку якої ще не завершено)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/drakrpm-edit-media.xml:91
+#: en/drakrpm-edit-media.xml:96
 msgid ""
 "<emphasis role=\"bold\">Testing</emphasis> which is used for temporary tests "
 "of new updates, to allow the bug reporters and the QA team to validate the "
@@ -4792,17 +4799,17 @@ msgstr ""
 "працездатність виправлених пакунків."
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:99
+#: en/drakrpm-edit-media.xml:104
 msgid "The buttons on the right"
 msgstr "Кнопки на панелі праворуч"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:102
+#: en/drakrpm-edit-media.xml:107
 msgid "<guibutton>Remove:</guibutton>"
 msgstr "<guibutton>Вилучити:</guibutton>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:104
+#: en/drakrpm-edit-media.xml:109
 msgid ""
 "To remove a medium, click on it and then on this button. It is wise to "
 "remove the medium used for the installation (CD or DVD for example)  since "
@@ -4815,12 +4822,12 @@ msgstr ""
 "пакунків (Core) відповідного випуску."
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:109
+#: en/drakrpm-edit-media.xml:114
 msgid "<guibutton>Edit:</guibutton>"
 msgstr "<guibutton>Виправити:</guibutton>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:111
+#: en/drakrpm-edit-media.xml:116
 msgid ""
 "Allows you to modify the selected medium settings, (URL, downloader and "
 "proxy)."
@@ -4829,18 +4836,20 @@ msgstr ""
 "(адресу, програму для звантаження і параметри проксі-сервера)."
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:114
+#: en/drakrpm-edit-media.xml:119
 msgid "<guibutton>Add:</guibutton>"
 msgstr "<guibutton>Додати:</guibutton>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:116
+#: en/drakrpm-edit-media.xml:121
+#, fuzzy
 msgid ""
-"Add the official repositories available on the internet. These repositories "
-"contains only sure and well tested software. Clicking on the add button "
-"opens a pop up window giving the choices of installing the \"Update sources "
-"only\" or the \"Full set of sources\". The first choice the essential, the "
-"second is more useful."
+"Add the official repositories available on the Internet. These repositories "
+"contain only safe and well tested software. Clicking on the \"Add\" button "
+"adds the mirrorlist to your configuration, it is designed to make sure that "
+"you install and update from a mirror close to you. If you prefer to choose a "
+"specific mirror, then add it by choosing \"Add a specific media mirror\" "
+"from the drop-down \"File\" menu."
 msgstr ""
 "Кнопка для додавання офіційних сховищ з інтернету. У офіційних сховищах "
 "містяться лише надійні і добре перевірені пакунки. Після натискання кнопки "
@@ -4850,17 +4859,18 @@ msgstr ""
 "мінімалістичним, другий — найкориснішим."
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:122
+#: en/drakrpm-edit-media.xml:128
 msgid "<guibutton>Up and down arrows:</guibutton>"
 msgstr "<guibutton>Кнопки зі стрілками вгору і вниз:</guibutton>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:124
+#: en/drakrpm-edit-media.xml:130
+#, fuzzy
 msgid ""
 "Change the list order. When Drakrpm looks for a package, it reads the list "
-"in the displayed order and will install the first found package (for a same "
-"release number, if not, the last release will be installed).  So if "
-"possible, place the fastest repositories on the top."
+"in the displayed order and will install the first package found for the same "
+"release number - in the event of a version mismatch, the latest release will "
+"be installed. So if possible, put the fastest repositories at the top."
 msgstr ""
 "Ці кнопки призначено для впорядковування списку. Під час пошуків пакунків "
 "програмою Drakrpm виконується завантаження списку сховищ у показаному "
@@ -4870,17 +4880,17 @@ msgstr ""
 "розташовуйте сховища з найшвидшим доступом на початку списку."
 
 #. type: Content of: <section><section><title>
-#: en/drakrpm-edit-media.xml:131 en/harddrake2.xml:64
+#: en/drakrpm-edit-media.xml:138 en/harddrake2.xml:64
 msgid "The menu"
 msgstr "Меню програми"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:133
+#: en/drakrpm-edit-media.xml:140
 msgid "<guimenu>File -> Update:</guimenu>"
 msgstr "<guimenu>Файл -&gt; Оновити:</guimenu>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:135
+#: en/drakrpm-edit-media.xml:142
 msgid ""
 "A window pops up with the media list. Select the ones you want to update and "
 "click on the <guibutton>Update</guibutton> button."
@@ -4890,12 +4900,12 @@ msgstr ""
 "<guibutton>Оновити</guibutton>."
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:138
+#: en/drakrpm-edit-media.xml:145
 msgid "<guimenu>File -> Add a specific media mirror:</guimenu>"
 msgstr "<guimenu>Файл -> Додати вказане дзеркало джерел:</guimenu>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:140
+#: en/drakrpm-edit-media.xml:147
 msgid ""
 "Suppose you aren't happy with the actual mirror, because for example it's "
 "too slow or often unavailable, you can choose another mirror. Select all the "
@@ -4916,14 +4926,14 @@ msgstr ""
 "<guibutton>Так</guibutton>. У відповідь буде показано таке вікно:"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/drakrpm-edit-media.xml:150
+#: en/drakrpm-edit-media.xml:157
 msgid ""
 "<imageobject> <imagedata fileref=\"drakrpmEditMedia2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"drakrpmEditMedia2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:155
+#: en/drakrpm-edit-media.xml:162
 msgid ""
 "You can see, on the left, a list of countries, choose yours or one very "
 "close by clicking on the > symbol, this will display all the available "
@@ -4935,12 +4945,12 @@ msgstr ""
 "<guibutton>Гаразд</guibutton>."
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:160
+#: en/drakrpm-edit-media.xml:167
 msgid "<guimenu>File -> Add a custom medium:</guimenu>"
 msgstr "<guimenu>Файл -&gt; Додати власне джерело:</guimenu>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:162
+#: en/drakrpm-edit-media.xml:169
 msgid ""
 "It is possible to install a new media (from a third party for example) that "
 "isn't supported by Mageia. A new window appears:"
@@ -4950,14 +4960,14 @@ msgstr ""
 "відповідь на вибір цього пункту меню буде показано нове вікно:"
 
 #. type: Content of: <section><section><para><mediaobject>
-#: en/drakrpm-edit-media.xml:166
+#: en/drakrpm-edit-media.xml:173
 msgid ""
 "<imageobject> <imagedata fileref=\"rpmdrakeEditMedia1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"rpmdrakeEditMedia1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:165
+#: en/drakrpm-edit-media.xml:172
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>Select the medium type, find a "
 "smart name that well define the medium and give the URL (or the path, "
@@ -4968,12 +4978,12 @@ msgstr ""
 "шлях до джерела, залежно від його типу)."
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:173
+#: en/drakrpm-edit-media.xml:180
 msgid "<guimenu>Options -> Global options:</guimenu>"
 msgstr "<guimenu>Параметри -&gt; Загальні налаштування:</guimenu>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:175
+#: 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 "
@@ -4987,12 +4997,12 @@ msgstr ""
 "тільки поновлення, завжди або ніколи)."
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:180
+#: en/drakrpm-edit-media.xml:187
 msgid "<guimenu>Options -> Manage keys:</guimenu>"
 msgstr "<guimenu>Параметри -&gt; Керування ключами:</guimenu>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:182
+#: en/drakrpm-edit-media.xml:189
 msgid ""
 "To guarantee a high level of security, digital keys are used to authenticate "
 "the media. It is possible for each medium to allow or disallow a key. In the "
@@ -5008,18 +5018,18 @@ msgstr ""
 "<guibutton>Вилучити</guibutton>, щоб заборонити його використання."
 
 #. type: Content of: <section><section><para><warning><para>
-#: en/drakrpm-edit-media.xml:189
+#: en/drakrpm-edit-media.xml:196
 msgid "Do this with care, as with all security-related questions"
 msgstr ""
 "Будьте обережними, як і з усіма іншими питаннями, пов’язаними з безпекою."
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:190
+#: en/drakrpm-edit-media.xml:197
 msgid "<guimenu>Options -> Proxy:</guimenu>"
 msgstr "<guimenu>Параметри -&gt; Проксі:</guimenu>"
 
 #. type: Content of: <section><section><para>
-#: en/drakrpm-edit-media.xml:192
+#: en/drakrpm-edit-media.xml:199
 msgid ""
 "If you need to use a proxy server for internet access, you can configure it "
 "here. You only need to give the <guibutton>Proxy hostname</guibutton> and if "
@@ -5514,17 +5524,17 @@ msgstr ""
 "MCC, пункт «Налаштувати правила безпеки системи, права доступу і перевірку»."
 
 #. type: Content of: <section><info><title>
-#: en/draksnapshot-config.xml:3
+#: en/draksnapshot-config.xml:11
 msgid "Snapshots"
 msgstr "Знімки"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksnapshot-config.xml:3
+#: en/draksnapshot-config.xml:12
 msgid "draksnapshot-config"
 msgstr "draksnapshot-config"
 
 #. type: Content of: <section><mediaobject>
-#: en/draksnapshot-config.xml:7
+#: en/draksnapshot-config.xml:16
 msgid ""
 "<imageobject> <imagedata xml:id=\"draksnapshot-config-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"draksnapshot-config.png\"/> </"
@@ -5534,43 +5544,67 @@ msgstr ""
 "align=\"center\" format=\"PNG\" fileref=\"draksnapshot-config.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><footnote><para>
+#: en/draksnapshot-config.xml:22
+#, fuzzy
+msgid ""
+"You can start this tool fom the commandline, by typing <emphasis role=\"bold"
+"\">draksnapshot-config </emphasis> as root."
+msgstr ""
+"Запустити цю програму можна за допомогою термінала: достатньо ввести команду "
+"<emphasis role=\"bold\">draksnapshot-config</emphasis> від імені "
+"адміністратора (root)."
+
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:12
+#: en/draksnapshot-config.xml:22
+#, fuzzy
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> is available in MCC's "
+"\"System\" tab, in the \"Administration tools\" section."
+msgstr ""
+"Цю програму<placeholder type=\"footnote\" id=\"0\"/> можна запустити лише з "
+"командного рядка."
+
+#. type: Content of: <section><para>
+#: en/draksnapshot-config.xml:26
 msgid ""
-"If you see the screen above when starting this tool, please close it. This "
-"crash has been reported many times."
+"When you start this tool in MCC for the first time, you will see a message "
+"about installing draksnapshot. Click on \"Install\" to proceed. Draksnapshot "
+"and some other packages it needs will be installed."
 msgstr ""
-"Якщо після запуску цього інструмента ви побачите вікно, схоже на зображення "
-"не знімку, який наведено вище, будь ласка, закрийте це вікно. Розробникам "
-"вже відомо про аварійне завершення роботи цього інструмента."
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:14
+#: en/draksnapshot-config.xml:31
 msgid ""
-"You can read more about the problem in this bug report: <link xlink:href="
-"\"https://bugs.mageia.org/show_bug.cgi?id=3032\">bug 3032</link>"
+"Click again on \"Snapshots\", you will see the \"Settings\" screen. Tick "
+"\"Enable Backups\" and, if you want to Backup the whole system, \"Backup the "
+"whole system\"."
 msgstr ""
-"Докладніше про цю ваду можна дізнатися зі <link xlink:href=\"https://bugs."
-"mageia.org/show_bug.cgi?id=3032\">звіту 3032</link>."
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:17
+#: en/draksnapshot-config.xml:34
 msgid ""
-"We shall replace the screenshot with a correct one of the tool, and fill "
-"this page with instructions about how to use it, when the bug is fixed."
+"If you only want to backup part of your directories, then choose \"Advanced"
+"\". You will see a little pop-up screen. Use the \"add\" and \"remove\" "
+"buttons next to the \"Backup list\" to include or exclude directories and "
+"files from the backup. Use the same buttons next to the \"Exclude\" 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 "
+"\"Close\" when you are done."
 msgstr ""
-"Ми замінимо знімок вікна цього інструмента на належний і доповнимо цю "
-"сторінку настановами щодо його використання, щойно цю ваду буде виправлено."
 
 #. type: Content of: <section><para>
-#: en/draksnapshot-config.xml:20
+#: en/draksnapshot-config.xml:41
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">draksnapshot-config</emphasis> as root."
+"Now give the path to \"Where to backup\", or choose the \"Browse\" button to "
+"select the correct path. Any mounted USB-key or external HD can be found in "
+"<emphasis role=\"bold\">/run/media/your_user_name/</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/draksnapshot-config.xml:45
+msgid "Click on \"Apply\" to make the snapshot."
 msgstr ""
-"Запустити цю програму можна за допомогою термінала: достатньо ввести команду "
-"<emphasis role=\"bold\">draksnapshot-config</emphasis> від імені "
-"адміністратора (root)."
 
 #. type: Content of: <section><info><title>
 #: en/draksound.xml:3
@@ -6086,44 +6120,6 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><info><title>
-#: en/drakx-intro.xml:3
-msgid "About the Installer Help Manual"
-msgstr "Про довідку до засобу для встановлення"
-
-#. type: Content of: <section><note><para>
-#: en/drakx-intro.xml:7
-msgid ""
-"No one will see all the installer screens that you see in this manual. Which "
-"screens you will see, depends on your hardware and the choices you make "
-"while installing."
-msgstr ""
-"Всі сторінки, описані у цьому підручнику побачити одразу неможливо. Набір "
-"сторінок, які ви побачите залежить від набору обладнання у вашій системі та "
-"вибраного вами варіанта встановлення."
-
-#. type: Content of: <section><para>
-#: en/drakx-intro.xml:12
-msgid ""
-"The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link xlink:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
-"\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
-msgstr ""
-"Текст та знімки вікон у цьому підручнику надаються вам відповідно до умов "
-"ліцензування CC BY-SA 3.0, <link xlink:href=\"http://creativecommons.org/"
-"licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>ю"
-
-#. type: Content of: <section><para>
-#: en/drakx-intro.xml:15
-msgid ""
-"This manual was produced with the help of the <link xlink:href=\"http://www."
-"calenco.com\">Calenco CMS</link> developed by <link xlink:href=\"http://www."
-"neodoc.biz\">NeoDoc</link>"
-msgstr ""
-"Цей підручник було створено за допомогою <link xlink:href=\"http://www."
-"calenco.com\">Calenco CMS</link>, розробленої компанією <link xlink:href="
-"\"http://www.neodoc.biz\">NeoDoc</link>"
-
-#. type: Content of: <section><info><title>
 #: en/drakxservices.xml:3
 msgid "Manage system services by enabling or disabling them"
 msgstr "Налаштування служб системи"
@@ -10149,6 +10145,60 @@ msgstr ""
 "підтверджено, вам доведеться вийти з облікового запису і знову увійти до "
 "нього, щоб задіяти внесені зміни."
 
+#~ msgid ""
+#~ "If you see the screen above when starting this tool, please close it. "
+#~ "This crash has been reported many times."
+#~ msgstr ""
+#~ "Якщо після запуску цього інструмента ви побачите вікно, схоже на "
+#~ "зображення не знімку, який наведено вище, будь ласка, закрийте це вікно. "
+#~ "Розробникам вже відомо про аварійне завершення роботи цього інструмента."
+
+#~ msgid ""
+#~ "You can read more about the problem in this bug report: <link xlink:href="
+#~ "\"https://bugs.mageia.org/show_bug.cgi?id=3032\">bug 3032</link>"
+#~ msgstr ""
+#~ "Докладніше про цю ваду можна дізнатися зі <link xlink:href=\"https://bugs."
+#~ "mageia.org/show_bug.cgi?id=3032\">звіту 3032</link>."
+
+#~ msgid ""
+#~ "We shall replace the screenshot with a correct one of the tool, and fill "
+#~ "this page with instructions about how to use it, when the bug is fixed."
+#~ msgstr ""
+#~ "Ми замінимо знімок вікна цього інструмента на належний і доповнимо цю "
+#~ "сторінку настановами щодо його використання, щойно цю ваду буде "
+#~ "виправлено."
+
+#~ msgid "About the Installer Help Manual"
+#~ msgstr "Про довідку до засобу для встановлення"
+
+#~ msgid ""
+#~ "No one will see all the installer screens that you see in this manual. "
+#~ "Which screens you will see, depends on your hardware and the choices you "
+#~ "make while installing."
+#~ msgstr ""
+#~ "Всі сторінки, описані у цьому підручнику побачити одразу неможливо. Набір "
+#~ "сторінок, які ви побачите залежить від набору обладнання у вашій системі "
+#~ "та вибраного вами варіанта встановлення."
+
+#~ msgid ""
+#~ "The texts and screenshots in this manual are available under the CC BY-SA "
+#~ "3.0 license <link xlink:href=\"http://creativecommons.org/licenses/by-"
+#~ "sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
+#~ msgstr ""
+#~ "Текст та знімки вікон у цьому підручнику надаються вам відповідно до умов "
+#~ "ліцензування CC BY-SA 3.0, <link xlink:href=\"http://creativecommons.org/"
+#~ "licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</"
+#~ "link>ю"
+
+#~ msgid ""
+#~ "This manual was produced with the help of the <link xlink:href=\"http://"
+#~ "www.calenco.com\">Calenco CMS</link> developed by <link xlink:href="
+#~ "\"http://www.neodoc.biz\">NeoDoc</link>"
+#~ msgstr ""
+#~ "Цей підручник було створено за допомогою <link xlink:href=\"http://www."
+#~ "calenco.com\">Calenco CMS</link>, розробленої компанією <link xlink:href="
+#~ "\"http://www.neodoc.biz\">NeoDoc</link>"
+
 #~ msgid "<xref linkend=\"drakbug\"/>"
 #~ msgstr "<xref linkend=\"drakbug\"/>"